about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-05-11 17:08:25 +0200
committerMichael Biebl <biebl@debian.org>2016-05-11 17:08:25 +0200
commit73e152af6e3fb4f5848bfb8394484026ff119003 (patch)
treed5a8b37778d3a95c51511451b38b6a329b94cb41
parent78c3b8801ecf4975e5da1af3b10ae20dd2d876de (diff)
Imported Upstream version 1.2.2 upstream/1.2.2
-rw-r--r--AUTHORS7
-rw-r--r--Makefile.in4
-rw-r--r--NEWS17
-rw-r--r--clients/cli/agent.c3
-rw-r--r--clients/cli/common.c4
-rw-r--r--clients/cli/connections.c15
-rw-r--r--clients/cli/devices.c98
-rw-r--r--clients/cli/general.c3
-rw-r--r--clients/cli/nmcli-completion7
-rw-r--r--clients/cli/nmcli.c4
-rw-r--r--clients/cli/nmcli.h6
-rw-r--r--clients/cli/settings-docs.c2
-rw-r--r--clients/cli/settings.c7
-rw-r--r--clients/cli/utils.c116
-rw-r--r--clients/cli/utils.h4
-rw-r--r--clients/common/nm-vpn-helpers.c9
-rwxr-xr-xconfigure26
-rw-r--r--configure.ac2
-rw-r--r--docs/api/Makefile.am2
-rw-r--r--docs/api/Makefile.in2
-rw-r--r--docs/api/html/NetworkManager.conf.html2
-rw-r--r--docs/api/html/NetworkManager.devhelp2239
-rw-r--r--docs/api/html/dbus-types.html27
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html8
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html2
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html2
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html2
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html4
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html4
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html16
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html6
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html6
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html6
-rw-r--r--docs/api/html/gdbus-org.freedesktop.NetworkManager.html12
-rw-r--r--docs/api/html/index.html11
-rw-r--r--docs/api/html/index.sgml24
-rw-r--r--docs/api/html/ix01.html49
-rw-r--r--docs/api/html/nm-dbus-types.html3120
-rw-r--r--docs/api/html/nm-settings.html2
-rw-r--r--docs/api/html/nm-vpn-dbus-types.html560
-rw-r--r--docs/api/html/nmcli.html12
-rw-r--r--docs/api/html/ref-settings.html6
-rw-r--r--docs/api/html/spec.html9
-rw-r--r--docs/api/network-manager-docs.xml5
-rw-r--r--docs/api/settings-spec.xml2
-rw-r--r--docs/api/version.xml2
-rw-r--r--docs/libnm-glib/html/index.html2
-rw-r--r--docs/libnm-glib/version.xml2
-rw-r--r--docs/libnm-util/html/NMConnection.html2
-rw-r--r--docs/libnm-util/html/NMSetting.html2
-rw-r--r--docs/libnm-util/html/NMSetting8021x.html2
-rw-r--r--docs/libnm-util/html/NMSettingAdsl.html2
-rw-r--r--docs/libnm-util/html/NMSettingBluetooth.html2
-rw-r--r--docs/libnm-util/html/NMSettingBond.html2
-rw-r--r--docs/libnm-util/html/NMSettingBridge.html2
-rw-r--r--docs/libnm-util/html/NMSettingBridgePort.html2
-rw-r--r--docs/libnm-util/html/NMSettingCdma.html2
-rw-r--r--docs/libnm-util/html/NMSettingConnection.html2
-rw-r--r--docs/libnm-util/html/NMSettingDcb.html2
-rw-r--r--docs/libnm-util/html/NMSettingGeneric.html2
-rw-r--r--docs/libnm-util/html/NMSettingGsm.html2
-rw-r--r--docs/libnm-util/html/NMSettingIP4Config.html4
-rw-r--r--docs/libnm-util/html/NMSettingIP6Config.html4
-rw-r--r--docs/libnm-util/html/NMSettingInfiniband.html2
-rw-r--r--docs/libnm-util/html/NMSettingOlpcMesh.html2
-rw-r--r--docs/libnm-util/html/NMSettingPPP.html2
-rw-r--r--docs/libnm-util/html/NMSettingPPPOE.html2
-rw-r--r--docs/libnm-util/html/NMSettingSerial.html2
-rw-r--r--docs/libnm-util/html/NMSettingTeam.html2
-rw-r--r--docs/libnm-util/html/NMSettingTeamPort.html2
-rw-r--r--docs/libnm-util/html/NMSettingVPN.html2
-rw-r--r--docs/libnm-util/html/NMSettingVlan.html2
-rw-r--r--docs/libnm-util/html/NMSettingWimax.html2
-rw-r--r--docs/libnm-util/html/NMSettingWired.html2
-rw-r--r--docs/libnm-util/html/NMSettingWireless.html2
-rw-r--r--docs/libnm-util/html/NMSettingWirelessSecurity.html2
-rw-r--r--docs/libnm-util/html/index.html2
-rw-r--r--docs/libnm-util/html/libnm-util-nm-utils.html2
-rw-r--r--docs/libnm-util/html/object-tree.html4
-rw-r--r--docs/libnm-util/version.xml2
-rw-r--r--docs/libnm/Makefile.am2
-rw-r--r--docs/libnm/Makefile.in2
-rw-r--r--docs/libnm/html/NMAccessPoint.html74
-rw-r--r--docs/libnm/html/NMActiveConnection.html90
-rw-r--r--docs/libnm/html/NMClient.html258
-rw-r--r--docs/libnm/html/NMConnection.html (renamed from docs/libnm/html/libnm-NMConnection.html)444
-rw-r--r--docs/libnm/html/NMDevice.html268
-rw-r--r--docs/libnm/html/NMDeviceAdsl.html28
-rw-r--r--docs/libnm/html/NMDeviceBond.html30
-rw-r--r--docs/libnm/html/NMDeviceBridge.html30
-rw-r--r--docs/libnm/html/NMDeviceBt.html30
-rw-r--r--docs/libnm/html/NMDeviceEthernet.html38
-rw-r--r--docs/libnm/html/NMDeviceGeneric.html22
-rw-r--r--docs/libnm/html/NMDeviceIPTunnel.html62
-rw-r--r--docs/libnm/html/NMDeviceInfiniband.html26
-rw-r--r--docs/libnm/html/NMDeviceMacvlan.html38
-rw-r--r--docs/libnm/html/NMDeviceModem.html26
-rw-r--r--docs/libnm/html/NMDeviceOlpcMesh.html30
-rw-r--r--docs/libnm/html/NMDeviceTeam.html30
-rw-r--r--docs/libnm/html/NMDeviceTun.html42
-rw-r--r--docs/libnm/html/NMDeviceVlan.html34
-rw-r--r--docs/libnm/html/NMDeviceVxlan.html90
-rw-r--r--docs/libnm/html/NMDeviceWifi.html70
-rw-r--r--docs/libnm/html/NMDeviceWimax.html58
-rw-r--r--docs/libnm/html/NMDhcpConfig.html30
-rw-r--r--docs/libnm/html/NMIPConfig.html50
-rw-r--r--docs/libnm/html/NMObject.html22
-rw-r--r--docs/libnm/html/NMRemoteConnection.html66
-rw-r--r--docs/libnm/html/NMSecretAgentOld.html82
-rw-r--r--docs/libnm/html/NMSetting.html28
-rw-r--r--docs/libnm/html/NMSetting8021x.html11
-rw-r--r--docs/libnm/html/NMSettingAdsl.html9
-rw-r--r--docs/libnm/html/NMSettingBluetooth.html9
-rw-r--r--docs/libnm/html/NMSettingBond.html9
-rw-r--r--docs/libnm/html/NMSettingBridge.html9
-rw-r--r--docs/libnm/html/NMSettingBridgePort.html9
-rw-r--r--docs/libnm/html/NMSettingCdma.html9
-rw-r--r--docs/libnm/html/NMSettingConnection.html14
-rw-r--r--docs/libnm/html/NMSettingDcb.html11
-rw-r--r--docs/libnm/html/NMSettingGeneric.html17
-rw-r--r--docs/libnm/html/NMSettingGsm.html9
-rw-r--r--docs/libnm/html/NMSettingIP4Config.html9
-rw-r--r--docs/libnm/html/NMSettingIP6Config.html19
-rw-r--r--docs/libnm/html/NMSettingIPConfig.html11
-rw-r--r--docs/libnm/html/NMSettingIPTunnel.html9
-rw-r--r--docs/libnm/html/NMSettingInfiniband.html9
-rw-r--r--docs/libnm/html/NMSettingMacvlan.html13
-rw-r--r--docs/libnm/html/NMSettingOlpcMesh.html9
-rw-r--r--docs/libnm/html/NMSettingPpp.html9
-rw-r--r--docs/libnm/html/NMSettingPppoe.html9
-rw-r--r--docs/libnm/html/NMSettingSerial.html11
-rw-r--r--docs/libnm/html/NMSettingTeam.html9
-rw-r--r--docs/libnm/html/NMSettingTeamPort.html9
-rw-r--r--docs/libnm/html/NMSettingTun.html11
-rw-r--r--docs/libnm/html/NMSettingVlan.html17
-rw-r--r--docs/libnm/html/NMSettingVpn.html9
-rw-r--r--docs/libnm/html/NMSettingVxlan.html9
-rw-r--r--docs/libnm/html/NMSettingWimax.html9
-rw-r--r--docs/libnm/html/NMSettingWired.html11
-rw-r--r--docs/libnm/html/NMSettingWireless.html11
-rw-r--r--docs/libnm/html/NMSettingWirelessSecurity.html11
-rw-r--r--docs/libnm/html/NMSimpleConnection.html66
-rw-r--r--docs/libnm/html/NMVpnConnection.html26
-rw-r--r--docs/libnm/html/NMVpnEditorPlugin.html22
-rw-r--r--docs/libnm/html/NMWimaxNsp.html46
-rw-r--r--docs/libnm/html/api-index-full.html766
-rw-r--r--docs/libnm/html/ch03.html6
-rw-r--r--docs/libnm/html/index.html4
-rw-r--r--docs/libnm/html/index.sgml239
-rw-r--r--docs/libnm/html/libnm-nm-dbus-interface.html8
-rw-r--r--docs/libnm/html/libnm-nm-errors.html18
-rw-r--r--docs/libnm/html/libnm-nm-utils.html2
-rw-r--r--docs/libnm/html/libnm-nm-vpn-dbus-interface.html2
-rw-r--r--docs/libnm/html/libnm.devhelp2201
-rw-r--r--docs/libnm/html/object-tree.html11
-rw-r--r--docs/libnm/libnm-sections.txt189
-rw-r--r--docs/libnm/version.xml2
-rw-r--r--libnm-core/Makefile.am8
-rw-r--r--libnm-core/Makefile.in8
-rw-r--r--libnm-core/nm-connection.c12
-rw-r--r--libnm-core/nm-dbus-interface.h4
-rw-r--r--libnm-core/nm-dbus-types.xml1291
-rw-r--r--libnm-core/nm-setting-8021x.h3
-rw-r--r--libnm-core/nm-setting-adsl.h3
-rw-r--r--libnm-core/nm-setting-bluetooth.h3
-rw-r--r--libnm-core/nm-setting-bond.h3
-rw-r--r--libnm-core/nm-setting-bridge-port.h3
-rw-r--r--libnm-core/nm-setting-bridge.h3
-rw-r--r--libnm-core/nm-setting-cdma.h3
-rw-r--r--libnm-core/nm-setting-dcb.h4
-rw-r--r--libnm-core/nm-setting-generic.h3
-rw-r--r--libnm-core/nm-setting-gsm.h3
-rw-r--r--libnm-core/nm-setting-infiniband.h3
-rw-r--r--libnm-core/nm-setting-ip-config.h3
-rw-r--r--libnm-core/nm-setting-ip-tunnel.h3
-rw-r--r--libnm-core/nm-setting-ip4-config.h3
-rw-r--r--libnm-core/nm-setting-ip6-config.c8
-rw-r--r--libnm-core/nm-setting-ip6-config.h3
-rw-r--r--libnm-core/nm-setting-macvlan.h3
-rw-r--r--libnm-core/nm-setting-olpc-mesh.h3
-rw-r--r--libnm-core/nm-setting-ppp.h3
-rw-r--r--libnm-core/nm-setting-pppoe.h3
-rw-r--r--libnm-core/nm-setting-serial.h3
-rw-r--r--libnm-core/nm-setting-team-port.h3
-rw-r--r--libnm-core/nm-setting-team.h3
-rw-r--r--libnm-core/nm-setting-tun.h3
-rw-r--r--libnm-core/nm-setting-vlan.h3
-rw-r--r--libnm-core/nm-setting-vpn.h3
-rw-r--r--libnm-core/nm-setting-vxlan.h3
-rw-r--r--libnm-core/nm-setting-wimax.h3
-rw-r--r--libnm-core/nm-setting-wired.h3
-rw-r--r--libnm-core/nm-setting-wireless-security.h3
-rw-r--r--libnm-core/nm-setting-wireless.h4
-rw-r--r--libnm-core/nm-simple-connection.h3
-rw-r--r--libnm-core/nm-vpn-dbus-types.xml246
-rw-r--r--libnm-core/nm-vpn-editor-plugin.c142
-rw-r--r--libnm-core/nm-vpn-plugin-info.h3
-rw-r--r--libnm/nm-access-point.h4
-rw-r--r--libnm/nm-active-connection.h3
-rw-r--r--libnm/nm-client.h3
-rw-r--r--libnm/nm-device-adsl.h3
-rw-r--r--libnm/nm-device-bond.h3
-rw-r--r--libnm/nm-device-bridge.h3
-rw-r--r--libnm/nm-device-bt.h3
-rw-r--r--libnm/nm-device-ethernet.h3
-rw-r--r--libnm/nm-device-generic.h3
-rw-r--r--libnm/nm-device-infiniband.h3
-rw-r--r--libnm/nm-device-ip-tunnel.h3
-rw-r--r--libnm/nm-device-macvlan.h3
-rw-r--r--libnm/nm-device-modem.h3
-rw-r--r--libnm/nm-device-olpc-mesh.h3
-rw-r--r--libnm/nm-device-team.h3
-rw-r--r--libnm/nm-device-tun.h3
-rw-r--r--libnm/nm-device-vlan.h3
-rw-r--r--libnm/nm-device-vxlan.h3
-rw-r--r--libnm/nm-device-wifi.h3
-rw-r--r--libnm/nm-device-wimax.h3
-rw-r--r--libnm/nm-device.h3
-rw-r--r--libnm/nm-dhcp-config.h3
-rw-r--r--libnm/nm-dhcp4-config.h3
-rw-r--r--libnm/nm-dhcp6-config.h3
-rw-r--r--libnm/nm-ip-config.h3
-rw-r--r--libnm/nm-ip4-config.h3
-rw-r--r--libnm/nm-ip6-config.h3
-rw-r--r--libnm/nm-manager.h3
-rw-r--r--libnm/nm-object.h3
-rw-r--r--libnm/nm-property-docs.xml2
-rw-r--r--libnm/nm-remote-connection.h3
-rw-r--r--libnm/nm-remote-settings.h3
-rw-r--r--libnm/nm-secret-agent-old.h3
-rw-r--r--libnm/nm-setting-docs.xml2
-rw-r--r--libnm/nm-vpn-connection.h3
-rw-r--r--libnm/nm-vpn-plugin-old.h3
-rw-r--r--libnm/nm-vpn-service-plugin.h3
-rw-r--r--libnm/nm-wimax-nsp.h3
-rw-r--r--man/NetworkManager.86
-rw-r--r--man/NetworkManager.conf.58
-rw-r--r--man/nm-online.16
-rw-r--r--man/nm-settings-ifcfg-rh.56
-rw-r--r--man/nm-settings-ifcfg-rh.xml2
-rw-r--r--man/nm-settings-keyfile.56
-rw-r--r--man/nm-settings-keyfile.xml2
-rw-r--r--man/nm-settings.58
-rw-r--r--man/nm-settings.xml4
-rw-r--r--man/nmcli-examples.76
-rw-r--r--man/nmcli.125
-rw-r--r--man/nmcli.xml22
-rw-r--r--man/nmtui.16
-rw-r--r--po/ar.po16
-rw-r--r--po/as.po22
-rw-r--r--po/be@latin.po16
-rw-r--r--po/bg.po16
-rw-r--r--po/bn_IN.po22
-rw-r--r--po/bs.po16
-rw-r--r--po/ca.po22
-rw-r--r--po/cs.po22
-rw-r--r--po/da.po16
-rw-r--r--po/de.po23
-rw-r--r--po/dz.po16
-rw-r--r--po/el.po24
-rw-r--r--po/en_CA.po16
-rw-r--r--po/en_GB.po22
-rw-r--r--po/eo.po16
-rw-r--r--po/es.po23
-rw-r--r--po/et.po16
-rw-r--r--po/eu.po16
-rw-r--r--po/fi.po16
-rw-r--r--po/fr.po23
-rw-r--r--po/gd.po16
-rw-r--r--po/gl.po22
-rw-r--r--po/gu.po22
-rw-r--r--po/he.po16
-rw-r--r--po/hi.po22
-rw-r--r--po/hr.po24
-rw-r--r--po/hu.po23
-rw-r--r--po/id.po22
-rw-r--r--po/it.po24
-rw-r--r--po/ja.po23
-rw-r--r--po/ka.po16
-rw-r--r--po/kn.po22
-rw-r--r--po/ko.po22
-rw-r--r--po/ku.po16
-rw-r--r--po/lt.po22
-rw-r--r--po/lv.po16
-rw-r--r--po/mk.po16
-rw-r--r--po/ml.po22
-rw-r--r--po/mr.po22
-rw-r--r--po/nb.po16
-rw-r--r--po/ne.po16
-rw-r--r--po/nl.po16
-rw-r--r--po/oc.po16
-rw-r--r--po/or.po22
-rw-r--r--po/pa.po22
-rw-r--r--po/pl.po1555
-rw-r--r--po/pt.po16
-rw-r--r--po/pt_BR.po1756
-rw-r--r--po/ru.po22
-rw-r--r--po/rw.po16
-rw-r--r--po/sk.po16
-rw-r--r--po/sl.po22
-rw-r--r--po/sq.po16
-rw-r--r--po/sr.po16
-rw-r--r--po/sr@latin.po16
-rw-r--r--po/sv.po1667
-rw-r--r--po/ta.po23
-rw-r--r--po/te.po22
-rw-r--r--po/th.po16
-rw-r--r--po/tr.po22
-rw-r--r--po/uk.po24
-rw-r--r--po/vi.po16
-rw-r--r--po/wa.po16
-rw-r--r--po/zh_CN.po6821
-rw-r--r--po/zh_HK.po16
-rw-r--r--po/zh_TW.po22
-rw-r--r--shared/nm-shared-utils.c47
-rw-r--r--shared/nm-version-macros.h8
-rw-r--r--shared/nm-version-macros.h.in6
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile.in1
-rw-r--r--src/devices/bluetooth/nm-bluez-device.c2
-rw-r--r--src/devices/nm-device-ethernet.c37
-rw-r--r--src/devices/nm-device-factory.c10
-rw-r--r--src/devices/nm-device.c139
-rw-r--r--src/devices/wwan/nm-modem-broadband.c23
-rw-r--r--src/devices/wwan/nm-modem.c3
-rw-r--r--src/dhcp-manager/nm-dhcp-client.c58
-rw-r--r--src/dhcp-manager/nm-dhcp-systemd.c9
-rw-r--r--src/dns-manager/nm-dns-dnsmasq.c332
-rw-r--r--src/dns-manager/nm-dns-plugin.c106
-rw-r--r--src/dnsmasq-manager/nm-dnsmasq-manager.c16
-rw-r--r--src/nm-auth-subject.c15
-rw-r--r--src/nm-core-utils.c168
-rw-r--r--src/nm-core-utils.h5
-rw-r--r--src/org.freedesktop.NetworkManager.conf10
-rw-r--r--src/platform/nm-linux-platform.c5
-rw-r--r--src/settings/nm-settings.c84
-rw-r--r--src/settings/plugins/ifnet/connection_parser.c11
-rw-r--r--src/settings/plugins/ifupdown/interface_parser.c16
-rw-r--r--src/tests/Makefile.am1
-rw-r--r--src/tests/Makefile.in1
-rw-r--r--src/tests/test-utils.c6
-rw-r--r--tools/Makefile.am3
-rw-r--r--tools/Makefile.in3
-rwxr-xr-xtools/enums-to-docbook.pl198
344 files changed, 15349 insertions, 9591 deletions
diff --git a/AUTHORS b/AUTHORS
index f5d97bc5..bf4f84de 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1 @@
-Current authors:
-Dan Williams <dcbw@redhat.com>
-Tambet Ingo <tambet@gmail.com>
-
-Previous authors:
-Robert Love <rml@novell.com>
+The NetworkManager Team <networkmanager-list@gnome.org>
diff --git a/Makefile.in b/Makefile.in
index 2a294c11..f23ec31e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,8 +216,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \
 	$(top_srcdir)/build-aux/tap-driver.sh ABOUT-NLS AUTHORS \
 	COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \
 	build-aux/config.guess build-aux/config.rpath \
-	build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
-	build-aux/missing
+	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+	build-aux/ltmain.sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/NEWS b/NEWS
index 19afd6d0..93c6c61e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,21 @@
 ============================================
+NetworkManager-1.2.2
+Overview of changes since NetworkManager-1.2
+============================================
+
+This is a new stable release of NetworkManager.  Notable changes include:
+
+* The dnsmasq DNS management mode now uses D-Bus API of dnsmasq to make signal
+    nameserver changes.
+* Hostname is now correctly read on Slackware.
+* IPv6 addresses for default wired connections now stay stable.
+* Reading portname on s390 systems on 4.4 kernels and newer has been corrected.
+* nmcli no longer warns about version mismatches.
+* Updated translations.
+* Improved developer documentations.
+* Multiple minor bugfixes.
+
+============================================
 NetworkManager-1.2
 Overview of changes since NetworkManager-1.0
 ============================================
diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 0e39ba97..b8a56d23 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -207,9 +207,6 @@ do_agent (NmCli *nmc, int argc, char **argv)
 		nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
 		return nmc->return_value;
 	}
-	/* Compare NM and nmcli versions */
-	if (!nmc_versions_match (nmc))
-		return nmc->return_value;
 
 	if (argc == 0) {
 		nmc->return_value = do_agent_all (nmc, 0, NULL);
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 0aa5efc2..0888f063 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -1170,10 +1170,6 @@ nmc_set_in_readline (gboolean in_readline)
 	pthread_mutex_unlock (&readline_mutex);
 }
 
-/* Global variable defined in nmcli.c */
-extern NmCli nm_cli;
-
-
 static char *
 nmc_readline_helper (const char *prompt)
 {
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 3fca37f5..1f1dae59 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -261,9 +261,6 @@ typedef struct {
 } TabCompletionInfo;
 static TabCompletionInfo nmc_tab_completion = {NULL, NULL, NULL, NULL};
 
-/* Global variable defined in nmcli.c - used for TAB completion */
-extern NmCli nm_cli;
-
 static char *gen_connection_types (const char *text, int state);
 
 static void
@@ -1970,12 +1967,19 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data)
 		         nm_object_get_path (NM_OBJECT (active)));
 		quit ();
 	} else if (   ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING
-	           && state >= NM_DEVICE_STATE_IP_CONFIG) {
+	           && state >= NM_DEVICE_STATE_IP_CONFIG
+	           && state <= NM_DEVICE_STATE_ACTIVATED) {
 		if (nmc->print_output == NMC_PRINT_PRETTY)
 			nmc_terminal_erase_line ();
 		g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"),
 		         nm_object_get_path (NM_OBJECT (active)));
 		quit ();
+	} else if (   ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING
+	           && state == NM_DEVICE_STATE_FAILED) {
+		if (nmc->print_output == NMC_PRINT_PRETTY)
+			nmc_terminal_erase_line ();
+		g_print (_("Error: Connection activation failed."));
+		quit ();
 	} else if (active && ac_state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) {
 		g_string_printf (nmc->return_text, _("Error: Connection activation failed."));
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
@@ -11051,9 +11055,6 @@ do_connections (NmCli *nmc, int argc, char **argv)
 		nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
 		return nmc->return_value;
 	}
-	/* Compare NM and nmcli versions */
-	if (!nmc_versions_match (nmc))
-		return nmc->return_value;
 
 	/* Get the connection list */
 	nmc->connections = nm_client_get_connections (nmc->client);
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 449fa7db..65c4be72 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -286,7 +286,7 @@ usage (void)
 	              "  show [<ifname>]\n\n"
 	              "  set [ifname] <ifname> [autoconnect yes|no] [managed yes|no]\n\n"
 	              "  connect <ifname>\n\n"
-	              "  reapply <ifname> ...\n\n"
+	              "  reapply <ifname>\n\n"
 	              "  disconnect <ifname> ...\n\n"
 	              "  delete <ifname> ...\n\n"
 	              "  monitor <ifname> ...\n\n"
@@ -342,7 +342,7 @@ usage_device_reapply (void)
 {
 	g_printerr (_("Usage: nmcli device reapply { ARGUMENTS | help }\n"
 	              "\n"
-	              "ARGUMENTS := <ifname> ...\n"
+	              "ARGUMENTS := <ifname>\n"
 	              "\n"
 	              "Attempts to update device with changes to the currently active connection\n"
                       "made since it was last applied.\n\n"));
@@ -1835,11 +1835,10 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 	GError *error = NULL;
 
 	if (!nm_device_reapply_finish (device, result, &error)) {
-		g_string_printf (nmc->return_text, _("Error: not all connections reapplied."));
-		g_printerr (_("Error: Reapplying connection to device '%s' (%s) failed: %s\n"),
-		            nm_device_get_iface (device),
-		            nm_object_get_path (NM_OBJECT (device)),
-		            error->message);
+		g_string_printf (nmc->return_text, _("Error: Reapplying connection to device '%s' (%s) failed: %s"),
+		                 nm_device_get_iface (device),
+		                 nm_object_get_path (NM_OBJECT (device)),
+		                 error->message);
 		g_error_free (error);
 		nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT;
 		device_cb_info_finish (info, device);
@@ -1847,7 +1846,7 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 		if (nmc->print_output == NMC_PRINT_PRETTY)
 			nmc_terminal_erase_line ();
 		g_print (_("Connection successfully reapplied to device '%s'.\n"),
-			 nm_device_get_iface (device));
+		         nm_device_get_iface (device));
 		device_cb_info_finish (info, device);
 	}
 }
@@ -1855,14 +1854,14 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 static NMCResultCode
 do_device_reapply (NmCli *nmc, int argc, char **argv)
 {
-	NMDevice **devices;
-	NMDevice *device;
+	gs_free NMDevice **devices = NULL;
+	NMDevice *device = NULL;
 	DeviceCbInfo *info = NULL;
-	GSList *queue = NULL, *iter;
-	char **arg_arr = NULL;
 	char **arg_ptr = argv;
 	int arg_num = argc;
 	int i;
+	gs_free char *device_name_free = NULL;
+	const char *device_name = NULL;
 
 	/* Set default timeout for reapply operation. */
 	if (nmc->timeout == -1)
@@ -1870,69 +1869,48 @@ do_device_reapply (NmCli *nmc, int argc, char **argv)
 
 	if (argc == 0) {
 		if (nmc->ask) {
-			char *line = nmc_readline (PROMPT_INTERFACES);
-			nmc_string_to_arg_array (line, NULL, FALSE, &arg_arr, &arg_num);
-			g_free (line);
-			arg_ptr = arg_arr;
+			device_name_free = nmc_readline (PROMPT_INTERFACE);
+			device_name = device_name_free;
 		}
-		if (arg_num == 0) {
+		if (!device_name) {
 			g_string_printf (nmc->return_text, _("Error: No interface specified."));
 			nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
-			goto error;
+			return nmc->return_value;
 		}
+	} else if (argc == 1) {
+		device_name = arg_ptr[0];
+		next_arg (&arg_num, &arg_ptr);
+	} else {
+		next_arg (&arg_num, &arg_ptr);
+		g_string_printf (nmc->return_text, _("Error: unsupported argument '%s'."), *arg_ptr);
+		nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+		return nmc->return_value;
 	}
 
 	devices = get_devices_sorted (nmc->client);
-	while (arg_num > 0) {
-		device = NULL;
-		for (i = 0; devices[i]; i++) {
-			if (!g_strcmp0 (nm_device_get_iface (devices[i]), *arg_ptr)) {
-				device = devices[i];
-				break;
-			}
-		}
-
-		if (device) {
-			if (!g_slist_find (queue, device))
-				queue = g_slist_prepend (queue, device);
-			else
-				g_printerr (_("Warning: argument '%s' is duplicated.\n"), *arg_ptr);
-		} else {
-			g_printerr (_("Error: Device '%s' not found.\n"), *arg_ptr);
-			g_string_printf (nmc->return_text, _("Error: not all devices found."));
-			nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
+	for (i = 0; devices[i]; i++) {
+		if (!g_strcmp0 (nm_device_get_iface (devices[i]), device_name)) {
+			device = devices[i];
+			break;
 		}
-
-		/* Take next argument */
-		next_arg (&arg_num, &arg_ptr);
 	}
-	g_free (devices);
 
-	if (!queue) {
-		g_string_printf (nmc->return_text, _("Error: no valid device provided."));
+	if (!device) {
+		g_string_printf (nmc->return_text, _("Error: device '%s' not found."), device_name);
 		nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
-		goto error;
+		return nmc->return_value;
 	}
-	queue = g_slist_reverse (queue);
-
-	info = g_slice_new0 (DeviceCbInfo);
-	info->nmc = nmc;
 
 	nmc->nowait_flag = (nmc->timeout == 0);
 	nmc->should_wait = TRUE;
 
-	for (iter = queue; iter; iter = g_slist_next (iter)) {
-		device = iter->data;
-
-		info->queue = g_slist_prepend (info->queue, g_object_ref (device));
+	info = g_slice_new0 (DeviceCbInfo);
+	info->nmc = nmc;
+	info->queue = g_slist_prepend (info->queue, g_object_ref (device));
 
-		/* Now reapply the connection to the device */
-		nm_device_reapply_async (device, NULL, 0, 0, NULL, reapply_device_cb, info);
-	}
+	/* Now reapply the connection to the device */
+	nm_device_reapply_async (device, NULL, 0, 0, NULL, reapply_device_cb, info);
 
-error:
-	g_strfreev (arg_arr);
-	g_slist_free (queue);
 	return nmc->return_value;
 }
 
@@ -3594,9 +3572,6 @@ is_single_word (const char* line)
 		return FALSE;
 }
 
-/* Global variable defined in nmcli.c */
-extern NmCli nm_cli;
-
 static char *
 gen_func_ifnames (const char *text, int state)
 {
@@ -3670,9 +3645,6 @@ do_devices (NmCli *nmc, int argc, char **argv)
 		nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
 		return nmc->return_value;
 	}
-	/* Compare NM and nmcli versions */
-	if (!nmc_versions_match (nmc))
-		return nmc->return_value;
 
 	if (argc == 0) {
 		if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error))
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 15e73e28..0704688f 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -345,9 +345,6 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl
 		return FALSE;
 	}
 
-	if (!nmc_versions_match (nmc))
-		return FALSE;
-
 	state = nm_client_get_state (nmc->client);
 	startup = nm_client_get_startup (nmc->client);
 	connectivity = nm_client_get_connectivity (nmc->client);
diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion
index 7f79180f..3c87f6f9 100644
--- a/clients/cli/nmcli-completion
+++ b/clients/cli/nmcli-completion
@@ -178,9 +178,6 @@ _nmcli_compl_OPTIONS()
             pretty)
                 _nmcli_array_delete_at words 0
                 ;;
-            nocheck)
-                _nmcli_array_delete_at words 0
-                ;;
             ask)
                 _nmcli_array_delete_at words 0
                 ;;
@@ -804,7 +801,7 @@ _nmcli()
     local COMMAND_CONNECTION_ACTIVE=""
 
     HELP_ONLY_AS_FIRST=
-    local LONG_OPTIONS=(terse pretty mode fields colors escape nocheck ask show-secrets wait version help)
+    local LONG_OPTIONS=(terse pretty mode fields colors escape ask show-secrets wait version help)
     _nmcli_compl_OPTIONS
     i=$?
 
@@ -1428,12 +1425,12 @@ _nmcli()
                         fi
                         ;;
                     sh|sho|show| \
+                    r|re|rea|reap|reapp|reappl|reapply| \
                     c|co|con|conn|conne|connec|connect)
                         if [[ ${#words[@]} -eq 3 ]]; then
                             _nmcli_compl_COMMAND_nl "${words[2]}" "$(_nmcli_dev_status DEVICE)"
                         fi
                         ;;
-                    r|re|rea|reap|reapp|reappl|reapply| \
                     d|di|dis|disc|disco|discon|disconn|disconne|disconnec|disconnect| \
                     de|del|dele|delet|delete| \
                     m|mo|mon|moni|monit|monito|monitor)
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index a7f21161..7e788654 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -89,7 +89,6 @@ usage (const char *prog_name)
 	              "  -c[olors] auto|yes|no                      whether to use colors in output\n"
 	              "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 	              "  -e[scape] yes|no                           escape columns separators in values\n"
-	              "  -n[ocheck]                                 don't check nmcli and NetworkManager versions\n"
 	              "  -a[sk]                                     ask for missing parameters\n"
 	              "  -s[how-secrets]                            allow displaying passwords\n"
 	              "  -w[ait] <seconds>                          set timeout waiting for finishing operations\n"
@@ -254,7 +253,7 @@ parse_command_line (NmCli *nmc, int argc, char **argv)
 			}
 			nmc->required_fields = g_strdup (argv[1]);
 		} else if (matches (opt, "-nocheck") == 0) {
-			nmc->nocheck_ver = TRUE;
+			/* ignore for backward compatibility */
 		} else if (matches (opt, "-ask") == 0) {
 			nmc->ask = TRUE;
 		} else if (matches (opt, "-show-secrets") == 0) {
@@ -545,7 +544,6 @@ nmc_init (NmCli *nmc)
 	nmc->required_fields = NULL;
 	nmc->output_data = g_ptr_array_new_full (20, g_free);
 	memset (&nmc->print_fields, '\0', sizeof (NmcPrintFields));
-	nmc->nocheck_ver = FALSE;
 	nmc->ask = FALSE;
 	nmc->show_secrets = FALSE;
 	nmc->use_colors = NMC_USE_COLOR_AUTO;
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 1b9a08b8..34100f00 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -59,7 +59,7 @@ typedef enum {
 	/* NetworkManager is not running */
 	NMC_RESULT_ERROR_NM_NOT_RUNNING = 8,
 
-	/* nmcli and NetworkManager versions mismatch */
+	/* No more used, keep to preserve API */
 	NMC_RESULT_ERROR_VERSIONS_MISMATCH = 9,
 
 	/* Connection/Device/AP not found */
@@ -152,7 +152,6 @@ typedef struct _NmCli {
 	char *required_fields;                            /* Required fields in output: '--fields' option */
 	GPtrArray *output_data;                           /* GPtrArray of arrays of NmcOutputField structs - accumulates data for output */
 	NmcPrintFields print_fields;                      /* Structure with field indices to print */
-	gboolean nocheck_ver;                             /* Don't check nmcli and NM versions: option '--nocheck' */
 	gboolean ask;                                     /* Ask for missing parameters: option '--ask' */
 	gboolean show_secrets;                            /* Whether to display secrets (both input and output): option '--show-secrets' */
 	gboolean in_editor;                               /* Whether running the editor - nmcli con edit' */
@@ -162,6 +161,8 @@ typedef struct _NmCli {
 	NmcTermColor editor_prompt_color;                 /* Color of prompt in connection editor */
 } NmCli;
 
+extern NmCli nm_cli;
+
 /* Error quark for GError domain */
 #define NMCLI_ERROR (nmcli_error_quark ())
 GQuark nmcli_error_quark (void);
@@ -170,5 +171,4 @@ gboolean nmc_seen_sigint (void);
 void     nmc_clear_sigint (void);
 void     nmc_set_sigquit_internal (void);
 
-
 #endif /* NMC_NMCLI_H */
diff --git a/clients/cli/settings-docs.c b/clients/cli/settings-docs.c
index 0f882c9b..f4fb6a15 100644
--- a/clients/cli/settings-docs.c
+++ b/clients/cli/settings-docs.c
@@ -264,7 +264,7 @@ NmcPropertyDesc setting_ipv4[] = {
 };
   
 NmcPropertyDesc setting_ipv6[] = {
-	{ "addr-gen-mode", "Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: \"eui64\", \"stable-privacy\" or unset. If the property is set to \"eui64\", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of \"stable-privacy\" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option." },
+	{ "addr-gen-mode", "Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: \"eui64\", or \"stable-privacy\". If the property is set to \"eui64\", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of \"stable-privacy\" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling \"stable-privacy\". For keyfile plugin, the absence of the setting on disk means \"eui64\" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option." },
 	{ "addresses", "Array of IP addresses." },
 	{ "dad-timeout", "Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds." },
 	{ "dhcp-hostname", "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time." },
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 06e9fb47..1651aab2 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -2082,13 +2082,6 @@ typedef struct {
 	NmcPropertyFuncsFields
 } NmcPropertyFuncs;
 
-/*
- * We need NmCli in some _set_property functions, and they aren't passed NmCli.
- * So use the global variable.
- */
-/* Global variable defined in nmcli.c */
-extern NmCli nm_cli;
-
 NMSetting *
 nmc_setting_new_for_name (const char *name)
 {
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index d05ea285..a406eee4 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -182,60 +182,6 @@ ssid_to_hex (const char *str, gsize len)
 }
 
 /*
- * Converts IPv4 address from guint32 in network-byte order to text representation.
- * Returns: text form of the IP or NULL (then error is set)
- */
-char *
-nmc_ip4_address_as_string (guint32 ip, GError **error)
-{
-	guint32 tmp_addr;
-	char buf[INET_ADDRSTRLEN];
-
-	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
-	memset (&buf, '\0', sizeof (buf));
-	tmp_addr = ip;
-
-	if (inet_ntop (AF_INET, &tmp_addr, buf, INET_ADDRSTRLEN)) {
-		return g_strdup (buf);
-	} else {
-		g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP4 address '0x%X' to text form"),
-		             ntohl (tmp_addr));
-		return NULL;
-	}
-}
-
-/*
- * Converts IPv6 address in in6_addr structure to text representation.
- * Returns: text form of the IP or NULL (then error is set)
- */
-char *
-nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error)
-{
-	char buf[INET6_ADDRSTRLEN];
-
-	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
-	memset (&buf, '\0', sizeof (buf));
-
-	if (inet_ntop (AF_INET6, ip, buf, INET6_ADDRSTRLEN)) {
-		return g_strdup (buf);
-	} else {
-		if (error) {
-			int j;
-			GString *ip6_str = g_string_new (NULL);
-			g_string_append_printf (ip6_str, "%02X", ip->s6_addr[0]);
-			for (j = 1; j < 16; j++)
-				g_string_append_printf (ip6_str, " %02X", ip->s6_addr[j]);
-			g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP6 address '%s' to text form"),
-			             ip6_str->str);
-			g_string_free (ip6_str, TRUE);
-		}
-		return NULL;
-	}
-}
-
-/*
  * Erase terminal line using ANSI escape sequences.
  * It prints <ESC>[2K sequence to erase the line and then \r to return back
  * to the beginning of the line.
@@ -707,23 +653,6 @@ finish:
 }
 
 /*
- * Convert string array (char **) to GSList.
- *
- * Returns: pointer to newly created GSList. Caller should free it.
- */
-GSList *
-nmc_util_strv_to_slist (char **strv)
-{
-	GSList *list = NULL;
-	guint i = 0;
-
-	while (strv && strv[i])
-		list = g_slist_prepend (list, g_strdup (strv[i++]));
-
-	return g_slist_reverse (list);
-}
-
-/*
  * Convert string array (char **) to description string in the form of:
  * "[string1, string2, ]"
  *
@@ -1359,48 +1288,3 @@ print_data (NmCli *nmc)
 	}
 }
 
-/*
-* Compare versions of nmcli and NM daemon.
-* Return: TRUE  - the versions match (when only major and minor match, print a warning)
-*         FALSE - versions mismatch
-*/
-gboolean
-nmc_versions_match (NmCli *nmc)
-{
-	const char *nm_ver = NULL;
-	const char *dot;
-	gboolean match = FALSE;
-
-	g_return_val_if_fail (nmc != NULL, FALSE);
-
-	/* --nocheck option - don't compare the versions */
-	if (nmc->nocheck_ver)
-		return TRUE;
-
-	nmc->get_client (nmc);
-	nm_ver = nm_client_get_version (nmc->client);
-	if (nm_ver) {
-		if (!strcmp (nm_ver, VERSION))
-			match = TRUE;
-		else {
-			dot = strchr (nm_ver, '.');
-			if (dot) {
-				dot = strchr (dot + 1, '.');
-				if (dot && !strncmp (nm_ver, VERSION, dot-nm_ver)) {
-					g_printerr (_("Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --nocheck to suppress the warning.\n"),
-					            VERSION, nm_ver);
-					match = TRUE;
-				}
-			}
-		}
-	}
-
-	if (!match) {
-		g_string_printf (nmc->return_text, _("Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force execution using --nocheck, but the results are unpredictable."),
-		                 VERSION, nm_ver ? nm_ver : _("unknown"));
-		nmc->return_value = NMC_RESULT_ERROR_VERSIONS_MISMATCH;
-	}
-
-	return match;
-}
-
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 8047fe7f..eab60d3a 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -69,8 +69,6 @@ gboolean nmc_string_to_uint (const char *str,
                              unsigned long int *value);
 gboolean nmc_string_to_bool (const char *str, gboolean *val_bool, GError **error);
 gboolean nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError **error);
-char *nmc_ip4_address_as_string (guint32 ip, GError **error);
-char *nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error);
 void nmc_terminal_erase_line (void);
 void nmc_terminal_show_progress (const char *str);
 const char *nmc_term_color_sequence (NmcTermColor color);
@@ -83,7 +81,6 @@ char *nmc_get_user_input (const char *ask_str);
 int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote,
                              char ***argv, int *argc);
 const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
-GSList *nmc_util_strv_to_slist (char **strv);
 char * nmc_util_strv_for_display (const char **strv, gboolean brackets);
 char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens);
 int nmc_string_screen_width (const char *start, const char *end);
@@ -105,6 +102,5 @@ NmcOutputField *nmc_dup_fields_array (NmcOutputField fields[], size_t size, guin
 void nmc_empty_output_fields (NmCli *nmc);
 void print_required_fields (NmCli *nmc, const NmcOutputField field_values[]);
 void print_data (NmCli *nmc);
-gboolean nmc_versions_match (NmCli *nmc);
 
 #endif /* NMC_UTILS_H */
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 1d2a6b0f..880b6ecd 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -99,6 +99,10 @@ nm_vpn_get_secret_names (const char *vpn_type)
 {
 	const char *type;
 	static VpnPasswordName generic_vpn_secrets[] = { {"password", N_("Password")}, {NULL, NULL} };
+	static VpnPasswordName openvpn_secrets[] = { {"password", N_("Password")},
+	                                             {"cert-pass", N_("Certificate password")},
+	                                             {"http-proxy-password", N_("HTTP proxy password")},
+	                                             {NULL, NULL} };
 	static VpnPasswordName vpnc_secrets[] = { {"Xauth password", N_("Password")},
 	                                          {"IPSec secret", N_("Group password")},
 	                                          {NULL, NULL} };
@@ -118,13 +122,14 @@ nm_vpn_get_secret_names (const char *vpn_type)
 	else
 		type = vpn_type;
 
-	if (   !g_strcmp0 (type, "openvpn")
-	    || !g_strcmp0 (type, "pptp")
+	if (   !g_strcmp0 (type, "pptp")
 	    || !g_strcmp0 (type, "iodine")
 	    || !g_strcmp0 (type, "ssh")
 	    || !g_strcmp0 (type, "l2tp")
 	    || !g_strcmp0 (type, "fortisslvpn"))
 		 return generic_vpn_secrets;
+	else if (!g_strcmp0 (type, "openvpn"))
+		return openvpn_secrets;
 	else if (!g_strcmp0 (type, "vpnc"))
 		return vpnc_secrets;
 	else if (   !g_strcmp0 (type, "openswan")
diff --git a/configure b/configure
index fd20c533..153d5c91 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.69 for NetworkManager 1.2.0.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.2.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='NetworkManager 1.2.0'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='NetworkManager 1.2.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1685,7 +1685,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 1.2.0 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1755,7 +1755,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.2.0:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -2062,7 +2062,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.2.0
+NetworkManager configure 1.2.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2789,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 1.2.0, which was
+It was created by NetworkManager $as_me 1.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3659,7 +3659,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.2.0'
+ VERSION='1.2.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17540,9 +17540,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=2
-NM_MICRO_VERSION=0
-NM_VERSION=1.2.0
-NM_GIT_SHA=d3d648f9ef1086fdba8f5c320b380ff962f674db
+NM_MICRO_VERSION=2
+NM_VERSION=1.2.2
+NM_GIT_SHA=8f6d416768cf69932999b1fc2ab4231321761657
 
 
 
@@ -27298,7 +27298,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 1.2.0, which was
+This file was extended by NetworkManager $as_me 1.2.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27364,7 +27364,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 1.2.0
+NetworkManager config.status 1.2.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ab2993a5..7bb3779e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
 dnl The NM version number
 m4_define([nm_major_version], [1])
 m4_define([nm_minor_version], [2])
-m4_define([nm_micro_version], [0])
+m4_define([nm_micro_version], [2])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])])
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index aeba9d29..5aafc262 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -73,6 +73,8 @@ content_files = \
 	$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
 	$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
 	$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	$(top_builddir)/libnm-core/nm-dbus-types.xml \
+	$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
 	$(top_builddir)/man/nmcli.xml \
 	$(top_builddir)/man/nmtui.xml \
 	$(top_builddir)/man/nm-online.xml \
diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in
index bccad102..7407f4fa 100644
--- a/docs/api/Makefile.in
+++ b/docs/api/Makefile.in
@@ -461,6 +461,8 @@ content_files = $(top_builddir)/introspection/nmdbus-access-point-org.freedeskto
 	$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
 	$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
 	$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+	$(top_builddir)/libnm-core/nm-dbus-types.xml \
+	$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
 	$(top_builddir)/man/nmcli.xml $(top_builddir)/man/nmtui.xml \
 	$(top_builddir)/man/nm-online.xml \
 	$(top_builddir)/man/NetworkManager.xml \
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 049fdd41..0c05211a 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -363,7 +363,7 @@ no-auto-default=*
 <tr>
 <td><p><span class="term"><code class="varname">path</code></span></p></td>
 <td><p>The location where keyfiles are read and stored.
-            This defaults to "<code class="filename">${prefix}/etc/NetworkManager/conf.d</code>".
+            This defaults to "<code class="filename">/etc/NetworkManager/conf.d</code>".
             </p></td>
 </tr>
 <tr>
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 2f5ab8cf..850ff2e2 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -48,6 +48,10 @@
         <sub name="org.freedesktop.NetworkManager.VPN.Plugin" link="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html"/>
         <sub name="org.freedesktop.NetworkManager.SecretAgent" link="gdbus-org.freedesktop.NetworkManager.SecretAgent.html"/>
       </sub>
+      <sub name="Types" link="dbus-types.html">
+        <sub name="NetworkManager D-Bus API Types" link="nm-dbus-types.html"/>
+        <sub name="VPN Plugin D-Bus API Types" link="nm-vpn-dbus-types.html"/>
+      </sub>
     </sub>
     <sub name="Network Configuration Setting Specification" link="ref-settings.html">
       <sub name="Configuration Settings" link="ref-settings.html#id-1.4.3"/>
@@ -345,5 +349,240 @@
     <keyword type="method" name="The CancelGetSecrets() method" link="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets"/>
     <keyword type="method" name="The SaveSecrets() method" link="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets"/>
     <keyword type="method" name="The DeleteSecrets() method" link="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets"/>
+    <keyword type="enum" name="enum NMState" link="nm-dbus-types.html#NMState"/>
+    <keyword type="enum" name="enum NMConnectivityState" link="nm-dbus-types.html#NMConnectivityState"/>
+    <keyword type="enum" name="enum NMDeviceType" link="nm-dbus-types.html#NMDeviceType"/>
+    <keyword type="enum" name="enum NMDeviceCapabilities" link="nm-dbus-types.html#NMDeviceCapabilities"/>
+    <keyword type="enum" name="enum NMDeviceWifiCapabilities" link="nm-dbus-types.html#NMDeviceWifiCapabilities"/>
+    <keyword type="enum" name="enum NM80211ApFlags" link="nm-dbus-types.html#NM80211ApFlags"/>
+    <keyword type="enum" name="enum NM80211ApSecurityFlags" link="nm-dbus-types.html#NM80211ApSecurityFlags"/>
+    <keyword type="enum" name="enum NM80211Mode" link="nm-dbus-types.html#NM80211Mode"/>
+    <keyword type="enum" name="enum NMBluetoothCapabilities" link="nm-dbus-types.html#NMBluetoothCapabilities"/>
+    <keyword type="enum" name="enum NMDeviceModemCapabilities" link="nm-dbus-types.html#NMDeviceModemCapabilities"/>
+    <keyword type="enum" name="enum NMWimaxNspNetworkType" link="nm-dbus-types.html#NMWimaxNspNetworkType"/>
+    <keyword type="enum" name="enum NMDeviceState" link="nm-dbus-types.html#NMDeviceState"/>
+    <keyword type="enum" name="enum NMDeviceStateReason" link="nm-dbus-types.html#NMDeviceStateReason"/>
+    <keyword type="enum" name="enum NMMetered" link="nm-dbus-types.html#NMMetered"/>
+    <keyword type="enum" name="enum NMActiveConnectionState" link="nm-dbus-types.html#NMActiveConnectionState"/>
+    <keyword type="enum" name="enum NMSecretAgentGetSecretsFlags" link="nm-dbus-types.html#NMSecretAgentGetSecretsFlags"/>
+    <keyword type="enum" name="enum NMSecretAgentCapabilities" link="nm-dbus-types.html#NMSecretAgentCapabilities"/>
+    <keyword type="enum" name="enum NMIPTunnelMode" link="nm-dbus-types.html#NMIPTunnelMode"/>
+    <keyword type="enum" name="enum NMVpnServiceState" link="nm-vpn-dbus-types.html#NMVpnServiceState"/>
+    <keyword type="enum" name="enum NMVpnConnectionState" link="nm-vpn-dbus-types.html#NMVpnConnectionState"/>
+    <keyword type="enum" name="enum NMVpnConnectionStateReason" link="nm-vpn-dbus-types.html#NMVpnConnectionStateReason"/>
+    <keyword type="enum" name="enum NMVpnPluginFailure" link="nm-vpn-dbus-types.html#NMVpnPluginFailure"/>
+    <keyword type="constant" name="NM_STATE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.1.1.1id-1.3.4.2.3.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_STATE_ASLEEP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.2.1.1id-1.3.4.2.3.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_STATE_DISCONNECTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.3.1.1id-1.3.4.2.3.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_STATE_DISCONNECTING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.4.1.1id-1.3.4.2.3.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_STATE_CONNECTING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.5.1.1id-1.3.4.2.3.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_LOCAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.6.1.1id-1.3.4.2.3.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_SITE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.7.1.1id-1.3.4.2.3.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_STATE_CONNECTED_GLOBAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.3.4.2.1.4.8.1.1id-1.3.4.2.3.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.4.4.2.1.4.1.1.1id-1.3.4.2.4.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.4.4.2.1.4.2.1.1id-1.3.4.2.4.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_PORTAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.4.4.2.1.4.3.1.1id-1.3.4.2.4.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_LIMITED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.4.4.2.1.4.4.1.1id-1.3.4.2.4.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_CONNECTIVITY_FULL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.4.4.2.1.4.5.1.1id-1.3.4.2.4.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.1.1.1id-1.3.4.2.5.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_GENERIC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.2.1.1id-1.3.4.2.5.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_ETHERNET" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.3.1.1id-1.3.4.2.5.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_WIFI" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.4.1.1id-1.3.4.2.5.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNUSED1" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.5.1.1id-1.3.4.2.5.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_UNUSED2" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.6.1.1id-1.3.4.2.5.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.7.1.1id-1.3.4.2.5.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_OLPC_MESH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.8.1.1id-1.3.4.2.5.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_WIMAX" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.9.1.1id-1.3.4.2.5.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_MODEM" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.10.1.1id-1.3.4.2.5.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_INFINIBAND" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.11.1.1id-1.3.4.2.5.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BOND" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.12.1.1id-1.3.4.2.5.4.2.1.4.12.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_VLAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.13.1.1id-1.3.4.2.5.4.2.1.4.13.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_ADSL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.14.1.1id-1.3.4.2.5.4.2.1.4.14.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_BRIDGE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.15.1.1id-1.3.4.2.5.4.2.1.4.15.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_TEAM" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.16.1.1id-1.3.4.2.5.4.2.1.4.16.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_TUN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.17.1.1id-1.3.4.2.5.4.2.1.4.17.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_IP_TUNNEL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.18.1.1id-1.3.4.2.5.4.2.1.4.18.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_MACVLAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.19.1.1id-1.3.4.2.5.4.2.1.4.19.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_VXLAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.20.1.1id-1.3.4.2.5.4.2.1.4.20.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_TYPE_VETH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.5.4.2.1.4.21.1.1id-1.3.4.2.5.4.2.1.4.21.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.6.4.2.1.4.1.1.1id-1.3.4.2.6.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_NM_SUPPORTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.6.4.2.1.4.2.1.1id-1.3.4.2.6.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_CARRIER_DETECT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.6.4.2.1.4.3.1.1id-1.3.4.2.6.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_CAP_IS_SOFTWARE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.6.4.2.1.4.4.1.1id-1.3.4.2.6.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.1.1.1id-1.3.4.2.7.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_WEP40" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.2.1.1id-1.3.4.2.7.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_WEP104" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.3.1.1id-1.3.4.2.7.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_TKIP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.4.1.1id-1.3.4.2.7.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_CIPHER_CCMP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.5.1.1id-1.3.4.2.7.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_WPA" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.6.1.1id-1.3.4.2.7.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_RSN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.7.1.1id-1.3.4.2.7.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_AP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.8.1.1id-1.3.4.2.7.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_ADHOC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.9.1.1id-1.3.4.2.7.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_VALID" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.10.1.1id-1.3.4.2.7.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_2GHZ" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.11.1.1id-1.3.4.2.7.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_WIFI_DEVICE_CAP_FREQ_5GHZ" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.7.4.2.1.4.12.1.1id-1.3.4.2.7.4.2.1.4.12.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_FLAGS_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.8.4.2.1.4.1.1.1id-1.3.4.2.8.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_FLAGS_PRIVACY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.8.4.2.1.4.2.1.1id-1.3.4.2.8.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.1.1.1id-1.3.4.2.9.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_WEP40" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.2.1.1id-1.3.4.2.9.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_WEP104" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.3.1.1id-1.3.4.2.9.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_TKIP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.4.1.1id-1.3.4.2.9.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_PAIR_CCMP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.5.1.1id-1.3.4.2.9.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_WEP40" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.6.1.1id-1.3.4.2.9.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_WEP104" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.7.1.1id-1.3.4.2.9.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_TKIP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.8.1.1id-1.3.4.2.9.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_GROUP_CCMP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.9.1.1id-1.3.4.2.9.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_PSK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.10.1.1id-1.3.4.2.9.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_802_1X" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.9.4.2.1.4.11.1.1id-1.3.4.2.9.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_802_11_MODE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.10.4.2.1.4.1.1.1id-1.3.4.2.10.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_802_11_MODE_ADHOC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.10.4.2.1.4.2.1.1id-1.3.4.2.10.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_802_11_MODE_INFRA" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.10.4.2.1.4.3.1.1id-1.3.4.2.10.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_802_11_MODE_AP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.10.4.2.1.4.4.1.1id-1.3.4.2.10.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.11.4.2.1.4.1.1.1id-1.3.4.2.11.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_DUN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.11.4.2.1.4.2.1.1id-1.3.4.2.11.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_BT_CAPABILITY_NAP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.11.4.2.1.4.3.1.1id-1.3.4.2.11.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.12.4.2.1.4.1.1.1id-1.3.4.2.12.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_POTS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.12.4.2.1.4.2.1.1id-1.3.4.2.12.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.12.4.2.1.4.3.1.1id-1.3.4.2.12.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.12.4.2.1.4.4.1.1id-1.3.4.2.12.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_MODEM_CAPABILITY_LTE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.12.4.2.1.4.5.1.1id-1.3.4.2.12.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.13.4.2.1.4.1.1.1id-1.3.4.2.13.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_HOME" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.13.4.2.1.4.2.1.1id-1.3.4.2.13.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_PARTNER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.13.4.2.1.4.3.1.1id-1.3.4.2.13.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.13.4.2.1.4.4.1.1id-1.3.4.2.13.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.1.1.1id-1.3.4.2.14.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNMANAGED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.2.1.1id-1.3.4.2.14.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_UNAVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.3.1.1id-1.3.4.2.14.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_DISCONNECTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.4.1.1id-1.3.4.2.14.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_PREPARE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.5.1.1id-1.3.4.2.14.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_CONFIG" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.6.1.1id-1.3.4.2.14.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_NEED_AUTH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.7.1.1id-1.3.4.2.14.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_IP_CONFIG" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.8.1.1id-1.3.4.2.14.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_IP_CHECK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.9.1.1id-1.3.4.2.14.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_SECONDARIES" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.10.1.1id-1.3.4.2.14.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_ACTIVATED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.11.1.1id-1.3.4.2.14.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_DEACTIVATING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.12.1.1id-1.3.4.2.14.4.2.1.4.12.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.14.4.2.1.4.13.1.1id-1.3.4.2.14.4.2.1.4.13.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.1.1.1id-1.3.4.2.15.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.2.1.1id-1.3.4.2.15.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NOW_MANAGED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.3.1.1id-1.3.4.2.15.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NOW_UNMANAGED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.4.1.1id-1.3.4.2.15.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONFIG_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.5.1.1id-1.3.4.2.15.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.6.1.1id-1.3.4.2.15.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.7.1.1id-1.3.4.2.15.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NO_SECRETS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.8.1.1id-1.3.4.2.15.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.9.1.1id-1.3.4.2.15.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.10.1.1id-1.3.4.2.15.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.11.1.1id-1.3.4.2.15.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.12.1.1id-1.3.4.2.15.4.2.1.4.12.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_START_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.13.1.1id-1.3.4.2.15.4.2.1.4.13.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_DISCONNECT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.14.1.1id-1.3.4.2.15.4.2.1.4.14.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PPP_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.15.1.1id-1.3.4.2.15.4.2.1.4.15.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_START_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.16.1.1id-1.3.4.2.15.4.2.1.4.16.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_ERROR" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.17.1.1id-1.3.4.2.15.4.2.1.4.17.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DHCP_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.18.1.1id-1.3.4.2.15.4.2.1.4.18.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SHARED_START_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.19.1.1id-1.3.4.2.15.4.2.1.4.19.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SHARED_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.20.1.1id-1.3.4.2.15.4.2.1.4.20.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.21.1.1id-1.3.4.2.15.4.2.1.4.21.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_ERROR" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.22.1.1id-1.3.4.2.15.4.2.1.4.22.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_AUTOIP_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.23.1.1id-1.3.4.2.15.4.2.1.4.23.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_BUSY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.24.1.1id-1.3.4.2.15.4.2.1.4.24.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.25.1.1id-1.3.4.2.15.4.2.1.4.25.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.26.1.1id-1.3.4.2.15.4.2.1.4.26.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.27.1.1id-1.3.4.2.15.4.2.1.4.27.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.28.1.1id-1.3.4.2.15.4.2.1.4.28.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.29.1.1id-1.3.4.2.15.4.2.1.4.29.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_APN_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.30.1.1id-1.3.4.2.15.4.2.1.4.30.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.31.1.1id-1.3.4.2.15.4.2.1.4.31.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.32.1.1id-1.3.4.2.15.4.2.1.4.32.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.33.1.1id-1.3.4.2.15.4.2.1.4.33.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.34.1.1id-1.3.4.2.15.4.2.1.4.34.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.35.1.1id-1.3.4.2.15.4.2.1.4.35.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_FIRMWARE_MISSING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.36.1.1id-1.3.4.2.15.4.2.1.4.36.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_REMOVED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.37.1.1id-1.3.4.2.15.4.2.1.4.37.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SLEEPING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.38.1.1id-1.3.4.2.15.4.2.1.4.38.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONNECTION_REMOVED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.39.1.1id-1.3.4.2.15.4.2.1.4.39.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_USER_REQUESTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.40.1.1id-1.3.4.2.15.4.2.1.4.40.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CARRIER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.41.1.1id-1.3.4.2.15.4.2.1.4.41.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.42.1.1id-1.3.4.2.15.4.2.1.4.42.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.43.1.1id-1.3.4.2.15.4.2.1.4.43.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.44.1.1id-1.3.4.2.15.4.2.1.4.44.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_BT_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.45.1.1id-1.3.4.2.15.4.2.1.4.45.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.46.1.1id-1.3.4.2.15.4.2.1.4.46.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.47.1.1id-1.3.4.2.15.4.2.1.4.47.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.48.1.1id-1.3.4.2.15.4.2.1.4.48.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_GSM_SIM_WRONG" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.49.1.1id-1.3.4.2.15.4.2.1.4.49.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_INFINIBAND_MODE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.50.1.1id-1.3.4.2.15.4.2.1.4.50.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.51.1.1id-1.3.4.2.15.4.2.1.4.51.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_BR2684_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.52.1.1id-1.3.4.2.15.4.2.1.4.52.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.53.1.1id-1.3.4.2.15.4.2.1.4.53.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SSID_NOT_FOUND" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.54.1.1id-1.3.4.2.15.4.2.1.4.54.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.55.1.1id-1.3.4.2.15.4.2.1.4.55.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.56.1.1id-1.3.4.2.15.4.2.1.4.56.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.57.1.1id-1.3.4.2.15.4.2.1.4.57.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_FAILED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.58.1.1id-1.3.4.2.15.4.2.1.4.58.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_MODEM_AVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.59.1.1id-1.3.4.2.15.4.2.1.4.59.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.60.1.1id-1.3.4.2.15.4.2.1.4.60.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_NEW_ACTIVATION" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.61.1.1id-1.3.4.2.15.4.2.1.4.61.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PARENT_CHANGED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.62.1.1id-1.3.4.2.15.4.2.1.4.62.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.15.4.2.1.4.63.1.1id-1.3.4.2.15.4.2.1.4.63.1.2"/>
+    <keyword type="constant" name="NM_METERED_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.16.4.2.1.4.1.1.1id-1.3.4.2.16.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_METERED_YES" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.16.4.2.1.4.2.1.1id-1.3.4.2.16.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_METERED_NO" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.16.4.2.1.4.3.1.1id-1.3.4.2.16.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_METERED_GUESS_YES" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.16.4.2.1.4.4.1.1id-1.3.4.2.16.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_METERED_GUESS_NO" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.16.4.2.1.4.5.1.1id-1.3.4.2.16.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.17.4.2.1.4.1.1.1id-1.3.4.2.17.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_ACTIVATING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.17.4.2.1.4.2.1.1id-1.3.4.2.17.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_ACTIVATED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.17.4.2.1.4.3.1.1id-1.3.4.2.17.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_DEACTIVATING" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.17.4.2.1.4.4.1.1id-1.3.4.2.17.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_ACTIVE_CONNECTION_STATE_DEACTIVATED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.17.4.2.1.4.5.1.1id-1.3.4.2.17.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.18.4.2.1.4.1.1.1id-1.3.4.2.18.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.18.4.2.1.4.2.1.1id-1.3.4.2.18.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.18.4.2.1.4.3.1.1id-1.3.4.2.18.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.18.4.2.1.4.4.1.1id-1.3.4.2.18.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.18.4.2.1.4.5.1.1id-1.3.4.2.18.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.18.4.2.1.4.6.1.1id-1.3.4.2.18.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.19.4.2.1.4.1.1.1id-1.3.4.2.19.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_SECRET_AGENT_CAPABILITY_VPN_HINTS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.19.4.2.1.4.2.1.1id-1.3.4.2.19.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.1.1.1id-1.3.4.2.20.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_IPIP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.2.1.1id-1.3.4.2.20.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_GRE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.3.1.1id-1.3.4.2.20.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_SIT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.4.1.1id-1.3.4.2.20.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_ISATAP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.5.1.1id-1.3.4.2.20.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_VTI" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.6.1.1id-1.3.4.2.20.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_IP6IP6" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.7.1.1id-1.3.4.2.20.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_IPIP6" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.8.1.1id-1.3.4.2.20.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_IP6GRE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.9.1.1id-1.3.4.2.20.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_IP_TUNNEL_MODE_VTI6" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.3.4.2.20.4.2.1.4.10.1.1id-1.3.4.2.20.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_UNKNOWN" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.1.1.1id-1.3.4.3.3.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_INIT" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.2.1.1id-1.3.4.3.3.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_SHUTDOWN" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.3.1.1id-1.3.4.3.3.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTING" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.4.1.1id-1.3.4.3.3.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STARTED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.5.1.1id-1.3.4.3.3.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPING" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.6.1.1id-1.3.4.3.3.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_VPN_SERVICE_STATE_STOPPED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.3.4.2.1.4.7.1.1id-1.3.4.3.3.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_UNKNOWN" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.1.1.1id-1.3.4.3.4.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_PREPARE" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.2.1.1id-1.3.4.3.4.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_NEED_AUTH" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.3.1.1id-1.3.4.3.4.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_CONNECT" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.4.1.1id-1.3.4.3.4.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_IP_CONFIG_GET" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.5.1.1id-1.3.4.3.4.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_ACTIVATED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.6.1.1id-1.3.4.3.4.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_FAILED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.7.1.1id-1.3.4.3.4.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_DISCONNECTED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.4.4.2.1.4.8.1.1id-1.3.4.3.4.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_UNKNOWN" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.1.1.1id-1.3.4.3.5.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NONE" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.2.1.1id-1.3.4.3.5.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.3.1.1id-1.3.4.3.5.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.4.1.1id-1.3.4.3.5.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.5.1.1id-1.3.4.3.5.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.6.1.1id-1.3.4.3.5.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.7.1.1id-1.3.4.3.5.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.8.1.1id-1.3.4.3.5.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.9.1.1id-1.3.4.3.5.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.10.1.1id-1.3.4.3.5.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.11.1.1id-1.3.4.3.5.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.5.4.2.1.4.12.1.1id-1.3.4.3.5.4.2.1.4.12.1.2"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.6.4.2.1.4.1.1.1id-1.3.4.3.6.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.6.4.2.1.4.2.1.1id-1.3.4.3.6.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.3.4.3.6.4.2.1.4.3.1.1id-1.3.4.3.6.4.2.1.4.3.1.2"/>
   </functions>
 </book>
diff --git a/docs/api/html/dbus-types.html b/docs/api/html/dbus-types.html
new file mode 100644
index 00000000..e63be172
--- /dev/null
+++ b/docs/api/html/dbus-types.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Types: NetworkManager Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="NetworkManager Reference Manual">
+<link rel="up" href="spec.html" title="D-Bus API Reference">
+<link rel="prev" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html" title="org.freedesktop.NetworkManager.SecretAgent">
+<link rel="next" href="nm-dbus-types.html" title="NetworkManager D-Bus API Types">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="spec.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="nm-dbus-types.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="dbus-types"></a>Types</h2></div></div></div></div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.24</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
index 8669fdc9..25c4e853 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
@@ -87,7 +87,7 @@ Flags  readable   u
 </pre>
 <p>        Flags describing the capabilities of the access point.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags">NM80211ApFlags</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NM80211ApFlags" title="enum NM80211ApFlags">NM80211ApFlags</a>
 </p>
 </div>
 <hr>
@@ -99,7 +99,7 @@ WpaFlags  readable   u
 <p>        Flags describing the access point's capabilities according to WPA (Wifi
         Protected Access).
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NM80211ApSecurityFlags" title="enum NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
 </p>
 </div>
 <hr>
@@ -111,7 +111,7 @@ RsnFlags  readable   u
 <p>        Flags describing the access point's capabilities according to the RSN
         (Robust Secure Network) protocol.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NM80211ApSecurityFlags" title="enum NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
 </p>
 </div>
 <hr>
@@ -149,7 +149,7 @@ Mode  readable   u
 </pre>
 <p>        Describes the operating mode of the access point.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NM80211Mode" title="enum NM80211Mode">NM80211Mode</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
index 91c82cd9..81414d7f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
@@ -86,7 +86,7 @@ RegisterWithCapabilities (IN  s identifier,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>capabilities</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-glib/NMSecretAgent.html#NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>) Indicates various agent capabilities to NetworkManager.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities">NMSecretAgentCapabilities</a>) Indicates various agent capabilities to NetworkManager.</p></td>
 </tr>
 </tbody>
 </table></div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
index 5078108b..71956c75 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
@@ -166,7 +166,7 @@ State  readable   u
 </pre>
 <p>        The state of this active connection.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState">NMActiveConnectionState</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMActiveConnectionState" title="enum NMActiveConnectionState">NMActiveConnectionState</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
index 96d7124e..e675f1ad 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
@@ -98,7 +98,7 @@ BtCapabilities  readable   u
 </pre>
 <p>        Bluetooth capabilities of the device (either DUN or NAP).
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities">NMBluetoothCapabilities</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities">NMBluetoothCapabilities</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
index d375b528..b56f2acb 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
@@ -82,7 +82,7 @@ ModemCapabilities  readable   u
         firmware reload or other reinitialization to switch between eg CDMA/EVDO
         and GSM/UMTS.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
 </p>
 </div>
 <hr>
@@ -94,7 +94,7 @@ CurrentCapabilities  readable   u
 <p>        The generic family of access technologies the modem currently supports
         without a firmware reload or reinitialization.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
index afe7fec5..9dda293d 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
@@ -214,7 +214,7 @@ Mode  readable   u
 </pre>
 <p>        The operating mode of the wireless device.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode">NM80211Mode</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NM80211Mode" title="enum NM80211Mode">NM80211Mode</a>
 </p>
 </div>
 <hr>
@@ -253,7 +253,7 @@ WirelessCapabilities  readable   u
 </pre>
 <p>        The capabilities of the wireless device.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMDeviceWifiCapabilities" title="enum NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index 4bcc0ccb..c0a8a22d 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -217,15 +217,15 @@ StateChanged (u new_state,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>new_state</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The new state of the device.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMDeviceState" title="enum NMDeviceState">NMDeviceState</a>) The new state of the device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>old_state</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>) The previous state of the device.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMDeviceState" title="enum NMDeviceState">NMDeviceState</a>) The previous state of the device.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>) A reason for the state transition.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMDeviceStateReason" title="enum NMDeviceStateReason">NMDeviceStateReason</a>) A reason for the state transition.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -307,7 +307,7 @@ Capabilities  readable   u
 </pre>
 <p>        Flags describing the capabilities of the device.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities">NMDeviceCapabilities</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMDeviceCapabilities" title="enum NMDeviceCapabilities">NMDeviceCapabilities</a>
 </p>
 </div>
 <hr>
@@ -328,7 +328,7 @@ State  readable   u
 </pre>
 <p>        The current state of the device.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMDeviceState" title="enum NMDeviceState">NMDeviceState</a>
 </p>
 </div>
 <hr>
@@ -339,7 +339,7 @@ StateReason  readable   (uu)
 </pre>
 <p>        The current state and reason for changing to that state.
 </p>
-<p>        Returns: A tuple of  <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState">NMDeviceState</a> and  <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason">NMDeviceStateReason</a>.
+<p>        Returns: A tuple of  <a class="link" href="nm-dbus-types.html#NMDeviceState" title="enum NMDeviceState">NMDeviceState</a> and  <a class="link" href="nm-dbus-types.html#NMDeviceStateReason" title="enum NMDeviceStateReason">NMDeviceStateReason</a>.
 </p>
 </div>
 <hr>
@@ -451,7 +451,7 @@ DeviceType  readable   u
 </pre>
 <p>        The general type of the network device; ie Ethernet, WiFi, etc.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType">NMDeviceType</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMDeviceType" title="enum NMDeviceType">NMDeviceType</a>
 </p>
 </div>
 <hr>
@@ -494,7 +494,7 @@ Metered  readable   u
 <p>        Whether the amount of traffic flowing through the device is subject to
         limitations, for example set by service providers.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMMetered">NMMetered</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMMetered" title="enum NMMetered">NMMetered</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
index 23201a1f..2b116264 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="NetworkManager Reference Manual">
 <link rel="up" href="spec.html#dbus-interfaces" title="Interfaces">
 <link rel="prev" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html" title="org.freedesktop.NetworkManager.VPN.Plugin">
-<link rel="next" href="ref-settings.html" title="Network Configuration Setting Specification">
+<link rel="next" href="dbus-types.html" title="Types">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -20,7 +20,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="spec.html#dbus-interfaces"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="ref-settings.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="dbus-types.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="gdbus-org.freedesktop.NetworkManager.SecretAgent"></a><div class="titlepage"></div>
@@ -105,7 +105,7 @@ GetSecrets (IN  a{sa{sv}} connection,
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-glib/NMSecretAgent.html#NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a>) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">OUT a{sa{sv}} <em class="parameter"><code>secrets</code></em></code>:</span></p></td>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
index 4bb08ff8..848a0d63 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
@@ -89,11 +89,11 @@ VpnStateChanged (u state,
 <tbody>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>) The new state of the VPN connection.</p></td>
+<td><p>(<a class="link" href="nm-vpn-dbus-types.html#NMVpnConnectionState" title="enum NMVpnConnectionState">NMVpnConnectionState</a>) The new state of the VPN connection.</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>) Reason code describing the change to the new state.</p></td>
+<td><p>(<a class="link" href="nm-vpn-dbus-types.html#NMVpnConnectionStateReason" title="enum NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>) Reason code describing the change to the new state.</p></td>
 </tr>
 </tbody>
 </table></div>
@@ -108,7 +108,7 @@ VpnState  readable   u
 </pre>
 <p>        The VPN-specific state of the connection.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnConnectionState">NMVpnConnectionState</a>
+<p>        Returns: <a class="link" href="nm-vpn-dbus-types.html#NMVpnConnectionState" title="enum NMVpnConnectionState">NMVpnConnectionState</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
index 87db2178..5868c7ac 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
@@ -272,7 +272,7 @@ StateChanged (u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>) The new state of the plugin.</p></td>
+<td><p>(<a class="link" href="nm-vpn-dbus-types.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a>) The new state of the plugin.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -395,7 +395,7 @@ Failure (u reason);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>reason</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnPluginFailure">NMVpnPluginFailure</a>) Reason code for the failure.</p></td>
+<td><p>(<a class="link" href="nm-vpn-dbus-types.html#NMVpnPluginFailure" title="enum NMVpnPluginFailure">NMVpnPluginFailure</a>) Reason code for the failure.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -409,7 +409,7 @@ State  readable   u
 </pre>
 <p>        The state of the plugin.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-vpn-dbus-interface.html#NMVpnServiceState">NMVpnServiceState</a>
+<p>        Returns: <a class="link" href="nm-vpn-dbus-types.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a>
 </p>
 </div>
 </div>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
index a3468b7e..c72f1e26 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html
@@ -398,7 +398,7 @@ CheckConnectivity (OUT u connectivity);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT u <em class="parameter"><code>connectivity</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>) The current connectivity state.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMConnectivityState" title="enum NMConnectivityState">NMConnectivityState</a>) The current connectivity state.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -418,7 +418,7 @@ state (OUT u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">OUT u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState">NMState</a></p></td>
+<td><p><a class="link" href="nm-dbus-types.html#NMState" title="enum NMState">NMState</a></p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -449,7 +449,7 @@ StateChanged (u state);
 </colgroup>
 <tbody><tr>
 <td><p><span class="term"><code class="literal">u <em class="parameter"><code>state</code></em></code>:</span></p></td>
-<td><p>(<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState">NMState</a>) The new state of NetworkManager.</p></td>
+<td><p>(<a class="link" href="nm-dbus-types.html#NMState" title="enum NMState">NMState</a>) The new state of NetworkManager.</p></td>
 </tr></tbody>
 </table></div>
 </div>
@@ -643,7 +643,7 @@ Metered  readable   u
 <p>        Indicates whether the connectivity is metered. This is equivalent to the
         metered property of the device associated with the primary connection.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMMetered">NMMetered</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMMetered" title="enum NMMetered">NMMetered</a>
 </p>
 </div>
 <hr>
@@ -685,7 +685,7 @@ State  readable   u
 </pre>
 <p>        The overall state of the NetworkManager daemon.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState">NMState</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMState" title="enum NMState">NMState</a>
 </p>
 </div>
 <hr>
@@ -696,7 +696,7 @@ Connectivity  readable   u
 </pre>
 <p>        The network connectivity state.
 </p>
-<p>        Returns: <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState">NMConnectivityState</a>
+<p>        Returns: <a class="link" href="nm-dbus-types.html#NMConnectivityState" title="enum NMConnectivityState">NMConnectivityState</a>
 </p>
 </div>
 <hr>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index e31a7500..15870791 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -14,7 +14,7 @@
 <div class="titlepage">
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Version 1.2.0
+<div><p class="releaseinfo">Version 1.2.2
 </p></div>
 <div><p class="copyright">Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors</p></div>
 <div><div class="legalnotice">
@@ -177,6 +177,15 @@
 <span class="refentrytitle"><a href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html">org.freedesktop.NetworkManager.SecretAgent</a></span><span class="refpurpose"></span>
 </dt>
 </dl></dd>
+<dt><span class="section"><a href="dbus-types.html">Types</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="nm-dbus-types.html">NetworkManager D-Bus API Types</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="nm-vpn-dbus-types.html">VPN Plugin D-Bus API Types</a></span><span class="refpurpose"></span>
+</dt>
+</dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="ref-settings.html">Network Configuration Setting Specification</a></span></dt>
 <dd><dl>
diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml
index 4b1a83ec..49e4a4c1 100644
--- a/docs/api/html/index.sgml
+++ b/docs/api/html/index.sgml
@@ -474,3 +474,27 @@
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets">
 <ANCHOR id="gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets" href="NetworkManager/gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets">
+<ANCHOR id="nm-dbus-types" href="NetworkManager/nm-dbus-types.html">
+<ANCHOR id="NMState" href="NetworkManager/nm-dbus-types.html#NMState">
+<ANCHOR id="NMConnectivityState" href="NetworkManager/nm-dbus-types.html#NMConnectivityState">
+<ANCHOR id="NMDeviceType" href="NetworkManager/nm-dbus-types.html#NMDeviceType">
+<ANCHOR id="NMDeviceCapabilities" href="NetworkManager/nm-dbus-types.html#NMDeviceCapabilities">
+<ANCHOR id="NMDeviceWifiCapabilities" href="NetworkManager/nm-dbus-types.html#NMDeviceWifiCapabilities">
+<ANCHOR id="NM80211ApFlags" href="NetworkManager/nm-dbus-types.html#NM80211ApFlags">
+<ANCHOR id="NM80211ApSecurityFlags" href="NetworkManager/nm-dbus-types.html#NM80211ApSecurityFlags">
+<ANCHOR id="NM80211Mode" href="NetworkManager/nm-dbus-types.html#NM80211Mode">
+<ANCHOR id="NMBluetoothCapabilities" href="NetworkManager/nm-dbus-types.html#NMBluetoothCapabilities">
+<ANCHOR id="NMDeviceModemCapabilities" href="NetworkManager/nm-dbus-types.html#NMDeviceModemCapabilities">
+<ANCHOR id="NMWimaxNspNetworkType" href="NetworkManager/nm-dbus-types.html#NMWimaxNspNetworkType">
+<ANCHOR id="NMDeviceState" href="NetworkManager/nm-dbus-types.html#NMDeviceState">
+<ANCHOR id="NMDeviceStateReason" href="NetworkManager/nm-dbus-types.html#NMDeviceStateReason">
+<ANCHOR id="NMMetered" href="NetworkManager/nm-dbus-types.html#NMMetered">
+<ANCHOR id="NMActiveConnectionState" href="NetworkManager/nm-dbus-types.html#NMActiveConnectionState">
+<ANCHOR id="NMSecretAgentGetSecretsFlags" href="NetworkManager/nm-dbus-types.html#NMSecretAgentGetSecretsFlags">
+<ANCHOR id="NMSecretAgentCapabilities" href="NetworkManager/nm-dbus-types.html#NMSecretAgentCapabilities">
+<ANCHOR id="NMIPTunnelMode" href="NetworkManager/nm-dbus-types.html#NMIPTunnelMode">
+<ANCHOR id="nm-vpn-dbus-types" href="NetworkManager/nm-vpn-dbus-types.html">
+<ANCHOR id="NMVpnServiceState" href="NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState">
+<ANCHOR id="NMVpnConnectionState" href="NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState">
+<ANCHOR id="NMVpnConnectionStateReason" href="NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionStateReason">
+<ANCHOR id="NMVpnPluginFailure" href="NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure">
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 1747da1c..c74a0c5f 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -630,6 +630,55 @@
 </dl>
 </div>
 <div class="indexdiv">
+<h3>N</h3>
+<dl>
+<dt>NM80211ApFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApFlags">enum NM80211ApFlags</a>
+</dt>
+<dt>NM80211ApSecurityFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApSecurityFlags">enum NM80211ApSecurityFlags</a>
+</dt>
+<dt>NM80211Mode, <a class="indexterm" href="nm-dbus-types.html#NM80211Mode">enum NM80211Mode</a>
+</dt>
+<dt>NMActiveConnectionState, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionState">enum NMActiveConnectionState</a>
+</dt>
+<dt>NMBluetoothCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMBluetoothCapabilities">enum NMBluetoothCapabilities</a>
+</dt>
+<dt>NMConnectivityState, <a class="indexterm" href="nm-dbus-types.html#NMConnectivityState">enum NMConnectivityState</a>
+</dt>
+<dt>NMDeviceCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceCapabilities">enum NMDeviceCapabilities</a>
+</dt>
+<dt>NMDeviceModemCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceModemCapabilities">enum NMDeviceModemCapabilities</a>
+</dt>
+<dt>NMDeviceState, <a class="indexterm" href="nm-dbus-types.html#NMDeviceState">enum NMDeviceState</a>
+</dt>
+<dt>NMDeviceStateReason, <a class="indexterm" href="nm-dbus-types.html#NMDeviceStateReason">enum NMDeviceStateReason</a>
+</dt>
+<dt>NMDeviceType, <a class="indexterm" href="nm-dbus-types.html#NMDeviceType">enum NMDeviceType</a>
+</dt>
+<dt>NMDeviceWifiCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceWifiCapabilities">enum NMDeviceWifiCapabilities</a>
+</dt>
+<dt>NMIPTunnelMode, <a class="indexterm" href="nm-dbus-types.html#NMIPTunnelMode">enum NMIPTunnelMode</a>
+</dt>
+<dt>NMMetered, <a class="indexterm" href="nm-dbus-types.html#NMMetered">enum NMMetered</a>
+</dt>
+<dt>NMSecretAgentCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentCapabilities">enum NMSecretAgentCapabilities</a>
+</dt>
+<dt>NMSecretAgentGetSecretsFlags, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags">enum NMSecretAgentGetSecretsFlags</a>
+</dt>
+<dt>NMState, <a class="indexterm" href="nm-dbus-types.html#NMState">enum NMState</a>
+</dt>
+<dt>NMVpnConnectionState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionState">enum NMVpnConnectionState</a>
+</dt>
+<dt>NMVpnConnectionStateReason, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionStateReason">enum NMVpnConnectionStateReason</a>
+</dt>
+<dt>NMVpnPluginFailure, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnPluginFailure">enum NMVpnPluginFailure</a>
+</dt>
+<dt>NMVpnServiceState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnServiceState">enum NMVpnServiceState</a>
+</dt>
+<dt>NMWimaxNspNetworkType, <a class="indexterm" href="nm-dbus-types.html#NMWimaxNspNetworkType">enum NMWimaxNspNetworkType</a>
+</dt>
+</dl>
+</div>
+<div class="indexdiv">
 <h3>P</h3>
 <dl>
 <dt>org.freedesktop.NetworkManager.PPP, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-interface-org-freedesktop-NetworkManager-PPP.top_of_page">org.freedesktop.NetworkManager.PPP</a>
diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
new file mode 100644
index 00000000..6d044dd3
--- /dev/null
+++ b/docs/api/html/nm-dbus-types.html
@@ -0,0 +1,3120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NetworkManager D-Bus API Types: NetworkManager Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="NetworkManager Reference Manual">
+<link rel="up" href="dbus-types.html" title="Types">
+<link rel="prev" href="dbus-types.html" title="Types">
+<link rel="next" href="nm-vpn-dbus-types.html" title="VPN Plugin D-Bus API Types">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="dbus-types.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="dbus-types.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="nm-vpn-dbus-types.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="nm-dbus-types"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="nm-dbus-types.top_of_page"></a>NetworkManager D-Bus API Types</span></h2>
+<p>NetworkManager D-Bus API Types</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect2">
+<a name="NMState"></a><h3>enum NMState</h3>
+<p><a class="link" href="nm-dbus-types.html#NMState" title="enum NMState">NMState</a> values indicate the current overall networking state.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.3.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>networking state is unknown</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_ASLEEP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">10</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>networking is not enabled</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_DISCONNECTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">20</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>there is no active network connection</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_DISCONNECTING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">30</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>network connections are being cleaned up</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_CONNECTING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">40</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a network connection is being started</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_CONNECTED_LOCAL</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">50</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>there is only local IPv4 and/or IPv6 connectivity</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_CONNECTED_SITE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">60</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>there is only site-wide IPv4 and/or IPv6 connectivity</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_STATE_CONNECTED_GLOBAL</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">70</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>there is global IPv4 and/or IPv6 Internet connectivity</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMConnectivityState"></a><h3>enum NMConnectivityState</h3>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.4.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_CONNECTIVITY_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Network connectivity is unknown.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_CONNECTIVITY_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The host is not connected to any network.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_CONNECTIVITY_PORTAL</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The host is behind a captive portal and cannot reach the full Internet.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_CONNECTIVITY_LIMITED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The host is connected to a network, but does not appear to be able to reach the full Internet.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_CONNECTIVITY_FULL</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The host is connected to a network, and appears to be able to reach the full Internet.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceType"></a><h3>enum NMDeviceType</h3>
+<p><a class="link" href="nm-dbus-types.html#NMDeviceType" title="enum NMDeviceType">NMDeviceType</a> values indicate the type of hardware represented by a device object.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.5.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>unknown device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_GENERIC</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">14</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>generic support for unrecognized device types</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_ETHERNET</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a wired ethernet device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_WIFI</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>an 802.11 WiFi device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_UNUSED1</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>not used</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_UNUSED2</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>not used</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_BT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a Bluetooth device supporting PAN or DUN access protocols</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_OLPC_MESH</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">6</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>an OLPC XO mesh networking device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_WIMAX</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">7</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>an 802.16e Mobile WiMAX broadband device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_MODEM</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">8</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a modem supporting analog telephone, CDMA/EVDO, GSM/UMTS, or LTE network access protocols</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_INFINIBAND</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">9</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>an IP-over-InfiniBand device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_BOND</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">10</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a bond master interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_VLAN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">11</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>an 802.1Q VLAN interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_ADSL</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">12</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>ADSL modem</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_BRIDGE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">13</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a bridge master interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_TEAM</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">15</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a team master interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_TUN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">16</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a TUN or TAP interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_IP_TUNNEL</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">17</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a IP tunnel interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_MACVLAN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">18</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a MACVLAN interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_VXLAN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">19</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a VXLAN interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_TYPE_VETH</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">20</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a VETH interface</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceCapabilities"></a><h3>enum NMDeviceCapabilities</h3>
+<p>General device capability flags.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.6.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_CAP_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device has no special capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_CAP_NM_SUPPORTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000001</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>NetworkManager supports this device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_CAP_CARRIER_DETECT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000002</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>this device can indicate carrier status</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_CAP_IS_SOFTWARE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000004</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>this device is a software device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWifiCapabilities"></a><h3>enum NMDeviceWifiCapabilities</h3>
+<p>802.11 specific device encryption and authentication capabilities.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.7.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device has no encryption/authentication capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_CIPHER_WEP40</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000001</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports 40/64-bit WEP encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_CIPHER_WEP104</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000002</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports 104/128-bit WEP encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_CIPHER_TKIP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000004</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports TKIP encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_CIPHER_CCMP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000008</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports AES/CCMP encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_WPA</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000010</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports WPA1 authentication</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_RSN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000020</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports WPA2/RSN authentication</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_AP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000040</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports Access Point mode</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_ADHOC</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000080</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports Ad-Hoc mode</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_FREQ_VALID</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000100</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device reports frequency capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_FREQ_2GHZ</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000200</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports 2.4GHz frequencies</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIFI_DEVICE_CAP_FREQ_5GHZ</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000400</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device supports 5GHz frequencies</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM80211ApFlags"></a><h3>enum NM80211ApFlags</h3>
+<p>802.11 access point flags.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.8.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_FLAGS_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>access point has no special capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_FLAGS_PRIVACY</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000001</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>access point requires authentication and encryption (usually means WEP)</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM80211ApSecurityFlags"></a><h3>enum NM80211ApSecurityFlags</h3>
+<p>802.11 access point security and authentication flags.  These flags describe the current security requirements of an access point as determined from the access point's beacon.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.9.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the access point has no special security requirements</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_PAIR_WEP40</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000001</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>40/64-bit WEP is supported for pairwise/unicast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_PAIR_WEP104</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000002</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>104/128-bit WEP is supported for pairwise/unicast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_PAIR_TKIP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000004</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>TKIP is supported for pairwise/unicast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_PAIR_CCMP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000008</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>AES/CCMP is supported for pairwise/unicast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_GROUP_WEP40</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000010</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>40/64-bit WEP is supported for group/broadcast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_GROUP_WEP104</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000020</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>104/128-bit WEP is supported for group/broadcast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_GROUP_TKIP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000040</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>TKIP is supported for group/broadcast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_GROUP_CCMP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000080</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>AES/CCMP is supported for group/broadcast encryption</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_KEY_MGMT_PSK</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000100</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>WPA/RSN Pre-Shared Key encryption is supported</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_AP_SEC_KEY_MGMT_802_1X</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000200</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>802.1x authentication and key management is supported</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NM80211Mode"></a><h3>enum NM80211Mode</h3>
+<p>Indicates the 802.11 mode an access point or device is currently in.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.10.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_MODE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device or access point mode is unknown</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_MODE_ADHOC</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>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.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_MODE_INFRA</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>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.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_802_11_MODE_AP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is an access point/hotspot.  Not valid for access point objects; used only for hotspot mode on the local machine.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMBluetoothCapabilities"></a><h3>enum NMBluetoothCapabilities</h3>
+<p><a class="link" href="nm-dbus-types.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities">NMBluetoothCapabilities</a> values indicate the usable capabilities of a Bluetooth device.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.11.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_BT_CAPABILITY_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device has no usable capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_BT_CAPABILITY_DUN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000001</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device provides Dial-Up Networking capability</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_BT_CAPABILITY_NAP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000002</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>device provides Network Access Point capability</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceModemCapabilities"></a><h3>enum NMDeviceModemCapabilities</h3>
+<p><a class="link" href="nm-dbus-types.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities">NMDeviceModemCapabilities</a> values indicate the generic radio access technology families a modem device supports.  For more information on the specific access technologies the device supports use the ModemManager D-Bus API.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.12.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_MODEM_CAPABILITY_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>modem has no usable capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_MODEM_CAPABILITY_POTS</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000001</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>modem uses the analog wired telephone network and is not a wireless/cellular device</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000002</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO revision A, or EVDO revision B</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000004</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_MODEM_CAPABILITY_LTE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x00000008</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>modem has LTE data capability</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNspNetworkType"></a><h3>enum NMWimaxNspNetworkType</h3>
+<p>WiMAX network type.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.13.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>unknown network type</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIMAX_NSP_NETWORK_TYPE_HOME</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>home network</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>partner network</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>roaming partner network</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceState"></a><h3>enum NMDeviceState</h3>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.14.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device's state is unknown</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_UNMANAGED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">10</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is recognized, but not managed by NetworkManager</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_UNAVAILABLE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">20</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is managed by NetworkManager, but is not available for use.  Reasons may include the wireless switched off, missing firmware, no ethernet carrier, missing supplicant or modem manager, etc.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_DISCONNECTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">30</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device can be activated, but is currently idle and not connected to a network.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_PREPARE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">40</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is preparing the connection to the network.  This may include operations like changing the MAC address, setting physical link properties, and anything else required to connect to the requested network.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_CONFIG</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">50</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_NEED_AUTH</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">60</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device requires more information to continue connecting to the requested network.  This includes secrets like WiFi passphrases, login passwords, PIN codes, etc.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_IP_CONFIG</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">70</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is requesting IPv4 and/or IPv6 addresses and routing information from the network.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_IP_CHECK</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">80</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is checking whether further action is required for the requested network connection.  This may include checking whether only local network access is available, whether a captive portal is blocking access to the Internet, etc.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_SECONDARIES</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">90</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device is waiting for a secondary connection (like a VPN) which must activated before the device can be activated</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_ACTIVATED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">100</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device has a network connection, either local or global.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_DEACTIVATING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">110</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a disconnection from the current network connection was requested, and the device is cleaning up resources used for that connection.  The network connection may still be valid.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">120</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device failed to connect to the requested network and is cleaning up the connection request</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceStateReason"></a><h3>enum NMDeviceStateReason</h3>
+<p>Device state change reason codes</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.15.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>No reason given</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Unknown error</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_NOW_MANAGED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Device is now managed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_NOW_UNMANAGED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Device is now unmanaged</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_CONFIG_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The device could not be readied for configuration</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>IP configuration could not be reserved (no available address, timeout, etc)</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">6</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The IP config is no longer valid</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_NO_SECRETS</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">7</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Secrets were required, but not provided</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">8</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>802.1x supplicant disconnected</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">9</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>802.1x supplicant configuration failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">10</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>802.1x supplicant failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">11</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>802.1x supplicant took too long to authenticate</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_PPP_START_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">12</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>PPP service failed to start</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_PPP_DISCONNECT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">13</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>PPP service disconnected</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_PPP_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">14</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>PPP failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_DHCP_START_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">15</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>DHCP client failed to start</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_DHCP_ERROR</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">16</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>DHCP client error</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_DHCP_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">17</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>DHCP client failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SHARED_START_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">18</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Shared connection service failed to start</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SHARED_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">19</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Shared connection service failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">20</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>AutoIP service failed to start</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_AUTOIP_ERROR</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">21</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>AutoIP service error</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_AUTOIP_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">22</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>AutoIP service failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_BUSY</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">23</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The line is busy</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">24</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>No dial tone</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">25</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>No carrier could be established</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">26</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The dialing request timed out</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">27</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The dialing attempt failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">28</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Modem initialization failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_APN_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">29</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Failed to select the specified APN</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">30</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Not searching for networks</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">31</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Network registration denied</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">32</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Network registration timed out</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">33</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Failed to register with the requested network</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">34</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>PIN check failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_FIRMWARE_MISSING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">35</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Necessary firmware for the device may be missing</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_REMOVED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">36</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The device was removed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SLEEPING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">37</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>NetworkManager went to sleep</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_CONNECTION_REMOVED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">38</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The device's active connection disappeared</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_USER_REQUESTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">39</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Device disconnected by user or client</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_CARRIER</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">40</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Carrier/link changed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">41</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The device's existing connection was assumed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">42</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The supplicant is now available</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">43</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The modem could not be found</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_BT_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">44</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The Bluetooth connection failed or timed out</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">45</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>GSM Modem's SIM Card not inserted</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">46</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>GSM Modem's SIM Pin required</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">47</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>GSM Modem's SIM Puk required</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_GSM_SIM_WRONG</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">48</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>GSM Modem's SIM wrong</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_INFINIBAND_MODE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">49</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>InfiniBand device does not support connected mode</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">50</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>A dependency of the connection failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_BR2684_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">51</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Problem with the RFC 2684 Ethernet over ADSL bridge</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">52</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>ModemManager not running</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SSID_NOT_FOUND</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">53</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The WiFi network could not be found</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">54</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>A secondary connection of the base connection failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">55</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>DCB or FCoE setup failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">56</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>teamd control failed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">57</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Modem failed or no longer available</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_MODEM_AVAILABLE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">58</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Modem now ready and available</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">59</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>SIM PIN was incorrect</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_NEW_ACTIVATION</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">60</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>New connection activation was enqueued</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_PARENT_CHANGED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">61</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device's parent changed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">62</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the device parent's management changed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMMetered"></a><h3>enum NMMetered</h3>
+<p>Since: 1.2</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.16.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_METERED_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The metered status is unknown</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_METERED_YES</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Metered, the value was statically set</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_METERED_NO</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Not metered, the value was statically set</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_METERED_GUESS_YES</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Metered, the value was guessed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_METERED_GUESS_NO</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Not metered, the value was guessed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMActiveConnectionState"></a><h3>enum NMActiveConnectionState</h3>
+<p><a class="link" href="nm-dbus-types.html#NMActiveConnectionState" title="enum NMActiveConnectionState">NMActiveConnectionState</a> values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.17.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_ACTIVE_CONNECTION_STATE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the state of the connection is unknown</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_ACTIVE_CONNECTION_STATE_ACTIVATING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>a network connection is being prepared</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_ACTIVE_CONNECTION_STATE_ACTIVATED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>there is a connection to the network</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_ACTIVE_CONNECTION_STATE_DEACTIVATING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the network connection is being torn down and cleaned up</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_ACTIVE_CONNECTION_STATE_DEACTIVATED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the network connection is disconnected and will be removed</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentGetSecretsFlags"></a><h3>enum NMSecretAgentGetSecretsFlags</h3>
+<p><a class="link" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</a> values modify the behavior of a GetSecrets request.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.18.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>no special behavior; by default no user interaction is allowed and requests for secrets are fulfilled from persistent storage, or if no secrets are available an error is returned.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>allows the request to interact with the user, possibly prompting via UI for secrets if any are required, or if none are found in persistent storage.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>explicitly prompt for new secrets from the user.  This flag signals that NetworkManager thinks any existing secrets are invalid or wrong.  This flag implies that interaction is allowed.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>set if the request was initiated by user-requested action via the D-Bus interface, as opposed to automatically initiated by NetworkManager in response to (for example) scan results or carrier changes.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x80000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Internal flag, not part of the D-Bus API.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x40000000</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Internal flag, not part of the D-Bus API.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentCapabilities"></a><h3>enum NMSecretAgentCapabilities</h3>
+<p><a class="link" href="nm-dbus-types.html#NMSecretAgentCapabilities" title="enum NMSecretAgentCapabilities">NMSecretAgentCapabilities</a> indicate various capabilities of the agent.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.19.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_CAPABILITY_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the agent supports no special capabilities</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_SECRET_AGENT_CAPABILITY_VPN_HINTS</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>the agent supports passing hints to VPN plugin authentication dialogs.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMIPTunnelMode"></a><h3>enum NMIPTunnelMode</h3>
+<p>The tunneling mode.</p>
+<p>Since: 1.2</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.2.20.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Unknown/unset tunnel mode</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_IPIP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>IP in IP tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_GRE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>GRE tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_SIT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>SIT tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_ISATAP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>ISATAP tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_VTI</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>VTI tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_IP6IP6</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">6</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>IPv6 in IPv6 tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_IPIP6</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">7</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>IPv4 in IPv6 tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_IP6GRE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">8</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>IPv6 GRE tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_IP_TUNNEL_MODE_VTI6</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">9</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>IPv6 VTI tunnel</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.24</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 9077d8e3..b677ece9 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -1216,7 +1216,7 @@
 <td align="left">addr-gen-mode</td>
 <td align="left">int32</td>
 <td align="left">1</td>
-<td>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</td>
+<td>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</td>
 </tr>
 <tr>
 <td align="left">address-data</td>
diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html
new file mode 100644
index 00000000..8e1ac031
--- /dev/null
+++ b/docs/api/html/nm-vpn-dbus-types.html
@@ -0,0 +1,560 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>VPN Plugin D-Bus API Types: NetworkManager Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="NetworkManager Reference Manual">
+<link rel="up" href="dbus-types.html" title="Types">
+<link rel="prev" href="nm-dbus-types.html" title="NetworkManager D-Bus API Types">
+<link rel="next" href="ref-settings.html" title="Network Configuration Setting Specification">
+<meta name="generator" content="GTK-Doc V1.24 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="dbus-types.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="nm-dbus-types.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="ref-settings.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
+<div class="refentry">
+<a name="nm-vpn-dbus-types"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="nm-vpn-dbus-types.top_of_page"></a>VPN Plugin D-Bus API Types</span></h2>
+<p>VPN Plugin D-Bus API Types</p>
+</td>
+<td class="gallery_image" valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect2">
+<a name="NMVpnServiceState"></a><h3>enum NMVpnServiceState</h3>
+<p>VPN daemon states</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.3.3.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The state of the VPN plugin is unknown.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_INIT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN plugin is initialized.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_SHUTDOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Not used.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_STARTING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The plugin is attempting to connect to a VPN server.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_STARTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The plugin has connected to a VPN server.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_STOPPING</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The plugin is disconnecting from the VPN server.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_SERVICE_STATE_STOPPED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">6</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The plugin has disconnected from the VPN server.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMVpnConnectionState"></a><h3>enum NMVpnConnectionState</h3>
+<p>VPN connection states</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.3.4.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The state of the VPN connection is unknown.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_PREPARE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection is preparing to connect.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_NEED_AUTH</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection needs authorization credentials.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_CONNECT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection is being established.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_IP_CONFIG_GET</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection is getting an IP address.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_ACTIVATED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection is active.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">6</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection failed.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_DISCONNECTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">7</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection is disconnected.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMVpnConnectionStateReason"></a><h3>enum NMVpnConnectionStateReason</h3>
+<p>VPN connection state reasons</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.3.5.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_UNKNOWN</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The reason for the VPN connection state change is unknown.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>No reason was given for the VPN connection state change.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection changed state because the user disconnected it.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The VPN connection changed state because the device it was using was disconnected.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">4</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The service providing the VPN connection was stopped.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">5</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The IP config of the VPN connection was invalid.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">6</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The connection attempt to the VPN service timed out.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">7</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>A timeout occurred while starting the service providing the VPN connection.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">8</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Starting the service starting the service providing the VPN connection failed.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">9</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Necessary secrets for the VPN connection were not provided.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">10</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Authentication to the VPN server failed.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">11</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>The connection was deleted from settings.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="NMVpnPluginFailure"></a><h3>enum NMVpnPluginFailure</h3>
+<p>VPN plugin failure reasons</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.3.4.3.6.4"></a><h4>Values</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Login failed.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">2</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Connect failed.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">3</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>Invalid IP configuration returned from the VPN plugin.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.24</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html
index 91d1e2b5..d66bcb34 100644
--- a/docs/api/html/nmcli.html
+++ b/docs/api/html/nmcli.html
@@ -136,13 +136,6 @@
 </td>
 </tr>
 <tr>
-<td><p><span class="term">  <code class="option">-n</code>  |   <code class="option">--nocheck</code>  </span></p></td>
-<td><p>This option can be used to force <span class="command"><strong>nmcli</strong></span> to skip
-          checking <span class="command"><strong>nmcli</strong></span> and <span class="command"><strong>NetworkManager</strong></span>
-          version compatibility. Use it with care, because using incompatible versions
-          may produce incorrect results.</p></td>
-</tr>
-<tr>
 <td><p><span class="term">  <code class="option">-a</code>  |   <code class="option">--ask</code>  </span></p></td>
 <td><p>When using this option <span class="command"><strong>nmcli</strong></span> will stop and ask for any
           missing required arguments, so do not use this option for non-interactive
@@ -2073,11 +2066,6 @@
 <td><p>NetworkManager is not running.</p></td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="errorcode">9</span></span></p></td>
-<td><p><span class="command"><strong>nmcli</strong></span> and <span class="command"><strong>NetworkManager</strong></span>
-          versions mismatch.</p></td>
-</tr>
-<tr>
 <td><p><span class="term"><span class="errorcode">10</span></span></p></td>
 <td><p>Connection, device, or access point does not exist.</p></td>
 </tr>
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index e66100c7..ab610728 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="NetworkManager Reference Manual">
 <link rel="up" href="index.html" title="NetworkManager Reference Manual">
-<link rel="prev" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html" title="org.freedesktop.NetworkManager.SecretAgent">
+<link rel="prev" href="nm-vpn-dbus-types.html" title="VPN Plugin D-Bus API Types">
 <link rel="next" href="secrets-flags.html" title="Secret flag types">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,7 +16,7 @@
 <td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
-<td><a accesskey="p" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="nm-vpn-dbus-types.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="secrets-flags.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
@@ -1172,7 +1172,7 @@
 <td><pre class="screen">addr-gen-mode</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">1</pre></td>
-<td>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</td>
+<td>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</td>
 </tr>
 <tr>
 <td><pre class="screen">address-data</pre></td>
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 8259f088..641e217c 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -125,6 +125,15 @@
 <span class="refentrytitle"><a href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html">org.freedesktop.NetworkManager.SecretAgent</a></span><span class="refpurpose"></span>
 </dt>
 </dl></dd>
+<dt><span class="section"><a href="dbus-types.html">Types</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="nm-dbus-types.html">NetworkManager D-Bus API Types</a></span><span class="refpurpose"></span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="nm-vpn-dbus-types.html">VPN Plugin D-Bus API Types</a></span><span class="refpurpose"></span>
+</dt>
+</dl></dd>
 </dl></div>
 <p>
       This part documents the D-Bus interface used to access the
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index ff1cb82d..722e33fd 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -99,6 +99,11 @@
       <xi:include href="../../introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
       <xi:include href="../../introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml"/>
     </section>
+    <section id="dbus-types">
+      <title>Types</title>
+      <xi:include href="../../libnm-core/nm-dbus-types.xml"/>
+      <xi:include href="../../libnm-core/nm-vpn-dbus-types.xml"/>
+    </section>
   </chapter>
 
   <chapter id="ref-settings">
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 9814af91..8bcbf25e 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -171,7 +171,7 @@
     <row><entry><screen>routes</screen></entry><entry><screen>array of array of uint32</screen></entry><entry><screen>[]</screen></entry><entry>Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)</entry></row>
   </tbody></tgroup></table></para>
   <para><table><title>ipv6 setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody>
-    <row><entry><screen>addr-gen-mode</screen></entry><entry><screen>int32</screen></entry><entry><screen>1</screen></entry><entry>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</entry></row>
+    <row><entry><screen>addr-gen-mode</screen></entry><entry><screen>int32</screen></entry><entry><screen>1</screen></entry><entry>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</entry></row>
     <row><entry><screen>address-data</screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry>Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.</entry></row>
     <row><entry><screen>addresses</screen></entry><entry><screen>array of legacy IPv6 address struct (a(ayuay))</screen></entry><entry><screen>[]</screen></entry><entry>Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.</entry></row>
     <row><entry><screen>dad-timeout</screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.</entry></row>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 26aaba0e..23aa8390 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.2.0
+1.2.2
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 33e38b22..f1594682 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 1.2.0
+      for libnm-glib 1.2.2
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-glib/stable/" target="_top">https://developer.gnome.org/libnm-glib/stable/</a>.
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 26aaba0e..23aa8390 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.2.0
+1.2.2
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 7572c017..6fbcc515 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -598,7 +598,7 @@
 </div>
 <div class="refsect1">
 <a name="NMConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMConnectionError
     GObject
     <span class="lineart">╰──</span> NMConnection
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 3ce89683..83dc3b25 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -271,7 +271,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSetting.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingCompareFlags
     <span class="lineart">├──</span> NMSettingDiffResult
     <span class="lineart">├──</span> NMSettingError
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 05d9516c..c36eaff5 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -923,7 +923,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSetting8021x.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSetting8021xCKFormat
     <span class="lineart">├──</span> NMSetting8021xCKScheme
     <span class="lineart">╰──</span> NMSetting8021xError
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index 165177b5..a1ecee9b 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -236,7 +236,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingAdsl.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingAdslError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index b011f98f..885a378b 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -139,7 +139,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingBluetooth.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingBluetoothError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index 8d0e4d48..ac2fdc8e 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -244,7 +244,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingBond.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingBondError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index 71cdd58f..6eb6900c 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -233,7 +233,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingBridge.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingBridgeError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index bc204181..53126856 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -148,7 +148,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingBridgePort.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingBridgePortError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 43980d9d..c96324ad 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -165,7 +165,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingCdma.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingCdmaError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index ba73eb00..db0dc6ed 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -403,7 +403,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingConnectionError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 5cd1cd53..fd94edf0 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -418,7 +418,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingDcb.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingDcbError
     <span class="lineart">╰──</span> NMSettingDcbFlags
     GObject
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index b6cc9066..18fbdb85 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -84,7 +84,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingGeneric.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingGenericError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 1e725b02..4a1d9629 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -296,7 +296,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingGsm.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingGsmError
     <span class="lineart">├──</span> NMSettingGsmNetworkBand
     <span class="lineart">╰──</span> NMSettingGsmNetworkType
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index b14b4721..d48a7338 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -710,10 +710,10 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingIP4Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    GBoxed
     <span class="lineart">├──</span> NMIP4Address
     <span class="lineart">╰──</span> NMIP4Route
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    GEnum
     <span class="lineart">╰──</span> NMSettingIP4ConfigError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index eb42de11..76fd5ef4 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -677,10 +677,10 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingIP6Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    GBoxed
     <span class="lineart">├──</span> NMIP6Address
     <span class="lineart">╰──</span> NMIP6Route
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    GEnum
     <span class="lineart">├──</span> NMSettingIP6ConfigError
     <span class="lineart">╰──</span> NMSettingIP6ConfigPrivacy
     GObject
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 82db623e..de8975e2 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -182,7 +182,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingInfiniband.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingInfinibandError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index d9a5d1d0..fbcb946d 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -148,7 +148,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingOlpcMesh.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingOlpcMeshError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index c66bd595..543868a4 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -404,7 +404,7 @@ that require PPP to deliver IP capability</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingPPP.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingPPPError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index c7abaffe..0d2355a7 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -165,7 +165,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingPPPOE.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingPPPOEError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 43c21e9e..b371e910 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -183,7 +183,7 @@ serial communications</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingSerial.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingSerialError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 2e40a312..846f6179 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -131,7 +131,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingTeam.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingTeamError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index c08a4eb0..37a4495b 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -112,7 +112,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingTeamPort.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingTeamPortError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index e3243206..884fbf32 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -256,7 +256,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingVPN.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingVpnError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index df603abd..9f003de2 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -261,7 +261,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingVlan.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingVlanError
     <span class="lineart">├──</span> NMVlanFlags
     <span class="lineart">╰──</span> NMVlanPriorityMap
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 26544076..242b8222 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -131,7 +131,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingWimax.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingWimaxError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 75184b1b..9a6619aa 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -369,7 +369,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingWired.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingWiredError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 1db2d508..9aab30bc 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -435,7 +435,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingWireless.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingWirelessError
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index d091dda2..36b60f5f 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -498,7 +498,7 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingWirelessSecurity.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingWirelessSecurityError
     <span class="lineart">╰──</span> NMWepKeyType
     GObject
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 974ce75b..d7a5b342 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.2.0
+      for libnm-util 1.2.2
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-util/stable/" target="_top">https://developer.gnome.org/libnm-util/stable/</a>.
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 9507d0ab..350ba973 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -480,7 +480,7 @@
 </div>
 <div class="refsect1">
 <a name="libnm-util-nm-utils.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMUtilsSecurityType
 </pre>
 </div>
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 9c2eaa40..4c668702 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -52,7 +52,7 @@
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMSettingVPN.html" title="NMSettingVPN">NMSettingVPN</a>
     <span class="lineart">╰──</span> <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    GEnum
     <span class="lineart">├──</span> <a class="link" href="NMConnection.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>
     <span class="lineart">├──</span> <a class="link" href="NMSetting8021x.html#NMSetting8021xCKFormat" title="enum NMSetting8021xCKFormat">NMSetting8021xCKFormat</a>
     <span class="lineart">├──</span> <a class="link" href="NMSetting8021x.html#NMSetting8021xCKScheme" title="enum NMSetting8021xCKScheme">NMSetting8021xCKScheme</a>
@@ -95,7 +95,7 @@
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanFlags" title="enum NMVlanFlags">NMVlanFlags</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap">NMVlanPriorityMap</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+    GBoxed
     <span class="lineart">├──</span> <a class="link" href="NMSettingIP4Config.html#NMIP4Address">NMIP4Address</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIP4Config.html#NMIP4Route">NMIP4Route</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIP6Config.html#NMIP6Address">NMIP6Address</a>
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 26aaba0e..23aa8390 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.2.0
+1.2.2
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index 13175232..f3f0cf7e 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -38,7 +38,6 @@ IGNORE_HFILES= \
 	crypto.h \
 	nm-dbus-helpers.h \
 	nm-core-internal.h \
-	nm-core-types.h \
 	nm-core-types-internal.h \
 	nm-device-private.h \
 	nm-dhcp4-config.h \
@@ -52,7 +51,6 @@ IGNORE_HFILES= \
 	nm-remote-connection-private.h \
 	nm-remote-settings.h \
 	nm-setting-private.h \
-	nm-types.h \
 	nm-utils-private.h \
 	nm-core-tests-enum-types.h \
 	nm-keyfile-internal.h \
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index 8006dc17..74eaa53f 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -441,7 +441,6 @@ IGNORE_HFILES = \
 	crypto.h \
 	nm-dbus-helpers.h \
 	nm-core-internal.h \
-	nm-core-types.h \
 	nm-core-types-internal.h \
 	nm-device-private.h \
 	nm-dhcp4-config.h \
@@ -455,7 +454,6 @@ IGNORE_HFILES = \
 	nm-remote-connection-private.h \
 	nm-remote-settings.h \
 	nm-setting-private.h \
-	nm-types.h \
 	nm-utils-private.h \
 	nm-core-tests-enum-types.h \
 	nm-keyfile-internal.h \
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 2fbd6507..56a6c893 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMAccessPoint.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMAccessPoint.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMAccessPoint.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMAccessPoint.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMAccessPoint.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -261,6 +262,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS" title="NM_ACCESS_POINT_HW_ADDRESS">NM_ACCESS_POINT_HW_ADDRESS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMAccessPoint.html#NMAccessPoint-struct" title="NMAccessPoint">NMAccessPoint</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -272,6 +277,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMAccessPoint.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMAccessPoint implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMAccessPoint.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -282,7 +293,7 @@
 nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the flags of the access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -297,7 +308,7 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.2.6"></a><h4>Returns</h4>
 <p> the flags</p>
 </div>
 </div>
@@ -308,7 +319,7 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the WPA (version 1) flags of the access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -323,7 +334,7 @@ nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.3.6"></a><h4>Returns</h4>
 <p> the WPA flags</p>
 </div>
 </div>
@@ -335,7 +346,7 @@ nm_access_point_get_rsn_flags (<em class="parameter"><code><a class="link" href=
 <p>Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -350,7 +361,7 @@ point.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.4.6"></a><h4>Returns</h4>
 <p> the RSN flags</p>
 </div>
 </div>
@@ -361,7 +372,7 @@ point.</p>
 nm_access_point_get_ssid (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the SSID of the access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -376,7 +387,7 @@ nm_access_point_get_ssid (<em class="parameter"><code><a class="link" href="NMAc
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.5.6"></a><h4>Returns</h4>
 <p> the <span class="type">GBytes</span> containing the SSID, or <code class="literal">NULL</code> if the
 SSID is unknown. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -389,7 +400,7 @@ SSID is unknown. </p>
 nm_access_point_get_bssid (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the Basic Service Set ID (BSSID) of the Wi-Fi access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -404,7 +415,7 @@ nm_access_point_get_bssid (<em class="parameter"><code><a class="link" href="NMA
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.6.6"></a><h4>Returns</h4>
 <p> the BSSID of the access point. This is an internal string and must
 not be modified or freed.</p>
 </div>
@@ -416,7 +427,7 @@ not be modified or freed.</p>
 nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the frequency of the access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -431,7 +442,7 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.7.6"></a><h4>Returns</h4>
 <p> the frequency</p>
 </div>
 </div>
@@ -442,7 +453,7 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the mode of the access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -457,7 +468,7 @@ nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAc
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.8.6"></a><h4>Returns</h4>
 <p> the mode</p>
 </div>
 </div>
@@ -468,7 +479,7 @@ nm_access_point_get_mode (<em class="parameter"><code><a class="link" href="NMAc
 nm_access_point_get_max_bitrate (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the maximum bit rate of the access point in kbit/s.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -483,7 +494,7 @@ nm_access_point_get_max_bitrate (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.9.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.9.6"></a><h4>Returns</h4>
 <p> the maximum bit rate (kbit/s)</p>
 </div>
 </div>
@@ -494,7 +505,7 @@ nm_access_point_get_max_bitrate (<em class="parameter"><code><a class="link" hre
 nm_access_point_get_strength (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>);</pre>
 <p>Gets the current signal strength of the access point.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -509,7 +520,7 @@ nm_access_point_get_strength (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.10.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.10.6"></a><h4>Returns</h4>
 <p> the signal strength</p>
 </div>
 </div>
@@ -522,7 +533,7 @@ nm_access_point_get_last_seen (<em class="parameter"><code><a class="link" href=
 access point was found in scan results.  A value of -1 means the access
 point has not been found in a scan.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -537,7 +548,7 @@ point has not been found in a scan.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.11.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.11.6"></a><h4>Returns</h4>
 <p> the last seen time in seconds</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -558,7 +569,7 @@ use <a class="link" href="NMClient.html#nm-client-get-connections" title="nm_cli
 <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> using <a class="link" href="NMDevice.html#nm-device-filter-connections" title="nm_device_filter_connections ()"><code class="function">nm_device_filter_connections()</code></a> and finally filter that list
 with this function.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.12.6"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.12.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -573,7 +584,7 @@ with this function.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p> an array of <a href="NMConnection.html"><span class="type">NMConnections</span></a> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -581,9 +592,9 @@ filter. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.12.7"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.12.7"></a><h4>Returns</h4>
 <p> an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>ap</code></em>
+<a href="NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>ap</code></em>
 .  The array should
 be freed with <code class="function">g_ptr_array_unref()</code> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
@@ -594,14 +605,14 @@ be freed with <code class="function">g_ptr_array_unref()</code> when it is no lo
 <a name="nm-access-point-connection-valid"></a><h3>nm_access_point_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_access_point_connection_valid (<em class="parameter"><code><a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> *ap</code></em>,
-                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                  <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 <em class="parameter"><code>ap</code></em>
 's SSID, (if given) BSSID, and other attributes like security settings,
 channel, band, etc.</p>
 <div class="refsect3">
-<a name="id-1.5.23.8.13.5"></a><h4>Parameters</h4>
+<a name="id-1.5.23.9.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -617,7 +628,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
+<td class="parameter_description"><p>an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -625,7 +636,7 @@ against</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.23.8.13.6"></a><h4>Returns</h4>
+<a name="id-1.5.23.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this Wi-Fi AP,
 <code class="literal">FALSE</code> if it cannot be.</p>
 </div>
@@ -698,6 +709,11 @@ against</p></td>
 <pre class="programlisting">#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMAccessPoint-struct"></a><h3>NMAccessPoint</h3>
+<pre class="programlisting">typedef struct _NMAccessPoint NMAccessPoint;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMAccessPoint.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 55266de2..8ef75fb1 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMActiveConnection.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMActiveConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMActiveConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMActiveConnection.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMActiveConnection.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -325,6 +326,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMActiveConnection.html#NM-ACTIVE-CONNECTION-MASTER:CAPS" title="NM_ACTIVE_CONNECTION_MASTER">NM_ACTIVE_CONNECTION_MASTER</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMActiveConnection.html#NMActiveConnection-struct" title="NMActiveConnection">NMActiveConnection</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -337,6 +342,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMActiveConnection.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMActiveConnection implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMActiveConnection.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -348,7 +359,7 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 <p>Gets the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> associated with <em class="parameter"><code>connection</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -363,7 +374,7 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.2.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> which this
 <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> is an active instance of. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -374,9 +385,9 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 <a name="nm-active-connection-get-id"></a><h3>nm_active_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s ID.</p>
+<p>Gets the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>'s ID.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -391,8 +402,8 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.3.6"></a><h4>Returns</h4>
-<p> the ID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<a name="id-1.5.20.9.3.6"></a><h4>Returns</h4>
+<p> the ID of the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -401,9 +412,9 @@ This is the internal string used by the connection, and must not be modified.</p
 <a name="nm-active-connection-get-uuid"></a><h3>nm_active_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s UUID.</p>
+<p>Gets the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>'s UUID.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -418,8 +429,8 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.4.6"></a><h4>Returns</h4>
-<p> the UUID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<a name="id-1.5.20.9.4.6"></a><h4>Returns</h4>
+<p> the UUID of the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -429,9 +440,9 @@ This is the internal string used by the connection, and must not be modified.</p
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection_type
                                (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>'s type.</p>
+<p>Gets the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>'s type.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -446,8 +457,8 @@ nm_active_connection_get_connection_type
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.5.6"></a><h4>Returns</h4>
-<p> the type of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<a name="id-1.5.20.9.5.6"></a><h4>Returns</h4>
+<p> the type of the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
 This is the internal string used by the connection, and must not be modified.</p>
 </div>
 </div>
@@ -465,7 +476,7 @@ is based on other information. (Eg, if <em class="parameter"><code>connection</c
 connection, then the specific object will be an <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>, and you can
 resolve it with <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-access-point-by-path" title="nm_device_wifi_get_access_point_by_path ()"><code class="function">nm_device_wifi_get_access_point_by_path()</code></a>.)</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.6.6"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.6.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -480,7 +491,7 @@ resolve it with <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-acces
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.6.7"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.6.7"></a><h4>Returns</h4>
 <p> the specific object's D-Bus path. This is the internal string used
 by the connection, and must not be modified.</p>
 </div>
@@ -492,7 +503,7 @@ by the connection, and must not be modified.</p>
 nm_active_connection_get_devices (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the <a href="NMDevice.html"><span class="type">NMDevices</span></a> used for the active connections.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -507,7 +518,7 @@ nm_active_connection_get_devices (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.7.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span> containing <a href="NMDevice.html"><span class="type">NMDevices</span></a>.
 This is the internal copy used by the connection, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
@@ -520,7 +531,7 @@ This is the internal copy used by the connection, and must not be modified. </p>
 nm_active_connection_get_state (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the active connection's state.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -535,7 +546,7 @@ nm_active_connection_get_state (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.8.6"></a><h4>Returns</h4>
 <p> the state</p>
 </div>
 </div>
@@ -546,7 +557,7 @@ nm_active_connection_get_state (<em class="parameter"><code><a class="link" href
 nm_active_connection_get_master (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -561,7 +572,7 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.9.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.9.6"></a><h4>Returns</h4>
 <p> the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -574,7 +585,7 @@ nm_active_connection_get_default (<em class="parameter"><code><a class="link" hr
 <p>Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -589,7 +600,7 @@ the default IPv4 route and DNS information).</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.10.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is the default IPv4 connection</p>
 </div>
 </div>
@@ -600,7 +611,7 @@ the default IPv4 route and DNS information).</p>
 nm_active_connection_get_ip4_config (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the current IPv4 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> associated with the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -615,7 +626,7 @@ nm_active_connection_get_ip4_config (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.11.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.11.6"></a><h4>Returns</h4>
 <p> the IPv4 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a>, or <code class="literal">NULL</code> if the connection is
 not in the <a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -629,7 +640,7 @@ nm_active_connection_get_dhcp4_config (<em class="parameter"><code><a class="lin
 <p>Gets the current IPv4 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> (if any) associated with the
 <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.12.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -644,7 +655,7 @@ nm_active_connection_get_dhcp4_config (<em class="parameter"><code><a class="lin
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.12.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.12.6"></a><h4>Returns</h4>
 <p> the IPv4 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a>, or <code class="literal">NULL</code> if the connection
 does not use DHCP, or is not in the <a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </p>
@@ -659,7 +670,7 @@ nm_active_connection_get_default6 (<em class="parameter"><code><a class="link" h
 <p>Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.13.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -674,7 +685,7 @@ the default IPv6 route and DNS information).</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.13.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.13.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is the default IPv6 connection</p>
 </div>
 </div>
@@ -685,7 +696,7 @@ the default IPv6 route and DNS information).</p>
 nm_active_connection_get_ip6_config (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Gets the current IPv6 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> associated with the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.14.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -700,7 +711,7 @@ nm_active_connection_get_ip6_config (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.14.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.14.6"></a><h4>Returns</h4>
 <p> the IPv6 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a>, or <code class="literal">NULL</code> if the connection is
 not in the <a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -714,7 +725,7 @@ nm_active_connection_get_dhcp6_config (<em class="parameter"><code><a class="lin
 <p>Gets the current IPv6 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> (if any) associated with the
 <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.15.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -729,7 +740,7 @@ nm_active_connection_get_dhcp6_config (<em class="parameter"><code><a class="lin
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.15.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.15.6"></a><h4>Returns</h4>
 <p> the IPv6 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a>, or <code class="literal">NULL</code> if the connection
 does not use DHCPv6, or is not in the <a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
 state. </p>
@@ -743,7 +754,7 @@ state. </p>
 nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
 <p>Whether the active connection is a VPN connection.</p>
 <div class="refsect3">
-<a name="id-1.5.20.8.16.5"></a><h4>Parameters</h4>
+<a name="id-1.5.20.9.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -758,7 +769,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.20.8.16.6"></a><h4>Returns</h4>
+<a name="id-1.5.20.9.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the active connection is a VPN connection</p>
 </div>
 </div>
@@ -854,6 +865,11 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting">#define NM_ACTIVE_CONNECTION_MASTER               "master"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMActiveConnection-struct"></a><h3>NMActiveConnection</h3>
+<pre class="programlisting">typedef struct _NMActiveConnection NMActiveConnection;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMActiveConnection.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index a990346a..e5449080 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMClient.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMClient.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMClient.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMClient.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMClient.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#NMClient.signals" class="shortcut">Signals</a></span>
 </td>
@@ -788,12 +789,16 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMClient.html#NM-CLIENT-ERROR:CAPS" title="NM_CLIENT_ERROR">NM_CLIENT_ERROR</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMClient.html#NMClient-struct" title="NMClient">NMClient</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMClient.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMClientError
     <span class="lineart">├──</span> NMClientPermission
     <span class="lineart">╰──</span> NMClientPermissionResult
@@ -802,6 +807,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMClient.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMClient implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMClient.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -812,7 +823,7 @@
 nm_client_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Registers an error quark for <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> if necessary.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.2.5"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.2.5"></a><h4>Returns</h4>
 <p> the error quark used for <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> errors.</p>
 </div>
 </div>
@@ -827,7 +838,7 @@ nm_client_new (<em class="parameter"><code><span class="type">GCancellable</span
 client. You can use <a class="link" href="NMClient.html#nm-client-new-async" title="nm_client_new_async ()"><code class="function">nm_client_new_async()</code></a> if you want to avoid
 that.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.3.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.3.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -849,7 +860,7 @@ that.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.3.7"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.3.7"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> or NULL on an error</p>
 </div>
 </div>
@@ -866,7 +877,7 @@ nm_client_new_async (<em class="parameter"><code><span class="type">GCancellable
 <a class="link" href="NMClient.html#nm-client-new-finish" title="nm_client_new_finish ()"><code class="function">nm_client_new_finish()</code></a> to get the result. Note that on an error,
 the callback can be invoked with two first parameters as NULL.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -902,7 +913,7 @@ nm_client_new_finish (<em class="parameter"><code><span class="type">GAsyncResul
                       <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of an <a class="link" href="NMClient.html#nm-client-new-async" title="nm_client_new_async ()"><code class="function">nm_client_new_async()</code></a> call.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -924,7 +935,7 @@ nm_client_new_finish (<em class="parameter"><code><span class="type">GAsyncResul
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.5.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.5.6"></a><h4>Returns</h4>
 <p> a new <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>, or <code class="literal">NULL</code> on error</p>
 </div>
 </div>
@@ -935,7 +946,7 @@ nm_client_new_finish (<em class="parameter"><code><span class="type">GAsyncResul
 nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets NetworkManager version.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -950,7 +961,7 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.6.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.6.6"></a><h4>Returns</h4>
 <p> string with the version (or <code class="literal">NULL</code> if NetworkManager is not running)</p>
 </div>
 </div>
@@ -961,7 +972,7 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets the current daemon state.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -976,7 +987,7 @@ nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.7.6"></a><h4>Returns</h4>
 <p> the current <a class="link" href="libnm-nm-dbus-interface.html#NMState" title="enum NMState"><code class="literal">NMState</code></a></p>
 </div>
 </div>
@@ -988,7 +999,7 @@ nm_client_get_startup (<em class="parameter"><code><a class="link" href="NMClien
 <p>Tests whether the daemon is still in the process of activating
 connections at startup.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1003,7 +1014,7 @@ connections at startup.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.8.6"></a><h4>Returns</h4>
 <p> whether the daemon is still starting up</p>
 </div>
 </div>
@@ -1014,7 +1025,7 @@ connections at startup.</p>
 nm_client_get_nm_running (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether the daemon is running.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1029,7 +1040,7 @@ nm_client_get_nm_running (<em class="parameter"><code><a class="link" href="NMCl
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.9.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.9.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the daemon is running</p>
 </div>
 </div>
@@ -1040,7 +1051,7 @@ nm_client_get_nm_running (<em class="parameter"><code><a class="link" href="NMCl
 nm_client_networking_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Whether networking is enabled or disabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1055,7 +1066,7 @@ nm_client_networking_get_enabled (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.10.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if networking is enabled, <code class="literal">FALSE</code> if networking is disabled</p>
 </div>
 </div>
@@ -1070,7 +1081,7 @@ nm_client_networking_set_enabled (<em class="parameter"><code><a class="link" hr
 interfaces are disconnected and deactivated.  When networking is enabled,
 all controlled interfaces are available for activation.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.11.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1097,7 +1108,7 @@ all controlled interfaces are available for activation.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.11.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
 </div>
 </div>
@@ -1108,7 +1119,7 @@ all controlled interfaces are available for activation.</p>
 nm_client_wireless_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether the wireless is enabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.12.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1123,7 +1134,7 @@ nm_client_wireless_get_enabled (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.12.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if wireless is enabled</p>
 </div>
 </div>
@@ -1135,7 +1146,7 @@ nm_client_wireless_set_enabled (<em class="parameter"><code><a class="link" href
                                 <em class="parameter"><code><span class="type">gboolean</span> enabled</code></em>);</pre>
 <p>Enables or disables wireless devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.13.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1165,7 +1176,7 @@ nm_client_wireless_hardware_get_enabled
                                (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether the wireless hardware is enabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.14.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1180,7 +1191,7 @@ nm_client_wireless_hardware_get_enabled
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.14.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the wireless hardware is enabled</p>
 </div>
 </div>
@@ -1191,7 +1202,7 @@ nm_client_wireless_hardware_get_enabled
 nm_client_wwan_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether WWAN is enabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.15.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1206,7 +1217,7 @@ nm_client_wwan_get_enabled (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.15.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if WWAN is enabled</p>
 </div>
 </div>
@@ -1218,7 +1229,7 @@ nm_client_wwan_set_enabled (<em class="parameter"><code><a class="link" href="NM
                             <em class="parameter"><code><span class="type">gboolean</span> enabled</code></em>);</pre>
 <p>Enables or disables WWAN devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.16.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1247,7 +1258,7 @@ nm_client_wwan_set_enabled (<em class="parameter"><code><a class="link" href="NM
 nm_client_wwan_hardware_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether the WWAN hardware is enabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.17.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.17.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1262,7 +1273,7 @@ nm_client_wwan_hardware_get_enabled (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.17.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the WWAN hardware is enabled</p>
 </div>
 </div>
@@ -1273,7 +1284,7 @@ nm_client_wwan_hardware_get_enabled (<em class="parameter"><code><a class="link"
 nm_client_wimax_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether WiMAX is enabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.18.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.18.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1288,7 +1299,7 @@ nm_client_wimax_get_enabled (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.18.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.18.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if WiMAX is enabled</p>
 </div>
 </div>
@@ -1300,7 +1311,7 @@ nm_client_wimax_set_enabled (<em class="parameter"><code><a class="link" href="N
                              <em class="parameter"><code><span class="type">gboolean</span> enabled</code></em>);</pre>
 <p>Enables or disables WiMAX devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.19.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.19.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1329,7 +1340,7 @@ nm_client_wimax_set_enabled (<em class="parameter"><code><a class="link" href="N
 nm_client_wimax_hardware_get_enabled (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Determines whether the WiMAX hardware is enabled.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.20.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.20.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1344,7 +1355,7 @@ nm_client_wimax_hardware_get_enabled (<em class="parameter"><code><a class="link
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.20.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.20.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the WiMAX hardware is enabled</p>
 </div>
 </div>
@@ -1358,7 +1369,7 @@ nm_client_get_logging (<em class="parameter"><code><a class="link" href="NMClien
                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets NetworkManager current logging level and domains.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.21.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.21.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1391,7 +1402,7 @@ a list of domains separated by ",". </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.21.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.21.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
 </div>
 </div>
@@ -1405,7 +1416,7 @@ nm_client_set_logging (<em class="parameter"><code><a class="link" href="NMClien
                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Sets NetworkManager logging level and/or domains.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.22.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.22.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1438,7 +1449,7 @@ domains separated by ",". (<code class="literal">NULL</code> or an empty string
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.22.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.22.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise</p>
 </div>
 </div>
@@ -1451,7 +1462,7 @@ nm_client_get_permission_result (<em class="parameter"><code><a class="link" hre
 <p>Requests the result of a specific permission, which indicates whether the
 client can or cannot perform the action the permission represents</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.23.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.23.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1473,7 +1484,7 @@ client can or cannot perform the action the permission represents</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.23.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.23.6"></a><h4>Returns</h4>
 <p> the permission's result, one of <a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a></p>
 </div>
 </div>
@@ -1487,7 +1498,7 @@ nm_client_get_connectivity (<em class="parameter"><code><a class="link" href="NM
 <a class="link" href="NMClient.html#nm-client-check-connectivity-async" title="nm_client_check_connectivity_async ()"><code class="function">nm_client_check_connectivity_async()</code></a>, which re-check the
 connectivity state first before returning any information.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.24.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.24.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1502,7 +1513,7 @@ connectivity state first before returning any information.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.24.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.24.6"></a><h4>Returns</h4>
 <p> the current connectivity state</p>
 </div>
 </div>
@@ -1519,7 +1530,7 @@ the most recent known state without re-checking.</p>
 <p>This is a blocking call; use <a class="link" href="NMClient.html#nm-client-check-connectivity-async" title="nm_client_check_connectivity_async ()"><code class="function">nm_client_check_connectivity_async()</code></a>
 if you do not want to block.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.25.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.25.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1546,7 +1557,7 @@ if you do not want to block.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.25.7"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.25.7"></a><h4>Returns</h4>
 <p> the (new) current connectivity state</p>
 </div>
 </div>
@@ -1564,7 +1575,7 @@ nm_client_check_connectivity_async (<em class="parameter"><code><a class="link"
 which (immediately) returns the most recent known state without
 re-checking, and <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()"><code class="function">nm_client_check_connectivity()</code></a>, which blocks.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.26.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.26.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1607,7 +1618,7 @@ nm_client_check_connectivity_finish (<em class="parameter"><code><a class="link"
 <p>Retrieves the result of an <a class="link" href="NMClient.html#nm-client-check-connectivity-async" title="nm_client_check_connectivity_async ()"><code class="function">nm_client_check_connectivity_async()</code></a>
 call.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.27.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.27.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1634,7 +1645,7 @@ call.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.27.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.27.6"></a><h4>Returns</h4>
 <p> the (new) current connectivity state</p>
 </div>
 </div>
@@ -1649,7 +1660,7 @@ nm_client_save_hostname (<em class="parameter"><code><a class="link" href="NMCli
 <p>Requests that the machine's persistent hostname be set to the specified value
 or cleared.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.28.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.28.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1682,7 +1693,7 @@ clear any existing persistent hostname. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.28.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.28.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
 </div>
 </div>
@@ -1698,7 +1709,7 @@ nm_client_save_hostname_async (<em class="parameter"><code><a class="link" href=
 <p>Requests that the machine's persistent hostname be set to the specified value
 or cleared.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.29.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.29.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1746,7 +1757,7 @@ nm_client_save_hostname_finish (<em class="parameter"><code><a class="link" href
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of an <a class="link" href="NMClient.html#nm-client-save-hostname-async" title="nm_client_save_hostname_async ()"><code class="function">nm_client_save_hostname_async()</code></a> call.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.30.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.30.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1773,7 +1784,7 @@ nm_client_save_hostname_finish (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.30.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.30.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the request was successful, <code class="literal">FALSE</code> if it failed</p>
 </div>
 </div>
@@ -1787,7 +1798,7 @@ nm_client_get_devices (<em class="parameter"><code><a class="link" href="NMClien
 device member of the returned array is, and then you may use device-specific
 methods such as <a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-hw-address" title="nm_device_ethernet_get_hw_address ()"><code class="function">nm_device_ethernet_get_hw_address()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.31.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.31.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1802,7 +1813,7 @@ methods such as <a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-g
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.31.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.31.6"></a><h4>Returns</h4>
 <p> a <span class="type">GPtrArray</span>
 containing all the <a href="NMDevice.html"><span class="type">NMDevices</span></a>.  The returned array is owned by the
 <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> object and should not be modified. </p>
@@ -1823,7 +1834,7 @@ a placeholder.</p>
 what kind of device each member of the returned array is, and then you may
 use device-specific methods such as <a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-get-hw-address" title="nm_device_ethernet_get_hw_address ()"><code class="function">nm_device_ethernet_get_hw_address()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.32.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.32.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1838,7 +1849,7 @@ use device-specific methods such as <a class="link" href="NMDeviceEthernet.html#
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.32.7"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.32.7"></a><h4>Returns</h4>
 <p> a <span class="type">GPtrArray</span>
 containing all the <a href="NMDevice.html"><span class="type">NMDevices</span></a>.  The returned array is owned by the
 <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> object and should not be modified. </p>
@@ -1854,7 +1865,7 @@ nm_client_get_device_by_path (<em class="parameter"><code><a class="link" href="
                               <em class="parameter"><code>const <span class="type">char</span> *object_path</code></em>);</pre>
 <p>Gets a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> from a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.33.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.33.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1876,7 +1887,7 @@ nm_client_get_device_by_path (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.33.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.33.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> for the given <em class="parameter"><code>object_path</code></em>
 or <code class="literal">NULL</code> if none is found. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1890,7 +1901,7 @@ nm_client_get_device_by_iface (<em class="parameter"><code><a class="link" href=
                                <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>);</pre>
 <p>Gets a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> from a <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.34.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.34.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1912,7 +1923,7 @@ nm_client_get_device_by_iface (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.34.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.34.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> for the given <em class="parameter"><code>iface</code></em>
 or <code class="literal">NULL</code> if none is found. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1925,7 +1936,7 @@ or <code class="literal">NULL</code> if none is found. </p>
 nm_client_get_active_connections (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <p>Gets the active connections.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.35.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.35.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1940,7 +1951,7 @@ nm_client_get_active_connections (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.35.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.35.6"></a><h4>Returns</h4>
 <p> a <span class="type">GPtrArray</span>
 containing all the active <a href="NMActiveConnection.html"><span class="type">NMActiveConnections</span></a>.
 The returned array is owned by the client and should not be modified. </p>
@@ -1962,7 +1973,7 @@ route to the VPN endpoint.</p>
 <p>If there is no default route, or the default route is over a
 non-NetworkManager-recognized device, this will return <code class="literal">NULL</code>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.36.7"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.36.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1977,7 +1988,7 @@ non-NetworkManager-recognized device, this will return <code class="literal">NUL
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.36.8"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.36.8"></a><h4>Returns</h4>
 <p> the appropriate <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>, if
 any. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1992,7 +2003,7 @@ nm_client_get_activating_connection (<em class="parameter"><code><a class="link"
 currently-activating connection that is expected to become the new
 <a class="link" href="NMClient.html#NMClient--primary-connection" title="The “primary-connection†property"><span class="type">“primary-connectionâ€</span></a> upon successful activation.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.37.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.37.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2007,7 +2018,7 @@ currently-activating connection that is expected to become the new
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.37.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.37.6"></a><h4>Returns</h4>
 <p> the appropriate <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>, if
 any. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -2018,7 +2029,7 @@ any. </p>
 <a name="nm-client-activate-connection-async"></a><h3>nm_client_activate_connection_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_activate_connection_async (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                     <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                     <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                      <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                      <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                      <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -2043,7 +2054,7 @@ the new connection, not when it finishes. You can used the returned
 <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a class="link" href="NMActiveConnection.html#NMActiveConnection--state" title="The “state†property"><span class="type">“stateâ€</span></a>) to
 track the activation to its completion.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.38.7"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.38.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2058,7 +2069,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p></td>
+<td class="parameter_description"><p> an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@@ -2107,7 +2118,7 @@ nm_client_activate_connection_finish (<em class="parameter"><code><a class="link
                                       <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-activate-connection-async" title="nm_client_activate_connection_async ()"><code class="function">nm_client_activate_connection_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.39.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.39.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2134,7 +2145,7 @@ nm_client_activate_connection_finish (<em class="parameter"><code><a class="link
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.39.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.39.6"></a><h4>Returns</h4>
 <p> the new <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> on success, <code class="literal">NULL</code> on
 failure, in which case <em class="parameter"><code>error</code></em>
 will be set. </p>
@@ -2147,7 +2158,7 @@ will be set. </p>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_and_activate_connection_async
                                (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *partial</code></em>,
+                                <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *partial</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                 <em class="parameter"><code>const <span class="type">char</span> *specific_object</code></em>,
                                 <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -2163,7 +2174,7 @@ the new connection, not when it finishes. You can used the returned
 <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a class="link" href="NMActiveConnection.html#NMActiveConnection--state" title="The “state†property"><span class="type">“stateâ€</span></a>) to
 track the activation to its completion.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.40.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.40.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2178,7 +2189,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>partial</p></td>
-<td class="parameter_description"><p> an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to add; the connection may be
+<td class="parameter_description"><p> an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to add; the connection may be
 partially filled (or even <code class="literal">NULL</code>) and will be completed by NetworkManager
 using the given <em class="parameter"><code>device</code></em>
 and <em class="parameter"><code>specific_object</code></em>
@@ -2232,9 +2243,9 @@ nm_client_add_and_activate_connection_finish
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-add-and-activate-connection-async" title="nm_client_add_and_activate_connection_async ()"><code class="function">nm_client_add_and_activate_connection_async()</code></a>.</p>
 <p>You can call <a class="link" href="NMActiveConnection.html#nm-active-connection-get-connection" title="nm_active_connection_get_connection ()"><code class="function">nm_active_connection_get_connection()</code></a> on the returned
-<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> to find the path of the created <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> to find the path of the created <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.41.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.41.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2261,7 +2272,7 @@ nm_client_add_and_activate_connection_finish
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.41.7"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.41.7"></a><h4>Returns</h4>
 <p> the new <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> on success, <code class="literal">NULL</code> on
 failure, in which case <em class="parameter"><code>error</code></em>
 will be set. </p>
@@ -2278,7 +2289,7 @@ nm_client_deactivate_connection (<em class="parameter"><code><a class="link" hre
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Deactivates an active <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.42.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.42.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2310,7 +2321,7 @@ nm_client_deactivate_connection (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.42.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.42.6"></a><h4>Returns</h4>
 <p> success or failure</p>
 </div>
 </div>
@@ -2325,7 +2336,7 @@ nm_client_deactivate_connection_async (<em class="parameter"><code><a class="lin
                                        <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously deactivates an active <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.43.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.43.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2373,7 +2384,7 @@ nm_client_deactivate_connection_finish
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-deactivate-connection-async" title="nm_client_deactivate_connection_async ()"><code class="function">nm_client_deactivate_connection_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.44.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.44.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2400,7 +2411,7 @@ nm_client_deactivate_connection_finish
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.44.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.44.6"></a><h4>Returns</h4>
 <p> success or failure</p>
 </div>
 </div>
@@ -2410,7 +2421,7 @@ nm_client_deactivate_connection_finish
 <pre class="programlisting">const <span class="returnvalue">GPtrArray</span> *
 nm_client_get_connections (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.3.2.9.45.4"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.45.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2425,12 +2436,12 @@ nm_client_get_connections (<em class="parameter"><code><a class="link" href="NMC
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.45.5"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.45.5"></a><h4>Returns</h4>
 <p> an array
 containing all connections provided by the remote settings service.  The
 returned array is owned by the <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> object and should not be modified.</p>
 <p>The connections are as received from D-Bus and might not validate according
-to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
+to <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMRemoteConnection]</span></p>
 </div>
 </div>
@@ -2443,7 +2454,7 @@ nm_client_get_connection_by_id (<em class="parameter"><code><a class="link" href
 <p>Returns the first matching <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><code class="literal">NMRemoteConnection</code></a> matching a given <em class="parameter"><code>id</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.46.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.46.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2465,11 +2476,11 @@ nm_client_get_connection_by_id (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.46.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.46.6"></a><h4>Returns</h4>
 <p> the remote connection object on success, or <code class="literal">NULL</code> if no
 matching object was found.</p>
 <p>The connection is as received from D-Bus and might not validate according
-to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
+to <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -2482,7 +2493,7 @@ nm_client_get_connection_by_path (<em class="parameter"><code><a class="link" hr
 <p>Returns the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><code class="literal">NMRemoteConnection</code></a> representing the connection at <em class="parameter"><code>path</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.47.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.47.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2504,11 +2515,11 @@ nm_client_get_connection_by_path (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.47.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.47.6"></a><h4>Returns</h4>
 <p> the remote connection object on success, or <code class="literal">NULL</code> if the object was
 not known</p>
 <p>The connection is as received from D-Bus and might not validate according
-to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
+to <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -2521,7 +2532,7 @@ nm_client_get_connection_by_uuid (<em class="parameter"><code><a class="link" hr
 <p>Returns the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><code class="literal">NMRemoteConnection</code></a> identified by <em class="parameter"><code>uuid</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.48.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.48.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2543,11 +2554,11 @@ nm_client_get_connection_by_uuid (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.48.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.48.6"></a><h4>Returns</h4>
 <p> the remote connection object on success, or <code class="literal">NULL</code> if the object was
 not known</p>
 <p>The connection is as received from D-Bus and might not validate according
-to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
+to <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -2556,7 +2567,7 @@ to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm
 <a name="nm-client-add-connection-async"></a><h3>nm_client_add_connection_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_connection_async (<em class="parameter"><code><a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> *client</code></em>,
-                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">gboolean</span> save_to_disk</code></em>,
                                 <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
                                 <em class="parameter"><code><span class="type">GAsyncReadyCallback</span> callback</code></em>,
@@ -2579,7 +2590,7 @@ identical settings to <em class="parameter"><code>connection</code></em>
  as NetworkManager may perform automatic
 completion and/or normalization of connection properties.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.49.7"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.49.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2632,7 +2643,7 @@ nm_client_add_connection_finish (<em class="parameter"><code><a class="link" hre
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMClient.html#nm-client-add-connection-async" title="nm_client_add_connection_async ()"><code class="function">nm_client_add_connection_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.50.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.50.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2659,7 +2670,7 @@ nm_client_add_connection_finish (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.50.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.50.6"></a><h4>Returns</h4>
 <p> the new <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> on success, <code class="literal">NULL</code> on
 failure, in which case <em class="parameter"><code>error</code></em>
 will be set. </p>
@@ -2688,7 +2699,7 @@ then <em class="parameter"><code>failures</code></em>
  will be set to a <code class="literal">NULL</code>-terminated array of the
 filenames that failed to load.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.51.7"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.51.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2726,7 +2737,7 @@ filenames that failed to load. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.51.8"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.51.8"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if NetworkManager at least tried to load <em class="parameter"><code>filenames</code></em>
 ,
 <code class="literal">FALSE</code> if an error occurred (eg, permission denied).</p>
@@ -2745,7 +2756,7 @@ nm_client_load_connections_async (<em class="parameter"><code><a class="link" hr
 given files, adding or updating the connections described within.</p>
 <p>See <a class="link" href="NMClient.html#nm-client-load-connections" title="nm_client_load_connections ()"><code class="function">nm_client_load_connections()</code></a> for more details.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.52.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.52.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2794,7 +2805,7 @@ nm_client_load_connections_finish (<em class="parameter"><code><a class="link" h
 <p>Gets the result of an <a class="link" href="NMClient.html#nm-client-load-connections-async" title="nm_client_load_connections_async ()"><code class="function">nm_client_load_connections_async()</code></a> call.</p>
 <p>See <a class="link" href="NMClient.html#nm-client-load-connections" title="nm_client_load_connections ()"><code class="function">nm_client_load_connections()</code></a> for more details.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.53.6"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.53.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2827,7 +2838,7 @@ filenames that failed to load. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.53.7"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.53.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if NetworkManager at least tried to load <em class="parameter"><code>filenames</code></em>
 ,
 <code class="literal">FALSE</code> if an error occurred (eg, permission denied).</p>
@@ -2844,7 +2855,7 @@ nm_client_reload_connections (<em class="parameter"><code><a class="link" href="
 files from disk, adding, updating, and removing connections until
 the in-memory state matches the on-disk state.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.54.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.54.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2871,7 +2882,7 @@ the in-memory state matches the on-disk state.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.54.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.54.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on failure</p>
 </div>
 </div>
@@ -2887,7 +2898,7 @@ nm_client_reload_connections_async (<em class="parameter"><code><a class="link"
 files from disk, adding, updating, and removing connections until the
 in-memory state matches the on-disk state.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.55.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.55.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2929,7 +2940,7 @@ nm_client_reload_connections_finish (<em class="parameter"><code><a class="link"
                                      <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of an <a class="link" href="NMClient.html#nm-client-reload-connections-async" title="nm_client_reload_connections_async ()"><code class="function">nm_client_reload_connections_async()</code></a> call.</p>
 <div class="refsect3">
-<a name="id-1.3.2.9.56.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.10.56.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2956,7 +2967,7 @@ nm_client_reload_connections_finish (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.2.9.56.6"></a><h4>Returns</h4>
+<a name="id-1.3.2.10.56.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on failure</p>
 </div>
 </div>
@@ -3136,7 +3147,7 @@ nm_client_reload_connections_finish (<em class="parameter"><code><a class="link"
 <p><a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</span></a> values indicate various permissions that NetworkManager
 clients can obtain to perform certain tasks on behalf of the current user.</p>
 <div class="refsect3">
-<a name="id-1.3.2.10.30.4"></a><h4>Members</h4>
+<a name="id-1.3.2.11.30.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -3256,7 +3267,7 @@ clients can obtain to perform certain tasks on behalf of the current user.</p>
 <p><a class="link" href="NMClient.html#NMClientPermissionResult" title="enum NMClientPermissionResult"><span class="type">NMClientPermissionResult</span></a> values indicate what authorizations and permissions
 the user requires to obtain a given <a class="link" href="NMClient.html#NMClientPermission" title="enum NMClientPermission"><span class="type">NMClientPermission</span></a></p>
 <div class="refsect3">
-<a name="id-1.3.2.10.31.4"></a><h4>Members</h4>
+<a name="id-1.3.2.11.31.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -3305,7 +3316,7 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <p>D-Bus operations may also return errors from other domains, including
 <a class="link" href="libnm-nm-errors.html#NMManagerError" title="enum NMManagerError"><span class="type">NMManagerError</span></a>, <a class="link" href="libnm-nm-errors.html#NMSettingsError" title="enum NMSettingsError"><span class="type">NMSettingsError</span></a>, <a class="link" href="libnm-nm-errors.html#NMAgentManagerError" title="enum NMAgentManagerError"><span class="type">NMAgentManagerError</span></a>, and <a class="link" href="libnm-nm-errors.html#NMConnectionError" title="enum NMConnectionError"><span class="type">NMConnectionError</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.2.10.32.5"></a><h4>Members</h4>
+<a name="id-1.3.2.11.32.5"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -3348,6 +3359,11 @@ the user requires to obtain a given <a class="link" href="NMClient.html#NMClient
 <pre class="programlisting">#define NM_CLIENT_ERROR nm_client_error_quark ()
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMClient-struct"></a><h3>NMClient</h3>
+<pre class="programlisting">typedef struct _NMClient NMClient;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMClient.property-details"></a><h2>Property Details</h2>
@@ -3536,7 +3552,7 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 <p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is added.  This signal is emitted for both
 regular devices and placeholder devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3574,7 +3590,7 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 <p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is removed.  This signal is emitted for both
 regular devices and placeholder devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3609,9 +3625,9 @@ regular devices and placeholder devices.</p>
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>           *client,
                <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
-<p>Notifies that a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> has been added.</p>
+<p>Notifies that a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> has been added.</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3646,9 +3662,9 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 user_function (<a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a>           *client,
                <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection,
                <span class="type">gpointer</span>            user_data)</pre>
-<p>Notifies that a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> has been removed.</p>
+<p>Notifies that a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> has been removed.</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.5.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3686,7 +3702,7 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 <p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is added.  This signal is not emitted for
 placeholder devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.6.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3724,7 +3740,7 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
 <p>Notifies that a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is removed.  This signal is not emitted for
 placeholder devices.</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -3762,7 +3778,7 @@ user_function (<a class="link" href="NMClient.html" title="NMClient"><span class
                <span class="type">gpointer</span>  user_data)</pre>
 <p>Notifies that a permission has changed</p>
 <div class="refsect3">
-<a name="id-1.3.2.12.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.2.13.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/NMConnection.html
index 5166dcf6..b5b09562 100644
--- a/docs/libnm/html/libnm-NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -15,8 +15,8 @@
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
-                  <a href="#libnm-NMConnection.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#libnm-NMConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+                  <a href="#NMConnection.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
+                  <a href="#NMConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
@@ -24,16 +24,16 @@
 <td><a accesskey="n" href="NMSimpleConnection.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
-<a name="libnm-NMConnection"></a><div class="titlepage"></div>
+<a name="NMConnection"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-NMConnection.top_of_page"></a>NMConnection</span></h2>
+<h2><span class="refentrytitle"><a name="NMConnection.top_of_page"></a>NMConnection</span></h2>
 <p>NMConnection — Describes a connection to specific network or provider</p>
 </td>
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="libnm-NMConnection.functions"></a><h2>Functions</h2>
+<a name="NMConnection.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="functions_return">
@@ -45,7 +45,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -53,7 +53,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -61,7 +61,7 @@
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -69,7 +69,7 @@
 <a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -77,7 +77,7 @@
 <span class="returnvalue">GVariant</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()">nm_connection_to_dbus</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()">nm_connection_to_dbus</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -85,7 +85,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -93,7 +93,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-replace-settings-from-connection" title="nm_connection_replace_settings_from_connection ()">nm_connection_replace_settings_from_connection</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-replace-settings-from-connection" title="nm_connection_replace_settings_from_connection ()">nm_connection_replace_settings_from_connection</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -101,7 +101,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-clear-settings" title="nm_connection_clear_settings ()">nm_connection_clear_settings</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-clear-settings" title="nm_connection_clear_settings ()">nm_connection_clear_settings</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -109,7 +109,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -117,7 +117,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -125,7 +125,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -133,7 +133,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-verify-secrets" title="nm_connection_verify_secrets ()">nm_connection_verify_secrets</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-verify-secrets" title="nm_connection_verify_secrets ()">nm_connection_verify_secrets</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -141,14 +141,14 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-normalize" title="nm_connection_normalize ()">nm_connection_normalize</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-normalize" title="nm_connection_normalize ()">nm_connection_normalize</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -156,7 +156,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -164,7 +164,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()">nm_connection_clear_secrets_with_flags</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()">nm_connection_clear_secrets_with_flags</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -172,7 +172,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -180,21 +180,21 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-interface-name" title="nm_connection_get_interface_name ()">nm_connection_get_interface_name</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-interface-name" title="nm_connection_get_interface_name ()">nm_connection_get_interface_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -202,7 +202,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-is-type" title="nm_connection_is_type ()">nm_connection_is_type</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-is-type" title="nm_connection_is_type ()">nm_connection_is_type</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -210,7 +210,7 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -218,28 +218,28 @@
 <span class="returnvalue">void</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-uuid" title="nm_connection_get_uuid ()">nm_connection_get_uuid</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-uuid" title="nm_connection_get_uuid ()">nm_connection_get_uuid</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-id" title="nm_connection_get_id ()">nm_connection_get_id</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-id" title="nm_connection_get_id ()">nm_connection_get_id</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-connection-type" title="nm_connection_get_connection_type ()">nm_connection_get_connection_type</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-connection-type" title="nm_connection_get_connection_type ()">nm_connection_get_connection_type</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -247,7 +247,7 @@
 <span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-is-virtual" title="nm_connection_is_virtual ()">nm_connection_is_virtual</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-is-virtual" title="nm_connection_is_virtual ()">nm_connection_is_virtual</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -255,7 +255,7 @@
 <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-virtual-device-description" title="nm_connection_get_virtual_device_description ()">nm_connection_get_virtual_device_description</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-virtual-device-description" title="nm_connection_get_virtual_device_description ()">nm_connection_get_virtual_device_description</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -263,7 +263,7 @@
 <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="returnvalue">NMSetting8021x</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-802-1x" title="nm_connection_get_setting_802_1x ()">nm_connection_get_setting_802_1x</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-802-1x" title="nm_connection_get_setting_802_1x ()">nm_connection_get_setting_802_1x</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -271,7 +271,7 @@
 <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="returnvalue">NMSettingBluetooth</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bluetooth" title="nm_connection_get_setting_bluetooth ()">nm_connection_get_setting_bluetooth</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bluetooth" title="nm_connection_get_setting_bluetooth ()">nm_connection_get_setting_bluetooth</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -279,7 +279,7 @@
 <a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="returnvalue">NMSettingBond</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bond" title="nm_connection_get_setting_bond ()">nm_connection_get_setting_bond</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bond" title="nm_connection_get_setting_bond ()">nm_connection_get_setting_bond</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -287,7 +287,7 @@
 <a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="returnvalue">NMSettingTeam</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-team" title="nm_connection_get_setting_team ()">nm_connection_get_setting_team</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-team" title="nm_connection_get_setting_team ()">nm_connection_get_setting_team</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -295,7 +295,7 @@
 <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="returnvalue">NMSettingTeamPort</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-team-port" title="nm_connection_get_setting_team_port ()">nm_connection_get_setting_team_port</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-team-port" title="nm_connection_get_setting_team_port ()">nm_connection_get_setting_team_port</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -303,7 +303,7 @@
 <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="returnvalue">NMSettingBridge</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bridge" title="nm_connection_get_setting_bridge ()">nm_connection_get_setting_bridge</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bridge" title="nm_connection_get_setting_bridge ()">nm_connection_get_setting_bridge</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -311,7 +311,7 @@
 <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="returnvalue">NMSettingBridgePort</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bridge-port" title="nm_connection_get_setting_bridge_port ()">nm_connection_get_setting_bridge_port</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bridge-port" title="nm_connection_get_setting_bridge_port ()">nm_connection_get_setting_bridge_port</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -319,7 +319,7 @@
 <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="returnvalue">NMSettingCdma</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-cdma" title="nm_connection_get_setting_cdma ()">nm_connection_get_setting_cdma</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-cdma" title="nm_connection_get_setting_cdma ()">nm_connection_get_setting_cdma</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -327,7 +327,7 @@
 <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="returnvalue">NMSettingConnection</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-connection" title="nm_connection_get_setting_connection ()">nm_connection_get_setting_connection</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-connection" title="nm_connection_get_setting_connection ()">nm_connection_get_setting_connection</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -335,7 +335,7 @@
 <a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="returnvalue">NMSettingDcb</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-dcb" title="nm_connection_get_setting_dcb ()">nm_connection_get_setting_dcb</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-dcb" title="nm_connection_get_setting_dcb ()">nm_connection_get_setting_dcb</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -343,7 +343,7 @@
 <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="returnvalue">NMSettingGeneric</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-generic" title="nm_connection_get_setting_generic ()">nm_connection_get_setting_generic</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-generic" title="nm_connection_get_setting_generic ()">nm_connection_get_setting_generic</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -351,7 +351,7 @@
 <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="returnvalue">NMSettingGsm</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-gsm" title="nm_connection_get_setting_gsm ()">nm_connection_get_setting_gsm</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-gsm" title="nm_connection_get_setting_gsm ()">nm_connection_get_setting_gsm</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -359,7 +359,7 @@
 <a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="returnvalue">NMSettingInfiniband</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-infiniband" title="nm_connection_get_setting_infiniband ()">nm_connection_get_setting_infiniband</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-infiniband" title="nm_connection_get_setting_infiniband ()">nm_connection_get_setting_infiniband</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -367,7 +367,7 @@
 <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel"><span class="returnvalue">NMSettingIPTunnel</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ip-tunnel" title="nm_connection_get_setting_ip_tunnel ()">nm_connection_get_setting_ip_tunnel</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ip-tunnel" title="nm_connection_get_setting_ip_tunnel ()">nm_connection_get_setting_ip_tunnel</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -375,7 +375,7 @@
 <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="returnvalue">NMSettingIPConfig</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ip4-config" title="nm_connection_get_setting_ip4_config ()">nm_connection_get_setting_ip4_config</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ip4-config" title="nm_connection_get_setting_ip4_config ()">nm_connection_get_setting_ip4_config</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -383,7 +383,7 @@
 <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="returnvalue">NMSettingIPConfig</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ip6-config" title="nm_connection_get_setting_ip6_config ()">nm_connection_get_setting_ip6_config</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ip6-config" title="nm_connection_get_setting_ip6_config ()">nm_connection_get_setting_ip6_config</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -391,7 +391,7 @@
 <a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan"><span class="returnvalue">NMSettingMacvlan</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-macvlan" title="nm_connection_get_setting_macvlan ()">nm_connection_get_setting_macvlan</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-macvlan" title="nm_connection_get_setting_macvlan ()">nm_connection_get_setting_macvlan</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -399,7 +399,7 @@
 <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="returnvalue">NMSettingOlpcMesh</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-olpc-mesh" title="nm_connection_get_setting_olpc_mesh ()">nm_connection_get_setting_olpc_mesh</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-olpc-mesh" title="nm_connection_get_setting_olpc_mesh ()">nm_connection_get_setting_olpc_mesh</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -407,7 +407,7 @@
 <a class="link" href="NMSettingPpp.html" title="NMSettingPpp"><span class="returnvalue">NMSettingPpp</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ppp" title="nm_connection_get_setting_ppp ()">nm_connection_get_setting_ppp</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ppp" title="nm_connection_get_setting_ppp ()">nm_connection_get_setting_ppp</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -415,7 +415,7 @@
 <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe"><span class="returnvalue">NMSettingPppoe</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-pppoe" title="nm_connection_get_setting_pppoe ()">nm_connection_get_setting_pppoe</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-pppoe" title="nm_connection_get_setting_pppoe ()">nm_connection_get_setting_pppoe</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -423,7 +423,7 @@
 <a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="returnvalue">NMSettingSerial</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-serial" title="nm_connection_get_setting_serial ()">nm_connection_get_setting_serial</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-serial" title="nm_connection_get_setting_serial ()">nm_connection_get_setting_serial</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -431,7 +431,7 @@
 <a class="link" href="NMSettingTun.html" title="NMSettingTun"><span class="returnvalue">NMSettingTun</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-tun" title="nm_connection_get_setting_tun ()">nm_connection_get_setting_tun</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-tun" title="nm_connection_get_setting_tun ()">nm_connection_get_setting_tun</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -439,7 +439,7 @@
 <a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="returnvalue">NMSettingVpn</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-vpn" title="nm_connection_get_setting_vpn ()">nm_connection_get_setting_vpn</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-vpn" title="nm_connection_get_setting_vpn ()">nm_connection_get_setting_vpn</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -447,7 +447,7 @@
 <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="returnvalue">NMSettingWimax</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wimax" title="nm_connection_get_setting_wimax ()">nm_connection_get_setting_wimax</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wimax" title="nm_connection_get_setting_wimax ()">nm_connection_get_setting_wimax</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -455,7 +455,7 @@
 <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="returnvalue">NMSettingAdsl</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-adsl" title="nm_connection_get_setting_adsl ()">nm_connection_get_setting_adsl</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-adsl" title="nm_connection_get_setting_adsl ()">nm_connection_get_setting_adsl</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -463,7 +463,7 @@
 <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="returnvalue">NMSettingWired</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wired" title="nm_connection_get_setting_wired ()">nm_connection_get_setting_wired</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wired" title="nm_connection_get_setting_wired ()">nm_connection_get_setting_wired</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -471,7 +471,7 @@
 <a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="returnvalue">NMSettingWireless</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wireless" title="nm_connection_get_setting_wireless ()">nm_connection_get_setting_wireless</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wireless" title="nm_connection_get_setting_wireless ()">nm_connection_get_setting_wireless</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -479,7 +479,7 @@
 <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="returnvalue">NMSettingWirelessSecurity</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wireless-security" title="nm_connection_get_setting_wireless_security ()">nm_connection_get_setting_wireless_security</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wireless-security" title="nm_connection_get_setting_wireless_security ()">nm_connection_get_setting_wireless_security</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -487,7 +487,7 @@
 <a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="returnvalue">NMSettingVlan</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-vlan" title="nm_connection_get_setting_vlan ()">nm_connection_get_setting_vlan</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-vlan" title="nm_connection_get_setting_vlan ()">nm_connection_get_setting_vlan</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
@@ -495,14 +495,14 @@
 <a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan"><span class="returnvalue">NMSettingVxlan</span></a> *
 </td>
 <td class="function_name">
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-vxlan" title="nm_connection_get_setting_vxlan ()">nm_connection_get_setting_vxlan</a> <span class="c_punctuation">()</span>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-vxlan" title="nm_connection_get_setting_vxlan ()">nm_connection_get_setting_vxlan</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
-<a name="libnm-NMConnection.other"></a><h2>Types and Values</h2>
+<a name="NMConnection.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="name">
@@ -511,64 +511,64 @@
 <tbody>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS" title="NM_CONNECTION_SECRETS_UPDATED">NM_CONNECTION_SECRETS_UPDATED</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS" title="NM_CONNECTION_SECRETS_UPDATED">NM_CONNECTION_SECRETS_UPDATED</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS" title="NM_CONNECTION_SECRETS_CLEARED">NM_CONNECTION_SECRETS_CLEARED</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS" title="NM_CONNECTION_SECRETS_CLEARED">NM_CONNECTION_SECRETS_CLEARED</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NM-CONNECTION-CHANGED:CAPS" title="NM_CONNECTION_CHANGED">NM_CONNECTION_CHANGED</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NM-CONNECTION-CHANGED:CAPS" title="NM_CONNECTION_CHANGED">NM_CONNECTION_CHANGED</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" title="NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD">NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" title="NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD">NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD</a></td>
 </tr>
 <tr>
 <td class="datatype_keyword"> </td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NMConnectionInterface" title="NMConnectionInterface">NMConnectionInterface</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NMConnectionInterface" title="NMConnectionInterface">NMConnectionInterface</a></td>
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING">NM_VARIANT_TYPE_SETTING</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING">NM_VARIANT_TYPE_SETTING</a></td>
 </tr>
 <tr>
 <td class="datatype_keyword">enum</td>
-<td class="function_name"><a class="link" href="libnm-NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a></td>
+<td class="function_name"><a class="link" href="NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
-<a name="libnm-NMConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+<a name="NMConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">    GFlags
     <span class="lineart">╰──</span> NMConnectionSerializationFlags
 </pre>
 </div>
 <div class="refsect1">
-<a name="libnm-NMConnection.description"></a><h2>Description</h2>
-<p>An <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> describes all the settings and configuration values that
+<a name="NMConnection.description"></a><h2>Description</h2>
+<p>An <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> describes all the settings and configuration values that
 are necessary to configure network devices for operation on a specific
 network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>, or
-disconnected without having been connected with a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
-<p>Each <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> contains a list of <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects usually referenced
-by name (using <a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()"><code class="function">nm_connection_get_setting_by_name()</code></a>) or by type (with
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()"><code class="function">nm_connection_get_setting()</code></a>).  The settings describe the actual parameters
+NetworkManager; no device is connected without a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>, or
+disconnected without having been connected with a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.</p>
+<p>Each <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> contains a list of <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects usually referenced
+by name (using <a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()"><code class="function">nm_connection_get_setting_by_name()</code></a>) or by type (with
+<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()"><code class="function">nm_connection_get_setting()</code></a>).  The settings describe the actual parameters
 with which the network devices are configured, including device-specific
 parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 (addresses, routes, addressing methods, etc).</p>
 </div>
 <div class="refsect1">
-<a name="libnm-NMConnection.functions_details"></a><h2>Functions</h2>
+<a name="NMConnection.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="nm-connection-add-setting"></a><h3>nm_connection_add_setting ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_add_setting (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_add_setting (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                            <em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>);</pre>
 <p>Adds a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> to the connection, replacing any previous <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> of the
-same name which has previously been added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.  The
+same name which has previously been added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.  The
 connection takes ownership of the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object and does not increase
 the setting object's reference count.</p>
 <div class="refsect3">
@@ -582,7 +582,7 @@ the setting object's reference count.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -598,9 +598,9 @@ the setting object's reference count.</p>
 <div class="refsect2">
 <a name="nm-connection-remove-setting"></a><h3>nm_connection_remove_setting ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_remove_setting (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_remove_setting (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><span class="type">GType</span> setting_type</code></em>);</pre>
-<p>Removes the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <span class="type">GType</span> from the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.  This
+<p>Removes the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <span class="type">GType</span> from the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.  This
 operation dereferences the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.3.5"></a><h4>Parameters</h4>
@@ -613,7 +613,7 @@ operation dereferences the <a class="link" href="NMSetting.html" title="NMSettin
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -629,10 +629,10 @@ operation dereferences the <a class="link" href="NMSetting.html" title="NMSettin
 <div class="refsect2">
 <a name="nm-connection-get-setting"></a><h3>nm_connection_get_setting ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
-nm_connection_get_setting (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_get_setting (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                            <em class="parameter"><code><span class="type">GType</span> setting_type</code></em>);</pre>
 <p>Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given <span class="type">GType</span>, if one has been previously added
-to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -644,7 +644,7 @@ to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span clas
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -658,7 +658,7 @@ to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span clas
 <div class="refsect3">
 <a name="id-1.4.2.7.4.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or <code class="literal">NULL</code> if no setting of that type was previously
-added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
+added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -666,10 +666,10 @@ added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><spa
 <div class="refsect2">
 <a name="nm-connection-get-setting-by-name"></a><h3>nm_connection_get_setting_by_name ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting.html" title="NMSetting"><span class="returnvalue">NMSetting</span></a> *
-nm_connection_get_setting_by_name (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_get_setting_by_name (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
 <p>Gets the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> with the given name, if one has been previously added
-the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>.</p>
+the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -681,7 +681,7 @@ the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -695,7 +695,7 @@ the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="
 <div class="refsect3">
 <a name="id-1.4.2.7.5.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>, or <code class="literal">NULL</code> if no setting with that name was previously
-added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
+added to the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -703,9 +703,9 @@ added to the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><spa
 <div class="refsect2">
 <a name="nm-connection-to-dbus"></a><h3>nm_connection_to_dbus ()</h3>
 <pre class="programlisting"><span class="returnvalue">GVariant</span> *
-nm_connection_to_dbus (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
-                       <em class="parameter"><code><a class="link" href="libnm-NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags"><span class="type">NMConnectionSerializationFlags</span></a> flags</code></em>);</pre>
-<p>Converts the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> into a <span class="type">GVariant</span> of type
+nm_connection_to_dbus (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
+                       <em class="parameter"><code><a class="link" href="NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags"><span class="type">NMConnectionSerializationFlags</span></a> flags</code></em>);</pre>
+<p>Converts the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> into a <span class="type">GVariant</span> of type
 <code class="literal">NM_VARIANT_TYPE_CONNECTION</code> describing the connection, suitable for
 marshalling over D-Bus or otherwise serializing.</p>
 <div class="refsect3">
@@ -719,12 +719,12 @@ marshalling over D-Bus or otherwise serializing.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>flags</p></td>
-<td class="parameter_description"><p>serialization flags, e.g. <a class="link" href="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS"><code class="literal">NM_CONNECTION_SERIALIZE_ALL</code></a></p></td>
+<td class="parameter_description"><p>serialization flags, e.g. <a class="link" href="NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS"><code class="literal">NM_CONNECTION_SERIALIZE_ALL</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -741,14 +741,14 @@ its settings, and each setting's properties. </p>
 <div class="refsect2">
 <a name="nm-connection-replace-settings"></a><h3>nm_connection_replace_settings ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_replace_settings (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_replace_settings (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><span class="type">GVariant</span> *new_settings</code></em>,
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Replaces <em class="parameter"><code>connection</code></em>
 's settings with <em class="parameter"><code>new_settings</code></em>
  (which must be
 syntactically valid, and describe a known type of connection, but does not
-need to result in a connection that passes <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>).</p>
+need to result in a connection that passes <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>).</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -760,7 +760,7 @@ need to result in a connection that passes <a class="link" href="libnm-NMConnect
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -789,8 +789,8 @@ will be unchanged).</p>
 <a name="nm-connection-replace-settings-from-connection"></a><h3>nm_connection_replace_settings_from_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_connection_replace_settings_from_connection
-                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
-                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *new_connection</code></em>);</pre>
+                               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *new_connection</code></em>);</pre>
 <p>Deep-copies the settings of <em class="parameter"><code>new_connection</code></em>
  and replaces the settings of <em class="parameter"><code>connection</code></em>
 
@@ -806,12 +806,12 @@ with the copied settings.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>new_connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to replace the settings of <em class="parameter"><code>connection</code></em>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to replace the settings of <em class="parameter"><code>connection</code></em>
 with</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -823,7 +823,7 @@ with</p></td>
 <div class="refsect2">
 <a name="nm-connection-clear-settings"></a><h3>nm_connection_clear_settings ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_clear_settings (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_clear_settings (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Deletes all of <em class="parameter"><code>connection</code></em>
 's settings.</p>
 <div class="refsect3">
@@ -836,7 +836,7 @@ nm_connection_clear_settings (<em class="parameter"><code><a href="/usr/share/gt
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -846,10 +846,10 @@ nm_connection_clear_settings (<em class="parameter"><code><a href="/usr/share/gt
 <div class="refsect2">
 <a name="nm-connection-compare"></a><h3>nm_connection_compare ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_compare (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *a</code></em>,
-                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *b</code></em>,
+nm_connection_compare (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
+                       <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
                        <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>);</pre>
-<p>Compares two <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
+<p>Compares two <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
 modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
 each flag's behavior.</p>
 <div class="refsect3">
@@ -863,12 +863,12 @@ each flag's behavior.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>a</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>b</p></td>
-<td class="parameter_description"><p>a second <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to compare with the first</p></td>
+<td class="parameter_description"><p>a second <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to compare with the first</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -888,11 +888,11 @@ each flag's behavior.</p>
 <div class="refsect2">
 <a name="nm-connection-diff"></a><h3>nm_connection_diff ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_diff (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *a</code></em>,
-                    <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *b</code></em>,
+nm_connection_diff (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *a</code></em>,
+                    <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *b</code></em>,
                     <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingCompareFlags" title="enum NMSettingCompareFlags"><span class="type">NMSettingCompareFlags</span></a> flags</code></em>,
                     <em class="parameter"><code><span class="type">GHashTable</span> **out_settings</code></em>);</pre>
-<p>Compares two <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
+<p>Compares two <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects for similarity, with comparison behavior
 modified by a set of flags.  See <a class="link" href="NMSetting.html#nm-setting-compare" title="nm_setting_compare ()"><code class="function">nm_setting_compare()</code></a> for a description of
 each flag's behavior.  If the connections differ, settings and keys within
 each setting that differ are added to the returned <em class="parameter"><code>out_settings</code></em>
@@ -909,12 +909,12 @@ No values are returned, only key names.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>a</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>b</p></td>
-<td class="parameter_description"><p>a second <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to compare with the first</p></td>
+<td class="parameter_description"><p>a second <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to compare with the first</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -943,7 +943,7 @@ not</p>
 <div class="refsect2">
 <a name="nm-connection-verify"></a><h3>nm_connection_verify ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_verify (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_verify (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                       <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
@@ -965,7 +965,7 @@ setting and which property failed validation, and how it failed validation.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to verify</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to verify</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -985,7 +985,7 @@ setting and which property failed validation, and how it failed validation.</p>
 <div class="refsect2">
 <a name="nm-connection-verify-secrets"></a><h3>nm_connection_verify_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_verify_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_verify_secrets (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Verifies the secrets in the connection.</p>
 <div class="refsect3">
@@ -999,7 +999,7 @@ nm_connection_verify_secrets (<em class="parameter"><code><a href="/usr/share/gt
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to verify in</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to verify in</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1020,7 +1020,7 @@ nm_connection_verify_secrets (<em class="parameter"><code><a href="/usr/share/gt
 <div class="refsect2">
 <a name="nm-connection-normalize"></a><h3>nm_connection_normalize ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_normalize (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_normalize (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                          <em class="parameter"><code><span class="type">GHashTable</span> *parameters</code></em>,
                          <em class="parameter"><code><span class="type">gboolean</span> *modified</code></em>,
                          <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -1043,7 +1043,7 @@ cannot be normalized, the connection will not be modified.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to normalize</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to normalize</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1078,7 +1078,7 @@ why the connection is invalid, if the function returns an error.</p></td>
 <div class="refsect2">
 <a name="nm-connection-need-secrets"></a><h3>nm_connection_need_secrets ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_need_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_need_secrets (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                             <em class="parameter"><code><span class="type">GPtrArray</span> **hints</code></em>);</pre>
 <p>Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
@@ -1096,7 +1096,7 @@ secrets are needed.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1121,7 +1121,7 @@ missing secrets</p>
 <div class="refsect2">
 <a name="nm-connection-clear-secrets"></a><h3>nm_connection_clear_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_clear_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_clear_secrets (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Clears and frees any secrets that may be stored in the connection, to avoid
 keeping secret data in memory when not needed.</p>
 <div class="refsect3">
@@ -1134,7 +1134,7 @@ keeping secret data in memory when not needed.</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1145,7 +1145,7 @@ keeping secret data in memory when not needed.</p>
 <a name="nm-connection-clear-secrets-with-flags"></a><h3>nm_connection_clear_secrets_with_flags ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_connection_clear_secrets_with_flags
-                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingClearSecretsWithFlagsFn" title="NMSettingClearSecretsWithFlagsFn ()"><span class="type">NMSettingClearSecretsWithFlagsFn</span></a> func</code></em>,
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Clears and frees secrets determined by <em class="parameter"><code>func</code></em>
@@ -1161,7 +1161,7 @@ nm_connection_clear_secrets_with_flags
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1184,7 +1184,7 @@ specific secret should be cleared or not. </p></td>
 <div class="refsect2">
 <a name="nm-connection-update-secrets"></a><h3>nm_connection_update_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_update_secrets (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_update_secrets (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
                               <em class="parameter"><code><span class="type">GVariant</span> *secrets</code></em>,
                               <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -1192,8 +1192,8 @@ nm_connection_update_secrets (<em class="parameter"><code><a href="/usr/share/gt
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a connection dictionary.
 If <em class="parameter"><code>setting_name</code></em>
- is <code class="literal">NULL</code>, expects a fully serialized <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> as
-returned by <a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> and will update all secrets from all
+ is <code class="literal">NULL</code>, expects a fully serialized <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> as
+returned by <a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> and will update all secrets from all
 settings contained in <em class="parameter"><code>secrets</code></em>
 .</p>
 <div class="refsect3">
@@ -1207,7 +1207,7 @@ settings contained in <em class="parameter"><code>secrets</code></em>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1218,7 +1218,7 @@ settings contained in <em class="parameter"><code>secrets</code></em>
 <tr>
 <td class="parameter_name"><p>secrets</p></td>
 <td class="parameter_description"><p>a <span class="type">GVariant</span> of secrets, of type <code class="literal">NM_VARIANT_TYPE_CONNECTION</code>
-or <a class="link" href="libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING"><code class="literal">NM_VARIANT_TYPE_SETTING</code></a></p></td>
+or <a class="link" href="NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING"><code class="literal">NM_VARIANT_TYPE_SETTING</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1239,7 +1239,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)</p>
 <div class="refsect2">
 <a name="nm-connection-set-path"></a><h3>nm_connection_set_path ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_set_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_set_path (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                         <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>Sets the D-Bus path of the connection.  This property is not serialized, and
 is only for the reference of the caller.  Sets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection--path"><span class="type">“pathâ€</span></a>
@@ -1255,7 +1255,7 @@ property.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1272,7 +1272,7 @@ which provides the connection</p></td>
 <div class="refsect2">
 <a name="nm-connection-get-path"></a><h3>nm_connection_get_path ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_path (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Returns the connection's D-Bus path.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.20.5"></a><h4>Parameters</h4>
@@ -1284,7 +1284,7 @@ nm_connection_get_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1292,14 +1292,14 @@ nm_connection_get_path (<em class="parameter"><code><a href="/usr/share/gtk-doc/
 <div class="refsect3">
 <a name="id-1.4.2.7.20.6"></a><h4>Returns</h4>
 <p> the D-Bus path of the connection, previously set by a call to
-<a class="link" href="libnm-NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()"><code class="function">nm_connection_set_path()</code></a>.</p>
+<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()"><code class="function">nm_connection_set_path()</code></a>.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-connection-get-interface-name"></a><h3>nm_connection_get_interface_name ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_interface_name (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_interface_name (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Returns the interface name as stored in NMSettingConnection:interface_name.
 If the connection contains no NMSettingConnection, it will return <code class="literal">NULL</code>.</p>
 <p>For hardware devices and software devices created outside of NetworkManager,
@@ -1315,7 +1315,7 @@ NetworkManager, this is the name of the created interface.</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>The <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>The <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1329,7 +1329,7 @@ NetworkManager, this is the name of the created interface.</p>
 <div class="refsect2">
 <a name="nm-connection-is-type"></a><h3>nm_connection_is_type ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_is_type (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_is_type (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                        <em class="parameter"><code>const <span class="type">char</span> *type</code></em>);</pre>
 <p>A convenience function to check if the given <em class="parameter"><code>connection</code></em>
  is a particular
@@ -1347,7 +1347,7 @@ property of the connection and matches that against <em class="parameter"><code>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1369,10 +1369,10 @@ property of the connection and matches that against <em class="parameter"><code>
 <div class="refsect2">
 <a name="nm-connection-for-each-setting-value"></a><h3>nm_connection_for_each_setting_value ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_for_each_setting_value (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+nm_connection_for_each_setting_value (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                       <em class="parameter"><code><a class="link" href="NMSetting.html#NMSettingValueIterFn" title="NMSettingValueIterFn ()"><span class="type">NMSettingValueIterFn</span></a> func</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
-<p>Iterates over the properties of each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object in the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>,
+<p>Iterates over the properties of each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object in the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>,
 calling the supplied user function for each property.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.23.5"></a><h4>Parameters</h4>
@@ -1385,7 +1385,7 @@ calling the supplied user function for each property.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1407,7 +1407,7 @@ at each invocation</p></td>
 <div class="refsect2">
 <a name="nm-connection-dump"></a><h3>nm_connection_dump ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-nm_connection_dump (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_dump (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Print the connection to stdout.  For debugging purposes ONLY, should NOT
 be used for serialization of the connection or machine-parsed in any way. The
 output format is not guaranteed to be stable and may change at any time.</p>
@@ -1421,7 +1421,7 @@ output format is not guaranteed to be stable and may change at any time.</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1431,7 +1431,7 @@ output format is not guaranteed to be stable and may change at any time.</p>
 <div class="refsect2">
 <a name="nm-connection-get-uuid"></a><h3>nm_connection_get_uuid ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_uuid (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_uuid (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return the UUID from the connection's <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.25.5"></a><h4>Parameters</h4>
@@ -1443,7 +1443,7 @@ nm_connection_get_uuid (<em class="parameter"><code><a href="/usr/share/gtk-doc/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1457,7 +1457,7 @@ nm_connection_get_uuid (<em class="parameter"><code><a href="/usr/share/gtk-doc/
 <div class="refsect2">
 <a name="nm-connection-get-id"></a><h3>nm_connection_get_id ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_id (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_id (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return the ID from the connection's <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.26.5"></a><h4>Parameters</h4>
@@ -1469,7 +1469,7 @@ nm_connection_get_id (<em class="parameter"><code><a href="/usr/share/gtk-doc/ht
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1483,7 +1483,7 @@ nm_connection_get_id (<em class="parameter"><code><a href="/usr/share/gtk-doc/ht
 <div class="refsect2">
 <a name="nm-connection-get-connection-type"></a><h3>nm_connection_get_connection_type ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
-nm_connection_get_connection_type (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_connection_type (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return the type from the connection's <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.27.5"></a><h4>Parameters</h4>
@@ -1495,7 +1495,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a href="/usr/sha
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1509,7 +1509,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a href="/usr/sha
 <div class="refsect2">
 <a name="nm-connection-is-virtual"></a><h3>nm_connection_is_virtual ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
-nm_connection_is_virtual (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_is_virtual (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Checks if <em class="parameter"><code>connection</code></em>
  refers to a virtual device (and thus can potentially be
 activated even if the device it refers to doesn't exist).</p>
@@ -1523,7 +1523,7 @@ activated even if the device it refers to doesn't exist).</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1539,7 +1539,7 @@ refers to a virtual device</p>
 <a name="nm-connection-get-virtual-device-description"></a><h3>nm_connection_get_virtual_device_description ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_connection_get_virtual_device_description
-                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Returns the name that <a class="link" href="NMDevice.html#nm-device-disambiguate-names" title="nm_device_disambiguate_names ()"><code class="function">nm_device_disambiguate_names()</code></a> would
 return for the virtual device that would be created for <em class="parameter"><code>connection</code></em>
 .
@@ -1554,7 +1554,7 @@ Eg, "VLAN (eth1.1)".</p>
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> for a virtual device type</p></td>
+<td class="parameter_description"><p>an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> for a virtual device type</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1572,7 +1572,7 @@ is not a virtual connection type. </p>
 <div class="refsect2">
 <a name="nm-connection-get-setting-802-1x"></a><h3>nm_connection_get_setting_802_1x ()</h3>
 <pre class="programlisting"><a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="returnvalue">NMSetting8021x</span></a> *
-nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_802_1x (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSetting8021x.html" title="NMSetting8021x"><span class="type">NMSetting8021x</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.30.5"></a><h4>Parameters</h4>
@@ -1584,7 +1584,7 @@ nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="/usr/shar
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1599,7 +1599,7 @@ nm_connection_get_setting_802_1x (<em class="parameter"><code><a href="/usr/shar
 <div class="refsect2">
 <a name="nm-connection-get-setting-bluetooth"></a><h3>nm_connection_get_setting_bluetooth ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="returnvalue">NMSettingBluetooth</span></a> *
-nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bluetooth (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth"><span class="type">NMSettingBluetooth</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.31.5"></a><h4>Parameters</h4>
@@ -1611,7 +1611,7 @@ nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="/usr/s
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1626,7 +1626,7 @@ nm_connection_get_setting_bluetooth (<em class="parameter"><code><a href="/usr/s
 <div class="refsect2">
 <a name="nm-connection-get-setting-bond"></a><h3>nm_connection_get_setting_bond ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="returnvalue">NMSettingBond</span></a> *
-nm_connection_get_setting_bond (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bond (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBond.html" title="NMSettingBond"><span class="type">NMSettingBond</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.32.5"></a><h4>Parameters</h4>
@@ -1638,7 +1638,7 @@ nm_connection_get_setting_bond (<em class="parameter"><code><a href="/usr/share/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1653,7 +1653,7 @@ nm_connection_get_setting_bond (<em class="parameter"><code><a href="/usr/share/
 <div class="refsect2">
 <a name="nm-connection-get-setting-team"></a><h3>nm_connection_get_setting_team ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="returnvalue">NMSettingTeam</span></a> *
-nm_connection_get_setting_team (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_team (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingTeam.html" title="NMSettingTeam"><span class="type">NMSettingTeam</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.33.5"></a><h4>Parameters</h4>
@@ -1665,7 +1665,7 @@ nm_connection_get_setting_team (<em class="parameter"><code><a href="/usr/share/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1680,7 +1680,7 @@ nm_connection_get_setting_team (<em class="parameter"><code><a href="/usr/share/
 <div class="refsect2">
 <a name="nm-connection-get-setting-team-port"></a><h3>nm_connection_get_setting_team_port ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="returnvalue">NMSettingTeamPort</span></a> *
-nm_connection_get_setting_team_port (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_team_port (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort"><span class="type">NMSettingTeamPort</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.34.5"></a><h4>Parameters</h4>
@@ -1692,7 +1692,7 @@ nm_connection_get_setting_team_port (<em class="parameter"><code><a href="/usr/s
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1707,7 +1707,7 @@ nm_connection_get_setting_team_port (<em class="parameter"><code><a href="/usr/s
 <div class="refsect2">
 <a name="nm-connection-get-setting-bridge"></a><h3>nm_connection_get_setting_bridge ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="returnvalue">NMSettingBridge</span></a> *
-nm_connection_get_setting_bridge (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bridge (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBridge.html" title="NMSettingBridge"><span class="type">NMSettingBridge</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.35.5"></a><h4>Parameters</h4>
@@ -1719,7 +1719,7 @@ nm_connection_get_setting_bridge (<em class="parameter"><code><a href="/usr/shar
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1734,7 +1734,7 @@ nm_connection_get_setting_bridge (<em class="parameter"><code><a href="/usr/shar
 <div class="refsect2">
 <a name="nm-connection-get-setting-bridge-port"></a><h3>nm_connection_get_setting_bridge_port ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="returnvalue">NMSettingBridgePort</span></a> *
-nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_bridge_port (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort"><span class="type">NMSettingBridgePort</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.36.5"></a><h4>Parameters</h4>
@@ -1746,7 +1746,7 @@ nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="/usr
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1761,7 +1761,7 @@ nm_connection_get_setting_bridge_port (<em class="parameter"><code><a href="/usr
 <div class="refsect2">
 <a name="nm-connection-get-setting-cdma"></a><h3>nm_connection_get_setting_cdma ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="returnvalue">NMSettingCdma</span></a> *
-nm_connection_get_setting_cdma (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_cdma (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingCdma.html" title="NMSettingCdma"><span class="type">NMSettingCdma</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.37.5"></a><h4>Parameters</h4>
@@ -1773,7 +1773,7 @@ nm_connection_get_setting_cdma (<em class="parameter"><code><a href="/usr/share/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1788,7 +1788,7 @@ nm_connection_get_setting_cdma (<em class="parameter"><code><a href="/usr/share/
 <div class="refsect2">
 <a name="nm-connection-get-setting-connection"></a><h3>nm_connection_get_setting_connection ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="returnvalue">NMSettingConnection</span></a> *
-nm_connection_get_setting_connection (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_connection (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.38.5"></a><h4>Parameters</h4>
@@ -1800,7 +1800,7 @@ nm_connection_get_setting_connection (<em class="parameter"><code><a href="/usr/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1815,7 +1815,7 @@ nm_connection_get_setting_connection (<em class="parameter"><code><a href="/usr/
 <div class="refsect2">
 <a name="nm-connection-get-setting-dcb"></a><h3>nm_connection_get_setting_dcb ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="returnvalue">NMSettingDcb</span></a> *
-nm_connection_get_setting_dcb (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_dcb (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingDcb.html" title="NMSettingDcb"><span class="type">NMSettingDcb</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.39.5"></a><h4>Parameters</h4>
@@ -1827,7 +1827,7 @@ nm_connection_get_setting_dcb (<em class="parameter"><code><a href="/usr/share/g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1842,7 +1842,7 @@ nm_connection_get_setting_dcb (<em class="parameter"><code><a href="/usr/share/g
 <div class="refsect2">
 <a name="nm-connection-get-setting-generic"></a><h3>nm_connection_get_setting_generic ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="returnvalue">NMSettingGeneric</span></a> *
-nm_connection_get_setting_generic (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_generic (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric"><span class="type">NMSettingGeneric</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.40.5"></a><h4>Parameters</h4>
@@ -1854,7 +1854,7 @@ nm_connection_get_setting_generic (<em class="parameter"><code><a href="/usr/sha
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1869,7 +1869,7 @@ nm_connection_get_setting_generic (<em class="parameter"><code><a href="/usr/sha
 <div class="refsect2">
 <a name="nm-connection-get-setting-gsm"></a><h3>nm_connection_get_setting_gsm ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="returnvalue">NMSettingGsm</span></a> *
-nm_connection_get_setting_gsm (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_gsm (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingGsm.html" title="NMSettingGsm"><span class="type">NMSettingGsm</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.41.5"></a><h4>Parameters</h4>
@@ -1881,7 +1881,7 @@ nm_connection_get_setting_gsm (<em class="parameter"><code><a href="/usr/share/g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1896,7 +1896,7 @@ nm_connection_get_setting_gsm (<em class="parameter"><code><a href="/usr/share/g
 <div class="refsect2">
 <a name="nm-connection-get-setting-infiniband"></a><h3>nm_connection_get_setting_infiniband ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="returnvalue">NMSettingInfiniband</span></a> *
-nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_infiniband (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband"><span class="type">NMSettingInfiniband</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.42.5"></a><h4>Parameters</h4>
@@ -1908,7 +1908,7 @@ nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="/usr/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1923,7 +1923,7 @@ nm_connection_get_setting_infiniband (<em class="parameter"><code><a href="/usr/
 <div class="refsect2">
 <a name="nm-connection-get-setting-ip-tunnel"></a><h3>nm_connection_get_setting_ip_tunnel ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel"><span class="returnvalue">NMSettingIPTunnel</span></a> *
-nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel"><span class="type">NMSettingIPTunnel</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.43.5"></a><h4>Parameters</h4>
@@ -1935,7 +1935,7 @@ nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="/usr/s
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1951,7 +1951,7 @@ nm_connection_get_setting_ip_tunnel (<em class="parameter"><code><a href="/usr/s
 <div class="refsect2">
 <a name="nm-connection-get-setting-ip4-config"></a><h3>nm_connection_get_setting_ip4_config ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="returnvalue">NMSettingIPConfig</span></a> *
-nm_connection_get_setting_ip4_config (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ip4_config (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config"><span class="type">NMSettingIP4Config</span></a> the connection might contain.</p>
 <p>Note that it returns the value as type <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a>, since the vast
 majority of IPv4-setting-related methods are on that type, not
@@ -1966,7 +1966,7 @@ majority of IPv4-setting-related methods are on that type, not
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -1982,7 +1982,7 @@ connection contains one, otherwise <code class="literal">NULL</code>. </p>
 <div class="refsect2">
 <a name="nm-connection-get-setting-ip6-config"></a><h3>nm_connection_get_setting_ip6_config ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="returnvalue">NMSettingIPConfig</span></a> *
-nm_connection_get_setting_ip6_config (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ip6_config (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> the connection might contain.</p>
 <p>Note that it returns the value as type <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig"><span class="type">NMSettingIPConfig</span></a>, since the vast
 majority of IPv6-setting-related methods are on that type, not
@@ -1997,7 +1997,7 @@ majority of IPv6-setting-related methods are on that type, not
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2013,7 +2013,7 @@ connection contains one, otherwise <code class="literal">NULL</code>. </p>
 <div class="refsect2">
 <a name="nm-connection-get-setting-macvlan"></a><h3>nm_connection_get_setting_macvlan ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan"><span class="returnvalue">NMSettingMacvlan</span></a> *
-nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_macvlan (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan"><span class="type">NMSettingMacvlan</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.46.5"></a><h4>Parameters</h4>
@@ -2025,7 +2025,7 @@ nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="/usr/sha
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2041,7 +2041,7 @@ nm_connection_get_setting_macvlan (<em class="parameter"><code><a href="/usr/sha
 <div class="refsect2">
 <a name="nm-connection-get-setting-olpc-mesh"></a><h3>nm_connection_get_setting_olpc_mesh ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="returnvalue">NMSettingOlpcMesh</span></a> *
-nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh"><span class="type">NMSettingOlpcMesh</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.47.5"></a><h4>Parameters</h4>
@@ -2053,7 +2053,7 @@ nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="/usr/s
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2068,7 +2068,7 @@ nm_connection_get_setting_olpc_mesh (<em class="parameter"><code><a href="/usr/s
 <div class="refsect2">
 <a name="nm-connection-get-setting-ppp"></a><h3>nm_connection_get_setting_ppp ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingPpp.html" title="NMSettingPpp"><span class="returnvalue">NMSettingPpp</span></a> *
-nm_connection_get_setting_ppp (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_ppp (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingPpp.html" title="NMSettingPpp"><span class="type">NMSettingPpp</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.48.5"></a><h4>Parameters</h4>
@@ -2080,7 +2080,7 @@ nm_connection_get_setting_ppp (<em class="parameter"><code><a href="/usr/share/g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2095,7 +2095,7 @@ nm_connection_get_setting_ppp (<em class="parameter"><code><a href="/usr/share/g
 <div class="refsect2">
 <a name="nm-connection-get-setting-pppoe"></a><h3>nm_connection_get_setting_pppoe ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe"><span class="returnvalue">NMSettingPppoe</span></a> *
-nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_pppoe (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe"><span class="type">NMSettingPppoe</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.49.5"></a><h4>Parameters</h4>
@@ -2107,7 +2107,7 @@ nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="/usr/share
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2122,7 +2122,7 @@ nm_connection_get_setting_pppoe (<em class="parameter"><code><a href="/usr/share
 <div class="refsect2">
 <a name="nm-connection-get-setting-serial"></a><h3>nm_connection_get_setting_serial ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="returnvalue">NMSettingSerial</span></a> *
-nm_connection_get_setting_serial (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_serial (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingSerial.html" title="NMSettingSerial"><span class="type">NMSettingSerial</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.50.5"></a><h4>Parameters</h4>
@@ -2134,7 +2134,7 @@ nm_connection_get_setting_serial (<em class="parameter"><code><a href="/usr/shar
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2149,7 +2149,7 @@ nm_connection_get_setting_serial (<em class="parameter"><code><a href="/usr/shar
 <div class="refsect2">
 <a name="nm-connection-get-setting-tun"></a><h3>nm_connection_get_setting_tun ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingTun.html" title="NMSettingTun"><span class="returnvalue">NMSettingTun</span></a> *
-nm_connection_get_setting_tun (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_tun (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingTun.html" title="NMSettingTun"><span class="type">NMSettingTun</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.51.5"></a><h4>Parameters</h4>
@@ -2161,7 +2161,7 @@ nm_connection_get_setting_tun (<em class="parameter"><code><a href="/usr/share/g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2177,7 +2177,7 @@ nm_connection_get_setting_tun (<em class="parameter"><code><a href="/usr/share/g
 <div class="refsect2">
 <a name="nm-connection-get-setting-vpn"></a><h3>nm_connection_get_setting_vpn ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="returnvalue">NMSettingVpn</span></a> *
-nm_connection_get_setting_vpn (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_vpn (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingVpn.html" title="NMSettingVpn"><span class="type">NMSettingVpn</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.52.5"></a><h4>Parameters</h4>
@@ -2189,7 +2189,7 @@ nm_connection_get_setting_vpn (<em class="parameter"><code><a href="/usr/share/g
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2204,7 +2204,7 @@ nm_connection_get_setting_vpn (<em class="parameter"><code><a href="/usr/share/g
 <div class="refsect2">
 <a name="nm-connection-get-setting-wimax"></a><h3>nm_connection_get_setting_wimax ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="returnvalue">NMSettingWimax</span></a> *
-nm_connection_get_setting_wimax (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_wimax (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWimax.html" title="NMSettingWimax"><span class="type">NMSettingWimax</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.53.5"></a><h4>Parameters</h4>
@@ -2216,7 +2216,7 @@ nm_connection_get_setting_wimax (<em class="parameter"><code><a href="/usr/share
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2231,7 +2231,7 @@ nm_connection_get_setting_wimax (<em class="parameter"><code><a href="/usr/share
 <div class="refsect2">
 <a name="nm-connection-get-setting-adsl"></a><h3>nm_connection_get_setting_adsl ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="returnvalue">NMSettingAdsl</span></a> *
-nm_connection_get_setting_adsl (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_adsl (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl"><span class="type">NMSettingAdsl</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.54.5"></a><h4>Parameters</h4>
@@ -2243,7 +2243,7 @@ nm_connection_get_setting_adsl (<em class="parameter"><code><a href="/usr/share/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2258,7 +2258,7 @@ nm_connection_get_setting_adsl (<em class="parameter"><code><a href="/usr/share/
 <div class="refsect2">
 <a name="nm-connection-get-setting-wired"></a><h3>nm_connection_get_setting_wired ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="returnvalue">NMSettingWired</span></a> *
-nm_connection_get_setting_wired (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_wired (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWired.html" title="NMSettingWired"><span class="type">NMSettingWired</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.55.5"></a><h4>Parameters</h4>
@@ -2270,7 +2270,7 @@ nm_connection_get_setting_wired (<em class="parameter"><code><a href="/usr/share
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2285,7 +2285,7 @@ nm_connection_get_setting_wired (<em class="parameter"><code><a href="/usr/share
 <div class="refsect2">
 <a name="nm-connection-get-setting-wireless"></a><h3>nm_connection_get_setting_wireless ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="returnvalue">NMSettingWireless</span></a> *
-nm_connection_get_setting_wireless (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_wireless (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWireless.html" title="NMSettingWireless"><span class="type">NMSettingWireless</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.56.5"></a><h4>Parameters</h4>
@@ -2297,7 +2297,7 @@ nm_connection_get_setting_wireless (<em class="parameter"><code><a href="/usr/sh
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2313,7 +2313,7 @@ nm_connection_get_setting_wireless (<em class="parameter"><code><a href="/usr/sh
 <a name="nm-connection-get-setting-wireless-security"></a><h3>nm_connection_get_setting_wireless_security ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="returnvalue">NMSettingWirelessSecurity</span></a> *
 nm_connection_get_setting_wireless_security
-                               (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity"><span class="type">NMSettingWirelessSecurity</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.57.5"></a><h4>Parameters</h4>
@@ -2325,7 +2325,7 @@ nm_connection_get_setting_wireless_security
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2340,7 +2340,7 @@ nm_connection_get_setting_wireless_security
 <div class="refsect2">
 <a name="nm-connection-get-setting-vlan"></a><h3>nm_connection_get_setting_vlan ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="returnvalue">NMSettingVlan</span></a> *
-nm_connection_get_setting_vlan (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_vlan (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingVlan.html" title="NMSettingVlan"><span class="type">NMSettingVlan</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.58.5"></a><h4>Parameters</h4>
@@ -2352,7 +2352,7 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a href="/usr/share/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2367,7 +2367,7 @@ nm_connection_get_setting_vlan (<em class="parameter"><code><a href="/usr/share/
 <div class="refsect2">
 <a name="nm-connection-get-setting-vxlan"></a><h3>nm_connection_get_setting_vxlan ()</h3>
 <pre class="programlisting"><a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan"><span class="returnvalue">NMSettingVxlan</span></a> *
-nm_connection_get_setting_vxlan (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+nm_connection_get_setting_vxlan (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>A shortcut to return any <a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan"><span class="type">NMSettingVxlan</span></a> the connection might contain.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.59.5"></a><h4>Parameters</h4>
@@ -2379,7 +2379,7 @@ nm_connection_get_setting_vxlan (<em class="parameter"><code><a href="/usr/share
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
@@ -2393,7 +2393,7 @@ nm_connection_get_setting_vxlan (<em class="parameter"><code><a href="/usr/share
 </div>
 </div>
 <div class="refsect1">
-<a name="libnm-NMConnection.other_details"></a><h2>Types and Values</h2>
+<a name="NMConnection.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="NM-CONNECTION-SECRETS-UPDATED:CAPS"></a><h3>NM_CONNECTION_SECRETS_UPDATED</h3>
 <pre class="programlisting">#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
@@ -2476,7 +2476,7 @@ an <code class="literal">NM_VARIANT_TYPE_CONNECTION</code> dictionary.</p>
 <div class="refsect2">
 <a name="NMConnectionSerializationFlags"></a><h3>enum NMConnectionSerializationFlags</h3>
 <p>These flags determine which properties are serialized when calling when
-calling <a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a>.</p>
+calling <a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.8.8.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 6dd8dd36..016bad3d 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDevice.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDevice.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDevice.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDevice.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDevice.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#NMDevice.signals" class="shortcut">Signals</a></span>
 </td>
@@ -327,7 +328,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-applied-connection" title="nm_device_get_applied_connection ()">nm_device_get_applied_connection</a> <span class="c_punctuation">()</span>
@@ -343,7 +344,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-applied-connection-finish" title="nm_device_get_applied_connection_finish ()">nm_device_get_applied_connection_finish</a> <span class="c_punctuation">()</span>
@@ -781,12 +782,16 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDevice.html#NM-DEVICE-LLDP-NEIGHBORS:CAPS" title="NM_DEVICE_LLDP_NEIGHBORS">NM_DEVICE_LLDP_NEIGHBORS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDevice.html#NMDevice-struct" title="NMDevice">NMDevice</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMDevice.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    GBoxed
     <span class="lineart">╰──</span> NMLldpNeighbor
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
@@ -811,6 +816,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDevice.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDevice implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDevice.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -821,7 +832,7 @@
 nm_device_get_iface (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the interface name of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -836,7 +847,7 @@ nm_device_get_iface (<em class="parameter"><code><a class="link" href="NMDevice.
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.2.6"></a><h4>Returns</h4>
 <p> the interface of the device. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -849,7 +860,7 @@ nm_device_get_ip_iface (<em class="parameter"><code><a class="link" href="NMDevi
 <p>Gets the IP interface name of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> over which IP traffic flows
 when the device is in the ACTIVATED state.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -864,7 +875,7 @@ when the device is in the ACTIVATED state.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.3.6"></a><h4>Returns</h4>
 <p> the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.</p>
 </div>
@@ -876,7 +887,7 @@ used by the device, and must not be modified.</p>
 nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Returns the numeric type of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>, ie Ethernet, Wi-Fi, etc.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -891,7 +902,7 @@ nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.4.6"></a><h4>Returns</h4>
 <p> the device type</p>
 </div>
 </div>
@@ -902,7 +913,7 @@ nm_device_get_device_type (<em class="parameter"><code><a class="link" href="NMD
 nm_device_get_udi (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the Unique Device Identifier of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -917,7 +928,7 @@ nm_device_get_udi (<em class="parameter"><code><a class="link" href="NMDevice.ht
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.5.6"></a><h4>Returns</h4>
 <p> the Unique Device Identifier of the device.  This identifier may be
 used to gather more information about the device from various operating
 system services like udev or sysfs.</p>
@@ -930,7 +941,7 @@ system services like udev or sysfs.</p>
 nm_device_get_driver (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the driver of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -945,7 +956,7 @@ nm_device_get_driver (<em class="parameter"><code><a class="link" href="NMDevice
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.6.6"></a><h4>Returns</h4>
 <p> the driver of the device. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -957,7 +968,7 @@ device, and must not be modified.</p>
 nm_device_get_driver_version (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the driver version of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -972,7 +983,7 @@ nm_device_get_driver_version (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.7.6"></a><h4>Returns</h4>
 <p> the version of the device driver. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -984,7 +995,7 @@ device, and must not be modified.</p>
 nm_device_get_firmware_version (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the firmware version of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -999,7 +1010,7 @@ nm_device_get_firmware_version (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.8.6"></a><h4>Returns</h4>
 <p> the firmware version of the device. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -1013,7 +1024,7 @@ nm_device_get_type_description (<em class="parameter"><code><a class="link" href
 <em class="parameter"><code>device</code></em>
  is.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1028,7 +1039,7 @@ nm_device_get_type_description (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.9.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.9.6"></a><h4>Returns</h4>
 <p> the type description of the device. This is the internal
 string used by the device, and must not be modified.</p>
 </div>
@@ -1041,7 +1052,7 @@ nm_device_get_hw_address (<em class="parameter"><code><a class="link" href="NMDe
 <p>Gets the current a hardware address (MAC) for the <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1056,7 +1067,7 @@ nm_device_get_hw_address (<em class="parameter"><code><a class="link" href="NMDe
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.10.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.10.6"></a><h4>Returns</h4>
 <p> the current MAC of the device, or <code class="literal">NULL</code>.
 This is the internal string used by the device, and must not be modified.</p>
 </div>
@@ -1068,7 +1079,7 @@ This is the internal string used by the device, and must not be modified.</p>
 nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the device' capabilities.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1083,7 +1094,7 @@ nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.11.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.11.6"></a><h4>Returns</h4>
 <p> the capabilities</p>
 </div>
 </div>
@@ -1094,7 +1105,7 @@ nm_device_get_capabilities (<em class="parameter"><code><a class="link" href="NM
 nm_device_get_managed (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Whether the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> is managed by NetworkManager.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.12.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1109,7 +1120,7 @@ nm_device_get_managed (<em class="parameter"><code><a class="link" href="NMDevic
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.12.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.12.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is managed by NetworkManager</p>
 </div>
 </div>
@@ -1121,7 +1132,7 @@ nm_device_set_managed (<em class="parameter"><code><a class="link" href="NMDevic
                        <em class="parameter"><code><span class="type">gboolean</span> managed</code></em>);</pre>
 <p>Enables or disables management of  <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> by NetworkManager.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.13.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1151,7 +1162,7 @@ nm_device_set_managed (<em class="parameter"><code><a class="link" href="NMDevic
 nm_device_get_autoconnect (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Whether the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> can be autoconnected.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.14.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1166,7 +1177,7 @@ nm_device_get_autoconnect (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.14.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is allowed to be autoconnected</p>
 </div>
 </div>
@@ -1178,7 +1189,7 @@ nm_device_set_autoconnect (<em class="parameter"><code><a class="link" href="NMD
                            <em class="parameter"><code><span class="type">gboolean</span> autoconnect</code></em>);</pre>
 <p>Enables or disables automatic activation of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.15.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1208,7 +1219,7 @@ nm_device_get_firmware_missing (<em class="parameter"><code><a class="link" href
 <p>Indicates that firmware required for the device's operation is likely
 to be missing.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.16.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.16.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1223,7 +1234,7 @@ to be missing.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.16.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.16.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if firmware required for the device's operation is likely
 to be missing.</p>
 </div>
@@ -1235,7 +1246,7 @@ to be missing.</p>
 nm_device_get_nm_plugin_missing (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Indicates that the NetworkManager plugin for the device is not installed.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.17.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.17.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1250,7 +1261,7 @@ nm_device_get_nm_plugin_missing (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.17.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.17.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device plugin not installed.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -1264,7 +1275,7 @@ nm_device_get_ip4_config (<em class="parameter"><code><a class="link" href="NMDe
 <p>You can alternatively use <a class="link" href="NMActiveConnection.html#nm-active-connection-get-ip4-config" title="nm_active_connection_get_ip4_config ()"><code class="function">nm_active_connection_get_ip4_config()</code></a>, which also
 works with VPN connections.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.18.6"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.18.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1279,7 +1290,7 @@ works with VPN connections.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.18.7"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.18.7"></a><h4>Returns</h4>
 <p> the IPv4 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a>, or <code class="literal">NULL</code> if the device is not
 activated. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1294,7 +1305,7 @@ nm_device_get_dhcp4_config (<em class="parameter"><code><a class="link" href="NM
 <p>You can alternatively use <a class="link" href="NMActiveConnection.html#nm-active-connection-get-dhcp4-config" title="nm_active_connection_get_dhcp4_config ()"><code class="function">nm_active_connection_get_dhcp4_config()</code></a>, which also
 works with VPN connections.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.19.6"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.19.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1309,7 +1320,7 @@ works with VPN connections.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.19.7"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.19.7"></a><h4>Returns</h4>
 <p> the IPv4 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a>, or <code class="literal">NULL</code> if the device is
 not activated or not using DHCP. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1324,7 +1335,7 @@ nm_device_get_ip6_config (<em class="parameter"><code><a class="link" href="NMDe
 <p>You can alternatively use <a class="link" href="NMActiveConnection.html#nm-active-connection-get-ip6-config" title="nm_active_connection_get_ip6_config ()"><code class="function">nm_active_connection_get_ip6_config()</code></a>, which also
 works with VPN connections.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.20.6"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.20.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1339,7 +1350,7 @@ works with VPN connections.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.20.7"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.20.7"></a><h4>Returns</h4>
 <p> the IPv6 <a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> or <code class="literal">NULL</code> if the device is not activated. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -1353,7 +1364,7 @@ nm_device_get_dhcp6_config (<em class="parameter"><code><a class="link" href="NM
 <p>You can alternatively use <a class="link" href="NMActiveConnection.html#nm-active-connection-get-dhcp6-config" title="nm_active_connection_get_dhcp6_config ()"><code class="function">nm_active_connection_get_dhcp6_config()</code></a>, which also
 works with VPN connections.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.21.6"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.21.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1368,7 +1379,7 @@ works with VPN connections.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.21.7"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.21.7"></a><h4>Returns</h4>
 <p> the IPv6 <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a>, or <code class="literal">NULL</code> if the device is
 not activated or not using DHCPv6. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1381,7 +1392,7 @@ not activated or not using DHCPv6. </p>
 nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.22.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.22.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1396,7 +1407,7 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.22.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.22.6"></a><h4>Returns</h4>
 <p> the current device state</p>
 </div>
 </div>
@@ -1407,7 +1418,7 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 nm_device_get_state_reason (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the reason for entering the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.23.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.23.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1422,7 +1433,7 @@ nm_device_get_state_reason (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.23.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.23.6"></a><h4>Returns</h4>
 <p> the reason for entering the current device state</p>
 </div>
 </div>
@@ -1433,7 +1444,7 @@ nm_device_get_state_reason (<em class="parameter"><code><a class="link" href="NM
 nm_device_get_active_connection (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object which owns this device during activation.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.24.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.24.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1448,7 +1459,7 @@ nm_device_get_active_connection (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.24.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.24.6"></a><h4>Returns</h4>
 <p> the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> or <code class="literal">NULL</code> if the device is
 not part of an active connection. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -1463,7 +1474,7 @@ nm_device_get_available_connections (<em class="parameter"><code><a class="link"
 be activated on <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.25.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.25.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1478,7 +1489,7 @@ be activated on <em class="parameter"><code>device</code></em>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.25.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.25.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span>
 containing <a href="NMRemoteConnection.html"><span class="type">NMRemoteConnections</span></a>. This is the internal copy used by
 the connection, and must not be modified. </p>
@@ -1495,7 +1506,7 @@ an opaque string that can be used to recognize when
 seemingly-unrelated <a href="NMDevice.html"><span class="type">NMDevices</span></a> are actually just different virtual
 ports on a single physical port. (Eg, NPAR / SR-IOV.)</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.26.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.26.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1510,7 +1521,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.26.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.26.6"></a><h4>Returns</h4>
 <p> the physical port ID of the device, or <code class="literal">NULL</code> if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.</p>
@@ -1523,7 +1534,7 @@ must not be modified.</p>
 nm_device_get_mtu (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the  MTU of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.27.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.27.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1538,7 +1549,7 @@ nm_device_get_mtu (<em class="parameter"><code><a class="link" href="NMDevice.ht
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.27.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.27.6"></a><h4>Returns</h4>
 <p> the MTU of the device.</p>
 </div>
 </div>
@@ -1548,7 +1559,7 @@ nm_device_get_mtu (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_is_real (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.2.10.28.4"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.28.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1563,7 +1574,7 @@ nm_device_is_real (<em class="parameter"><code><a class="link" href="NMDevice.ht
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.28.5"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.28.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device exists, or <code class="literal">FALSE</code> if it is a placeholder device
 that could be automatically created by NetworkManager if one of its
 <a class="link" href="NMDevice.html#NMDevice--available-connections" title="The “available-connections†property"><span class="type">“available-connectionsâ€</span></a> was activated.</p>
@@ -1577,7 +1588,7 @@ that could be automatically created by NetworkManager if one of its
 nm_device_is_software (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Whether the device is a software device.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.29.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.29.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1592,7 +1603,7 @@ nm_device_is_software (<em class="parameter"><code><a class="link" href="NMDevic
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.29.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.29.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if <em class="parameter"><code>device</code></em>
 is a software device, <code class="literal">FALSE</code> if it is a hardware device.</p>
 </div>
@@ -1604,7 +1615,7 @@ is a software device, <code class="literal">FALSE</code> if it is a hardware dev
 nm_device_get_product (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the product string of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.30.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.30.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1619,7 +1630,7 @@ nm_device_get_product (<em class="parameter"><code><a class="link" href="NMDevic
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.30.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.30.6"></a><h4>Returns</h4>
 <p> the product name of the device. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -1631,7 +1642,7 @@ device, and must not be modified.</p>
 nm_device_get_vendor (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the vendor string of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.31.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.31.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1646,7 +1657,7 @@ nm_device_get_vendor (<em class="parameter"><code><a class="link" href="NMDevice
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.31.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.31.6"></a><h4>Returns</h4>
 <p> the vendor name of the device. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -1659,7 +1670,7 @@ nm_device_get_description (<em class="parameter"><code><a class="link" href="NMD
 <p>Gets a description of <em class="parameter"><code>device</code></em>
 , based on its vendor and product names.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.32.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.32.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1674,7 +1685,7 @@ nm_device_get_description (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.32.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.32.6"></a><h4>Returns</h4>
 <p> a description of <em class="parameter"><code>device</code></em>
 . If either the vendor or the
 product name is unknown, this returns the interface name.</p>
@@ -1687,7 +1698,7 @@ product name is unknown, this returns the interface name.</p>
 nm_device_get_metered (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the metered setting of a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.33.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.33.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1702,7 +1713,7 @@ nm_device_get_metered (<em class="parameter"><code><a class="link" href="NMDevic
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.33.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.33.6"></a><h4>Returns</h4>
 <p> the metered setting.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -1714,7 +1725,7 @@ nm_device_get_metered (<em class="parameter"><code><a class="link" href="NMDevic
 nm_device_get_lldp_neighbors (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
 <p>Gets the list of neighbors discovered through LLDP.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.34.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.34.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1729,7 +1740,7 @@ nm_device_get_lldp_neighbors (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.34.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.34.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span>
 containing <a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a>s. This is the internal copy used by the
 device and must not be modified. The library never modifies the returned
@@ -1748,7 +1759,7 @@ nm_device_disambiguate_names (<em class="parameter"><code><a class="link" href="
 devices in <em class="parameter"><code>devices</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.35.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.35.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1771,7 +1782,7 @@ devices in <em class="parameter"><code>devices</code></em>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.35.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.35.6"></a><h4>Returns</h4>
 <p> the device names. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span></p>
 </div>
@@ -1781,7 +1792,7 @@ devices in <em class="parameter"><code>devices</code></em>
 <a name="nm-device-reapply"></a><h3>nm_device_reapply ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_reapply (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                   <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                    <em class="parameter"><code><span class="type">guint64</span> version_id</code></em>,
                    <em class="parameter"><code><span class="type">guint32</span> flags</code></em>,
                    <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -1789,7 +1800,7 @@ nm_device_reapply (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <p>Attempts to update device with changes to the currently active connection
 made since it was last applied.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.36.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.36.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1804,7 +1815,7 @@ made since it was last applied.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1833,7 +1844,7 @@ catch concurrent accesses.</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.36.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.36.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -1844,7 +1855,7 @@ will be set.</p>
 <a name="nm-device-reapply-async"></a><h3>nm_device_reapply_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_device_reapply_async (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                         <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                          <em class="parameter"><code><span class="type">guint64</span> version_id</code></em>,
                          <em class="parameter"><code><span class="type">guint32</span> flags</code></em>,
                          <em class="parameter"><code><span class="type">GCancellable</span> *cancellable</code></em>,
@@ -1853,7 +1864,7 @@ nm_device_reapply_async (<em class="parameter"><code><a class="link" href="NMDev
 <p>Asynchronously begins an attempt to update device with changes to the
 currently active connection made since it was last applied.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.37.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.37.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1868,7 +1879,7 @@ currently active connection made since it was last applied.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to replace the applied settings with or <code class="literal">NULL</code> to reuse existing</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1913,7 +1924,7 @@ nm_device_reapply_finish (<em class="parameter"><code><a class="link" href="NMDe
                           <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMDevice.html#nm-device-reapply-async" title="nm_device_reapply_async ()"><code class="function">nm_device_reapply_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.38.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.38.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1940,7 +1951,7 @@ nm_device_reapply_finish (<em class="parameter"><code><a class="link" href="NMDe
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.38.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.38.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -1949,7 +1960,7 @@ will be set.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-applied-connection"></a><h3>nm_device_get_applied_connection ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 nm_device_get_applied_connection (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                   <em class="parameter"><code><span class="type">guint32</span> flags</code></em>,
                                   <em class="parameter"><code><span class="type">guint64</span> *version_id</code></em>,
@@ -1957,7 +1968,7 @@ nm_device_get_applied_connection (<em class="parameter"><code><a class="link" hr
                                   <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Fetch the currently applied connection on the device.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.39.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.39.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -1995,11 +2006,11 @@ the applied connection. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.39.6"></a><h4>Returns</h4>
-<p> a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><code class="literal">NMConnection</code></a> with the currently applied settings
+<a name="id-1.5.2.11.39.6"></a><h4>Returns</h4>
+<p> a <a class="link" href="NMConnection.html" title="NMConnection"><code class="literal">NMConnection</code></a> with the currently applied settings
 or <code class="literal">NULL</code> on error.</p>
 <p>The connection is as received from D-Bus and might not validate according
-to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
+to <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -2016,7 +2027,7 @@ nm_device_get_applied_connection_async
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously begins an get the a currently applied connection.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.40.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.40.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2058,7 +2069,7 @@ nm_device_get_applied_connection_async
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-applied-connection-finish"></a><h3>nm_device_get_applied_connection_finish ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 nm_device_get_applied_connection_finish
                                (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
                                 <em class="parameter"><code><span class="type">GAsyncResult</span> *result</code></em>,
@@ -2066,7 +2077,7 @@ nm_device_get_applied_connection_finish
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMDevice.html#nm-device-get-applied-connection-async" title="nm_device_get_applied_connection_async ()"><code class="function">nm_device_get_applied_connection_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.41.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.41.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2099,11 +2110,11 @@ connection. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.41.6"></a><h4>Returns</h4>
-<p> a currently applied <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><code class="literal">NMConnection</code></a> or <code class="literal">NULL</code> in case
+<a name="id-1.5.2.11.41.6"></a><h4>Returns</h4>
+<p> a currently applied <a class="link" href="NMConnection.html" title="NMConnection"><code class="literal">NMConnection</code></a> or <code class="literal">NULL</code> in case
 of error.</p>
 <p>The connection is as received from D-Bus and might not validate according
-to <a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
+to <a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()"><code class="function">nm_connection_verify()</code></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -2119,7 +2130,7 @@ nm_device_disconnect (<em class="parameter"><code><a class="link" href="NMDevice
 automatically connecting to networks until the next manual network connection
 request.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.42.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.42.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2146,7 +2157,7 @@ request.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.42.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.42.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -2163,7 +2174,7 @@ nm_device_disconnect_async (<em class="parameter"><code><a class="link" href="NM
 prevents the device from automatically connecting to networks until the next
 manual network connection request.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.43.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.43.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2205,7 +2216,7 @@ nm_device_disconnect_finish (<em class="parameter"><code><a class="link" href="N
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMDevice.html#nm-device-disconnect-async" title="nm_device_disconnect_async ()"><code class="function">nm_device_disconnect_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.44.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.44.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2232,7 +2243,7 @@ nm_device_disconnect_finish (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.44.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.44.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -2246,7 +2257,7 @@ nm_device_delete (<em class="parameter"><code><a class="link" href="NMDevice.htm
                   <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Deletes the software device. Hardware devices can't be deleted.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.45.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.45.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2273,7 +2284,7 @@ nm_device_delete (<em class="parameter"><code><a class="link" href="NMDevice.htm
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.45.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.45.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -2289,7 +2300,7 @@ nm_device_delete_async (<em class="parameter"><code><a class="link" href="NMDevi
 <p>Asynchronously begins deleteing the software device. Hardware devices can't
 be deleted.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.46.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.46.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2331,7 +2342,7 @@ nm_device_delete_finish (<em class="parameter"><code><a class="link" href="NMDev
                          <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMDevice.html#nm-device-delete-async" title="nm_device_delete_async ()"><code class="function">nm_device_delete_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.47.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.47.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2358,7 +2369,7 @@ nm_device_delete_finish (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.47.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.47.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -2380,7 +2391,7 @@ Ethernet, Bluetooth, Wi-Fi WPA connections, or any other connection that is
 incompatible with the device. To get the full list of connections see
 <a class="link" href="NMClient.html#nm-client-get-connections" title="nm_client_get_connections ()"><code class="function">nm_client_get_connections()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.48.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.48.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2395,16 +2406,16 @@ incompatible with the device. To get the full list of connections see
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> to filter. </p></td>
+<td class="parameter_description"><p> an array of <a href="NMConnection.html"><span class="type">NMConnections</span></a> to filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.48.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.48.6"></a><h4>Returns</h4>
 <p> an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>device</code></em>
+<a href="NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>device</code></em>
 .  The array
 should be freed with <code class="function">g_ptr_array_unref()</code> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
@@ -2415,7 +2426,7 @@ should be freed with <code class="function">g_ptr_array_unref()</code> when it i
 <a name="nm-device-connection-valid"></a><h3>nm_device_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_connection_valid (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                            <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
 <em class="parameter"><code>device</code></em>
@@ -2425,7 +2436,7 @@ network, and will not be valid if it describes a WPA network, or if it is
 an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the
 device.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.49.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.49.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2441,7 +2452,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -2449,7 +2460,7 @@ against</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.49.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.49.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this device, <code class="literal">FALSE</code>
 if is incompatible with the device's capabilities and characteristics.</p>
 </div>
@@ -2459,7 +2470,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-connection-compatible"></a><h3>nm_device_connection_compatible ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_connection_compatible (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>,
-                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates a given connection for a given <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> object and returns
 whether the connection may be activated with the device. For example if
@@ -2473,7 +2484,7 @@ device.</p>
 compatibility of the given device and connection. But, in addition, it sets
 GError when FALSE is returned.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.50.6"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.50.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2489,7 +2500,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -2502,7 +2513,7 @@ against</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.50.7"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.50.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this device, <code class="literal">FALSE</code>
 if is incompatible with the device's capabilities and characteristics.</p>
 </div>
@@ -2516,7 +2527,7 @@ nm_device_get_setting_type (<em class="parameter"><code><a class="link" href="NM
 that can be used on <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.51.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.51.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2531,7 +2542,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.51.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.51.6"></a><h4>Returns</h4>
 <p> <em class="parameter"><code>device</code></em>
 's associated <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> type</p>
 </div>
@@ -2543,7 +2554,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 nm_lldp_neighbor_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> object.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.52.5"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.52.5"></a><h4>Returns</h4>
 <p> the new <a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> object. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -2556,7 +2567,7 @@ nm_lldp_neighbor_new (<em class="parameter"><code><span class="type">void</span>
 nm_lldp_neighbor_ref (<em class="parameter"><code><a class="link" href="NMDevice.html#NMLldpNeighbor"><span class="type">NMLldpNeighbor</span></a> *neighbor</code></em>);</pre>
 <p>Increases the reference count of the object.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.53.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.53.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2580,7 +2591,7 @@ nm_lldp_neighbor_unref (<em class="parameter"><code><a class="link" href="NMDevi
 <p>Decreases the reference count of the object.  If the reference count
 reaches zero, the object will be destroyed.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.54.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.54.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2604,7 +2615,7 @@ nm_lldp_neighbor_get_attr_names (<em class="parameter"><code><a class="link" hre
 <p>Gets an array of attribute names available for <em class="parameter"><code>neighbor</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.55.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.55.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2619,7 +2630,7 @@ nm_lldp_neighbor_get_attr_names (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.55.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.55.6"></a><h4>Returns</h4>
 <p> a <code class="literal">NULL</code>-terminated array of attribute names. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -2637,7 +2648,7 @@ nm_lldp_neighbor_get_attr_string_value
  on <em class="parameter"><code>neighbor</code></em>
 </p>
 <div class="refsect3">
-<a name="id-1.5.2.10.56.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.56.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2664,7 +2675,7 @@ nm_lldp_neighbor_get_attr_string_value
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.56.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.56.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a string attribute with name <em class="parameter"><code>name</code></em>
 was found, <code class="literal">FALSE</code> otherwise</p>
 </div>
@@ -2681,7 +2692,7 @@ nm_lldp_neighbor_get_attr_uint_value (<em class="parameter"><code><a class="link
  on <em class="parameter"><code>neighbor</code></em>
 </p>
 <div class="refsect3">
-<a name="id-1.5.2.10.57.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.57.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2708,7 +2719,7 @@ nm_lldp_neighbor_get_attr_uint_value (<em class="parameter"><code><a class="link
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.57.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.57.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if a uint attribute with name <em class="parameter"><code>name</code></em>
 was found, <code class="literal">FALSE</code> otherwise</p>
 </div>
@@ -2722,7 +2733,7 @@ nm_lldp_neighbor_get_attr_type (<em class="parameter"><code><a class="link" href
                                 <em class="parameter"><code><span class="type">char</span> *name</code></em>);</pre>
 <p>Get the type of an attribute.</p>
 <div class="refsect3">
-<a name="id-1.5.2.10.58.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.11.58.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -2744,7 +2755,7 @@ nm_lldp_neighbor_get_attr_type (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.2.10.58.6"></a><h4>Returns</h4>
+<a name="id-1.5.2.11.58.6"></a><h4>Returns</h4>
 <p> the <span class="type">GVariantType</span> of the attribute with name <em class="parameter"><code>name</code></em>
 </p>
 </div>
@@ -2914,6 +2925,11 @@ nm_lldp_neighbor_get_attr_type (<em class="parameter"><code><a class="link" href
 <pre class="programlisting">#define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDevice-struct"></a><h3>NMDevice</h3>
+<pre class="programlisting">typedef struct _NMDevice NMDevice;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDevice.property-details"></a><h2>Property Details</h2>
@@ -3152,7 +3168,7 @@ user_function (<a class="link" href="NMDevice.html" title="NMDevice"><span class
                <span class="type">gpointer</span>  user_data)</pre>
 <p>Notifies the state change of a <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.2.13.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.2.14.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index 7c9c5612..f64abd16 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceAdsl.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceAdsl.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceAdsl.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceAdsl.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceAdsl.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -72,10 +73,16 @@
 <col width="150px" class="name">
 <col class="description">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS" title="NM_DEVICE_ADSL_CARRIER">NM_DEVICE_ADSL_CARRIER</a></td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl-struct" title="NMDeviceAdsl">NMDeviceAdsl</a></td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect1">
@@ -87,6 +94,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceAdsl.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceAdsl implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceAdsl.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -97,7 +110,7 @@
 nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl"><span class="type">NMDeviceAdsl</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.3.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.3.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -112,7 +125,7 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.3.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.3.9.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -124,6 +137,11 @@ nm_device_adsl_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting">#define NM_DEVICE_ADSL_CARRIER "carrier"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceAdsl-struct"></a><h3>NMDeviceAdsl</h3>
+<pre class="programlisting">typedef struct _NMDeviceAdsl NMDeviceAdsl;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceAdsl.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index b99d8ba3..b135cfb0 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceBond.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceBond.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBond.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBond.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceBond.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -115,6 +116,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceBond.html#NM-DEVICE-BOND-SLAVES:CAPS" title="NM_DEVICE_BOND_SLAVES">NM_DEVICE_BOND_SLAVES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceBond.html#NMDeviceBond-struct" title="NMDeviceBond">NMDeviceBond</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -127,6 +132,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceBond.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceBond implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceBond.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -137,7 +148,7 @@
 nm_device_bond_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceBond.html" title="NMDeviceBond"><span class="type">NMDeviceBond</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceBond.html" title="NMDeviceBond"><span class="type">NMDeviceBond</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.4.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.4.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -152,7 +163,7 @@ nm_device_bond_get_hw_address (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.4.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.4.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -164,7 +175,7 @@ device, and must not be modified.</p>
 nm_device_bond_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceBond.html" title="NMDeviceBond"><span class="type">NMDeviceBond</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.4.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.4.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -179,7 +190,7 @@ nm_device_bond_get_carrier (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.4.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.4.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -191,7 +202,7 @@ nm_device_bond_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <p>Gets the devices currently slaved to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.4.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.4.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -206,7 +217,7 @@ nm_device_bond_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.4.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.4.9.4.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span> containing
 <a href="NMDevice.html"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
@@ -234,6 +245,11 @@ copy used by the device, and must not be modified. </p>
 <pre class="programlisting">#define NM_DEVICE_BOND_SLAVES      "slaves"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceBond-struct"></a><h3>NMDeviceBond</h3>
+<pre class="programlisting">typedef struct _NMDeviceBond NMDeviceBond;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBond.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index dee83c75..4015e5b6 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceBridge.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceBridge.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBridge.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBridge.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceBridge.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -115,6 +116,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceBridge.html#NM-DEVICE-BRIDGE-SLAVES:CAPS" title="NM_DEVICE_BRIDGE_SLAVES">NM_DEVICE_BRIDGE_SLAVES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceBridge.html#NMDeviceBridge-struct" title="NMDeviceBridge">NMDeviceBridge</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -127,6 +132,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceBridge.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceBridge implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceBridge.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -137,7 +148,7 @@
 nm_device_bridge_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.5.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.5.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -152,7 +163,7 @@ nm_device_bridge_get_hw_address (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.5.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -164,7 +175,7 @@ device, and must not be modified.</p>
 nm_device_bridge_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge"><span class="type">NMDeviceBridge</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.5.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.5.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -179,7 +190,7 @@ nm_device_bridge_get_carrier (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.5.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -191,7 +202,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 <p>Gets the devices currently slaved to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.5.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.5.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -206,7 +217,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.5.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.5.9.4.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span> containing
 <a href="NMDevice.html"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
@@ -234,6 +245,11 @@ copy used by the device, and must not be modified. </p>
 <pre class="programlisting">#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceBridge-struct"></a><h3>NMDeviceBridge</h3>
+<pre class="programlisting">typedef struct _NMDeviceBridge NMDeviceBridge;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBridge.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index b8cb2689..9d3b379b 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceBt.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceBt.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBt.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceBt.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceBt.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -115,6 +116,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS" title="NM_DEVICE_BT_CAPABILITIES">NM_DEVICE_BT_CAPABILITIES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceBt.html#NMDeviceBt-struct" title="NMDeviceBt">NMDeviceBt</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -127,6 +132,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceBt.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceBt implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceBt.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -137,7 +148,7 @@
 nm_device_bt_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.6.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.6.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -152,7 +163,7 @@ nm_device_bt_get_hw_address (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.6.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.6.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -164,7 +175,7 @@ device, and must not be modified.</p>
 nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>Gets the name of the <a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.6.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.6.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -179,7 +190,7 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.6.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.6.9.3.6"></a><h4>Returns</h4>
 <p> the name of the device</p>
 </div>
 </div>
@@ -190,7 +201,7 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href="NMDeviceBt.html" title="NMDeviceBt"><span class="type">NMDeviceBt</span></a> *device</code></em>);</pre>
 <p>Returns the Bluetooth device's usable capabilities.</p>
 <div class="refsect3">
-<a name="id-1.5.6.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.6.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -205,7 +216,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.6.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.6.9.4.6"></a><h4>Returns</h4>
 <p> a combination of <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
 </div>
 </div>
@@ -229,6 +240,11 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <pre class="programlisting">#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceBt-struct"></a><h3>NMDeviceBt</h3>
+<pre class="programlisting">typedef struct _NMDeviceBt NMDeviceBt;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceBt.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html
index 0b6dc4a2..68bfbd7a 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceEthernet.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceEthernet.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceEthernet.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceEthernet.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceEthernet.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -148,6 +149,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-S390-SUBCHANNELS:CAPS" title="NM_DEVICE_ETHERNET_S390_SUBCHANNELS">NM_DEVICE_ETHERNET_S390_SUBCHANNELS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet-struct" title="NMDeviceEthernet">NMDeviceEthernet</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -160,6 +165,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceEthernet.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceEthernet implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceEthernet.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -170,7 +181,7 @@
 nm_device_ethernet_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>Gets the active hardware (MAC) address of the <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.7.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.7.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -185,7 +196,7 @@ nm_device_ethernet_get_hw_address (<em class="parameter"><code><a class="link" h
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.7.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.7.9.2.6"></a><h4>Returns</h4>
 <p> the active hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -198,7 +209,7 @@ nm_device_ethernet_get_permanent_hw_address
                                (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>Gets the permanent hardware (MAC) address of the <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.7.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.7.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -213,7 +224,7 @@ nm_device_ethernet_get_permanent_hw_address
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.7.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.7.9.3.6"></a><h4>Returns</h4>
 <p> the permanent hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -225,7 +236,7 @@ device, and must not be modified.</p>
 nm_device_ethernet_get_speed (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>Gets the speed of the <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.7.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.7.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -240,7 +251,7 @@ nm_device_ethernet_get_speed (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.7.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.7.9.4.6"></a><h4>Returns</h4>
 <p> the speed of the device</p>
 </div>
 </div>
@@ -251,7 +262,7 @@ nm_device_ethernet_get_speed (<em class="parameter"><code><a class="link" href="
 nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.7.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.7.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -266,7 +277,7 @@ nm_device_ethernet_get_carrier (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.7.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.7.9.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -278,7 +289,7 @@ nm_device_ethernet_get_s390_subchannels
                                (<em class="parameter"><code><a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet"><span class="type">NMDeviceEthernet</span></a> *device</code></em>);</pre>
 <p>Return the list of s390 subchannels if the device supports them.</p>
 <div class="refsect3">
-<a name="id-1.5.7.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.7.9.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -293,7 +304,7 @@ nm_device_ethernet_get_s390_subchannels
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.7.8.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.7.9.6.6"></a><h4>Returns</h4>
 <p> array of strings, each specifying
 one subchannel the s390 device uses to communicate to the host. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p>
@@ -332,6 +343,11 @@ one subchannel the s390 device uses to communicate to the host. </p>
 <pre class="programlisting">#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceEthernet-struct"></a><h3>NMDeviceEthernet</h3>
+<pre class="programlisting">typedef struct _NMDeviceEthernet NMDeviceEthernet;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceEthernet.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index 8144c52f..e446b89d 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceGeneric.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceGeneric.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceGeneric.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceGeneric.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceGeneric.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -89,6 +90,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceGeneric.html#NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS" title="NM_DEVICE_GENERIC_TYPE_DESCRIPTION">NM_DEVICE_GENERIC_TYPE_DESCRIPTION</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceGeneric.html#NMDeviceGeneric-struct" title="NMDeviceGeneric">NMDeviceGeneric</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -101,6 +106,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceGeneric.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceGeneric implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceGeneric.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -111,7 +122,7 @@
 nm_device_generic_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceGeneric.html" title="NMDeviceGeneric"><span class="type">NMDeviceGeneric</span></a> *device</code></em>);</pre>
 <p>Gets the hardware address of the <a class="link" href="NMDeviceGeneric.html" title="NMDeviceGeneric"><span class="type">NMDeviceGeneric</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.8.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.8.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -126,7 +137,7 @@ nm_device_generic_get_hw_address (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.8.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.8.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -145,6 +156,11 @@ device, and must not be modified.</p>
 <pre class="programlisting">#define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceGeneric-struct"></a><h3>NMDeviceGeneric</h3>
+<pre class="programlisting">typedef struct _NMDeviceGeneric NMDeviceGeneric;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceGeneric.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html
index 771b9c45..310bf608 100644
--- a/docs/libnm/html/NMDeviceIPTunnel.html
+++ b/docs/libnm/html/NMDeviceIPTunnel.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceIPTunnel.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceIPTunnel.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceIPTunnel.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceIPTunnel.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceIPTunnel.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -252,6 +253,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS" title="NM_DEVICE_IP_TUNNEL_FLOW_LABEL">NM_DEVICE_IP_TUNNEL_FLOW_LABEL</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -264,6 +269,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceIPTunnel.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceIPTunnel implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceIPTunnel.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -273,7 +284,7 @@
 <pre class="programlisting"><a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">NMDevice</span></a> *
 nm_device_ip_tunnel_get_parent (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.2.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.2.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -288,7 +299,7 @@ nm_device_ip_tunnel_get_parent (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.2.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.2.5"></a><h4>Returns</h4>
 <p> the device's parent device. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -300,7 +311,7 @@ nm_device_ip_tunnel_get_parent (<em class="parameter"><code><a class="link" href
 <pre class="programlisting"><a class="link" href="libnm-nm-dbus-interface.html#NMIPTunnelMode" title="enum NMIPTunnelMode"><span class="returnvalue">NMIPTunnelMode</span></a>
 nm_device_ip_tunnel_get_mode (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.3.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.3.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -315,7 +326,7 @@ nm_device_ip_tunnel_get_mode (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.3.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.3.5"></a><h4>Returns</h4>
 <p> the tunneling mode</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -326,7 +337,7 @@ nm_device_ip_tunnel_get_mode (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_device_ip_tunnel_get_local (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.4.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.4.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -341,7 +352,7 @@ nm_device_ip_tunnel_get_local (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.4.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.4.5"></a><h4>Returns</h4>
 <p> the local endpoint of the tunnel</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -352,7 +363,7 @@ nm_device_ip_tunnel_get_local (<em class="parameter"><code><a class="link" href=
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_device_ip_tunnel_get_remote (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.5.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.5.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -367,7 +378,7 @@ nm_device_ip_tunnel_get_remote (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.5.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.5.5"></a><h4>Returns</h4>
 <p> the remote endpoint of the tunnel</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -378,7 +389,7 @@ nm_device_ip_tunnel_get_remote (<em class="parameter"><code><a class="link" href
 <pre class="programlisting"><span class="returnvalue">guint8</span>
 nm_device_ip_tunnel_get_ttl (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.6.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.6.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -393,7 +404,7 @@ nm_device_ip_tunnel_get_ttl (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.6.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.6.5"></a><h4>Returns</h4>
 <p> the TTL assigned to tunneled packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -404,7 +415,7 @@ nm_device_ip_tunnel_get_ttl (<em class="parameter"><code><a class="link" href="N
 <pre class="programlisting"><span class="returnvalue">guint8</span>
 nm_device_ip_tunnel_get_tos (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.7.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.7.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -419,7 +430,7 @@ nm_device_ip_tunnel_get_tos (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.7.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.7.5"></a><h4>Returns</h4>
 <p> type of service (IPv4) or traffic class (IPv6) assigned
 to tunneled packets.</p>
 </div>
@@ -432,7 +443,7 @@ to tunneled packets.</p>
 nm_device_ip_tunnel_get_path_mtu_discovery
                                (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.8.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.8.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -447,7 +458,7 @@ nm_device_ip_tunnel_get_path_mtu_discovery
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.8.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.8.5"></a><h4>Returns</h4>
 <p> whether path MTU discovery is enabled</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -458,7 +469,7 @@ nm_device_ip_tunnel_get_path_mtu_discovery
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_device_ip_tunnel_get_input_key (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.9.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.9.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -473,7 +484,7 @@ nm_device_ip_tunnel_get_input_key (<em class="parameter"><code><a class="link" h
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.9.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.9.5"></a><h4>Returns</h4>
 <p> the key used for incoming packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -484,7 +495,7 @@ nm_device_ip_tunnel_get_input_key (<em class="parameter"><code><a class="link" h
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_device_ip_tunnel_get_output_key (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.10.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.10.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -499,7 +510,7 @@ nm_device_ip_tunnel_get_output_key (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.10.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.10.5"></a><h4>Returns</h4>
 <p> the key used for outgoing packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -511,7 +522,7 @@ nm_device_ip_tunnel_get_output_key (<em class="parameter"><code><a class="link"
 nm_device_ip_tunnel_get_encapsulation_limit
                                (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.11.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.11.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -526,7 +537,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.11.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.11.5"></a><h4>Returns</h4>
 <p> the maximum permitted encapsulation level</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -537,7 +548,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_ip_tunnel_get_flow_label (<em class="parameter"><code><a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel"><span class="type">NMDeviceIPTunnel</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.10.8.12.4"></a><h4>Parameters</h4>
+<a name="id-1.5.10.9.12.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -552,7 +563,7 @@ nm_device_ip_tunnel_get_flow_label (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.10.8.12.5"></a><h4>Returns</h4>
+<a name="id-1.5.10.9.12.5"></a><h4>Returns</h4>
 <p> the flow label assigned to tunnel packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -625,6 +636,11 @@ nm_device_ip_tunnel_get_flow_label (<em class="parameter"><code><a class="link"
 <pre class="programlisting">#define NM_DEVICE_IP_TUNNEL_FLOW_LABEL          "flow-label"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceIPTunnel-struct"></a><h3>NMDeviceIPTunnel</h3>
+<pre class="programlisting">typedef struct _NMDeviceIPTunnel NMDeviceIPTunnel;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceIPTunnel.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index ccfcbef2..b6b52604 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceInfiniband.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceInfiniband.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceInfiniband.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceInfiniband.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceInfiniband.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -98,6 +99,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-CARRIER:CAPS" title="NM_DEVICE_INFINIBAND_CARRIER">NM_DEVICE_INFINIBAND_CARRIER</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceInfiniband.html#NMDeviceInfiniband-struct" title="NMDeviceInfiniband">NMDeviceInfiniband</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -110,6 +115,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceInfiniband.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceInfiniband implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceInfiniband.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -120,7 +131,7 @@
 nm_device_infiniband_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband"><span class="type">NMDeviceInfiniband</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband"><span class="type">NMDeviceInfiniband</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.9.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -135,7 +146,7 @@ nm_device_infiniband_get_hw_address (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -147,7 +158,7 @@ device, and must not be modified.</p>
 nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband"><span class="type">NMDeviceInfiniband</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.9.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.9.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -162,7 +173,7 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.9.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.9.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -180,6 +191,11 @@ nm_device_infiniband_get_carrier (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting">#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceInfiniband-struct"></a><h3>NMDeviceInfiniband</h3>
+<pre class="programlisting">typedef struct _NMDeviceInfiniband NMDeviceInfiniband;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceInfiniband.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html
index f5866285..e8850687 100644
--- a/docs/libnm/html/NMDeviceMacvlan.html
+++ b/docs/libnm/html/NMDeviceMacvlan.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceMacvlan.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceMacvlan.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceMacvlan.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceMacvlan.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceMacvlan.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -150,6 +151,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-HW-ADDRESS:CAPS" title="NM_DEVICE_MACVLAN_HW_ADDRESS">NM_DEVICE_MACVLAN_HW_ADDRESS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan-struct" title="NMDeviceMacvlan">NMDeviceMacvlan</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -162,6 +167,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceMacvlan.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceMacvlan implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceMacvlan.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -171,7 +182,7 @@
 <pre class="programlisting"><a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">NMDevice</span></a> *
 nm_device_macvlan_get_parent (<em class="parameter"><code><a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan"><span class="type">NMDeviceMacvlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.11.8.2.4"></a><h4>Parameters</h4>
+<a name="id-1.5.11.9.2.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -186,7 +197,7 @@ nm_device_macvlan_get_parent (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.11.8.2.5"></a><h4>Returns</h4>
+<a name="id-1.5.11.9.2.5"></a><h4>Returns</h4>
 <p> the device's parent device. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -199,7 +210,7 @@ nm_device_macvlan_get_parent (<em class="parameter"><code><a class="link" href="
 nm_device_macvlan_get_mode (<em class="parameter"><code><a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan"><span class="type">NMDeviceMacvlan</span></a> *device</code></em>);</pre>
 <p>Gets the MACVLAN mode of the device.</p>
 <div class="refsect3">
-<a name="id-1.5.11.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.11.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -214,7 +225,7 @@ nm_device_macvlan_get_mode (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.11.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.11.9.3.6"></a><h4>Returns</h4>
 <p> the MACVLAN mode. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -227,7 +238,7 @@ device, and must not be modified.</p>
 nm_device_macvlan_get_no_promisc (<em class="parameter"><code><a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan"><span class="type">NMDeviceMacvlan</span></a> *device</code></em>);</pre>
 <p>Gets the no-promiscuous flag of the device.</p>
 <div class="refsect3">
-<a name="id-1.5.11.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.11.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -242,7 +253,7 @@ nm_device_macvlan_get_no_promisc (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.11.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.11.9.4.6"></a><h4>Returns</h4>
 <p> the no-promiscuous flag of the device.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -254,7 +265,7 @@ nm_device_macvlan_get_no_promisc (<em class="parameter"><code><a class="link" hr
 nm_device_macvlan_get_tap (<em class="parameter"><code><a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan"><span class="type">NMDeviceMacvlan</span></a> *device</code></em>);</pre>
 <p>Gets the device type (MACVLAN or MACVTAP).</p>
 <div class="refsect3">
-<a name="id-1.5.11.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.11.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -269,7 +280,7 @@ nm_device_macvlan_get_tap (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.11.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.11.9.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device is a MACVTAP, <code class="literal">FALSE</code> if it is a MACVLAN.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -281,7 +292,7 @@ nm_device_macvlan_get_tap (<em class="parameter"><code><a class="link" href="NMD
 nm_device_macvlan_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan"><span class="type">NMDeviceMacvlan</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan"><span class="type">NMDeviceMacvlan</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.11.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.11.9.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -296,7 +307,7 @@ nm_device_macvlan_get_hw_address (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.11.8.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.11.9.6.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -334,6 +345,11 @@ device, and must not be modified.</p>
 <pre class="programlisting">#define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceMacvlan-struct"></a><h3>NMDeviceMacvlan</h3>
+<pre class="programlisting">typedef struct _NMDeviceMacvlan NMDeviceMacvlan;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceMacvlan.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index 48227b60..f30e5846 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceModem.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceModem.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceModem.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceModem.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceModem.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -98,6 +99,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS" title="NM_DEVICE_MODEM_CURRENT_CAPABILITIES">NM_DEVICE_MODEM_CURRENT_CAPABILITIES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceModem.html#NMDeviceModem-struct" title="NMDeviceModem">NMDeviceModem</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -110,6 +115,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceModem.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceModem implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceModem.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -123,7 +134,7 @@ nm_device_modem_get_modem_capabilities
 supports.  Not all capabilities are available concurrently however; some
 may require a firmware reload or reinitialization.</p>
 <div class="refsect3">
-<a name="id-1.5.12.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.12.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -138,7 +149,7 @@ may require a firmware reload or reinitialization.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.12.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.12.9.2.6"></a><h4>Returns</h4>
 <p> the generic access technology families the modem supports</p>
 </div>
 </div>
@@ -152,7 +163,7 @@ nm_device_modem_get_current_capabilities
 supports without a firmware reload or reinitialization.  This value
 represents the network types the modem can immediately connect to.</p>
 <div class="refsect3">
-<a name="id-1.5.12.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.12.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -167,7 +178,7 @@ represents the network types the modem can immediately connect to.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.12.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.12.9.3.6"></a><h4>Returns</h4>
 <p> the generic access technology families the modem supports without
 a firmware reload or other reinitialization</p>
 </div>
@@ -186,6 +197,11 @@ a firmware reload or other reinitialization</p>
 <pre class="programlisting">#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceModem-struct"></a><h3>NMDeviceModem</h3>
+<pre class="programlisting">typedef struct _NMDeviceModem NMDeviceModem;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceModem.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index 92f9a5e6..df5a3297 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceOlpcMesh.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceOlpcMesh.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceOlpcMesh.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceOlpcMesh.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceOlpcMesh.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -116,6 +117,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ACTIVE-CHANNEL:CAPS" title="NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL">NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh-struct" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -128,6 +133,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceOlpcMesh.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceOlpcMesh implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceOlpcMesh.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -138,7 +149,7 @@
 nm_device_olpc_mesh_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.13.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.13.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -153,7 +164,7 @@ nm_device_olpc_mesh_get_hw_address (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.13.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.13.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -165,7 +176,7 @@ device, and must not be modified.</p>
 nm_device_olpc_mesh_get_companion (<em class="parameter"><code><a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a> *device</code></em>);</pre>
 <p>Gets the companion device of the <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.13.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.13.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -180,7 +191,7 @@ nm_device_olpc_mesh_get_companion (<em class="parameter"><code><a class="link" h
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.13.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.13.9.3.6"></a><h4>Returns</h4>
 <p> the companion of the device of <code class="literal">NULL</code>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -193,7 +204,7 @@ nm_device_olpc_mesh_get_active_channel
                                (<em class="parameter"><code><a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a> *device</code></em>);</pre>
 <p>Returns the active channel of the <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh"><span class="type">NMDeviceOlpcMesh</span></a> device.</p>
 <div class="refsect3">
-<a name="id-1.5.13.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.13.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -208,7 +219,7 @@ nm_device_olpc_mesh_get_active_channel
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.13.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.13.9.4.6"></a><h4>Returns</h4>
 <p> active channel of the device</p>
 </div>
 </div>
@@ -232,6 +243,11 @@ nm_device_olpc_mesh_get_active_channel
 <pre class="programlisting">#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceOlpcMesh-struct"></a><h3>NMDeviceOlpcMesh</h3>
+<pre class="programlisting">typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceOlpcMesh.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index e166abba..ecfce255 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceTeam.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceTeam.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceTeam.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceTeam.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceTeam.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -115,6 +116,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceTeam.html#NM-DEVICE-TEAM-SLAVES:CAPS" title="NM_DEVICE_TEAM_SLAVES">NM_DEVICE_TEAM_SLAVES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceTeam.html#NMDeviceTeam-struct" title="NMDeviceTeam">NMDeviceTeam</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -127,6 +132,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceTeam.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceTeam implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceTeam.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -137,7 +148,7 @@
 nm_device_team_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam"><span class="type">NMDeviceTeam</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam"><span class="type">NMDeviceTeam</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.14.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.14.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -152,7 +163,7 @@ nm_device_team_get_hw_address (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.14.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.14.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -164,7 +175,7 @@ device, and must not be modified.</p>
 nm_device_team_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam"><span class="type">NMDeviceTeam</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.14.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.14.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -179,7 +190,7 @@ nm_device_team_get_carrier (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.14.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.14.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -191,7 +202,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
-<a name="id-1.5.14.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.14.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -206,7 +217,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.14.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.14.9.4.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span> containing
 <a href="NMDevice.html"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
@@ -234,6 +245,11 @@ copy used by the device, and must not be modified. </p>
 <pre class="programlisting">#define NM_DEVICE_TEAM_SLAVES      "slaves"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceTeam-struct"></a><h3>NMDeviceTeam</h3>
+<pre class="programlisting">typedef struct _NMDeviceTeam NMDeviceTeam;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceTeam.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html
index 24157784..0fbc5942 100644
--- a/docs/libnm/html/NMDeviceTun.html
+++ b/docs/libnm/html/NMDeviceTun.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceTun.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceTun.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceTun.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceTun.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceTun.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -183,6 +184,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceTun.html#NM-DEVICE-TUN-MULTI-QUEUE:CAPS" title="NM_DEVICE_TUN_MULTI_QUEUE">NM_DEVICE_TUN_MULTI_QUEUE</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceTun.html#NMDeviceTun-struct" title="NMDeviceTun">NMDeviceTun</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -195,6 +200,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceTun.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceTun implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceTun.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -205,7 +216,7 @@
 nm_device_tun_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.15.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.15.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -220,7 +231,7 @@ nm_device_tun_get_hw_address (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.15.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.15.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -233,7 +244,7 @@ device, and must not be modified.</p>
 nm_device_tun_get_mode (<em class="parameter"><code><a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> *device</code></em>);</pre>
 <p>Returns the TUN/TAP mode for the device.</p>
 <div class="refsect3">
-<a name="id-1.5.15.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.15.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -248,7 +259,7 @@ nm_device_tun_get_mode (<em class="parameter"><code><a class="link" href="NMDevi
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.15.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.15.9.3.6"></a><h4>Returns</h4>
 <p> 'tun' or 'tap'</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -260,7 +271,7 @@ nm_device_tun_get_mode (<em class="parameter"><code><a class="link" href="NMDevi
 nm_device_tun_get_owner (<em class="parameter"><code><a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> *device</code></em>);</pre>
 <p>Gets the tunnel owner.</p>
 <div class="refsect3">
-<a name="id-1.5.15.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.15.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -275,7 +286,7 @@ nm_device_tun_get_owner (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.15.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.15.9.4.6"></a><h4>Returns</h4>
 <p> the uid of the tunnel owner, or -1 if it has no owner.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -287,7 +298,7 @@ nm_device_tun_get_owner (<em class="parameter"><code><a class="link" href="NMDev
 nm_device_tun_get_group (<em class="parameter"><code><a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> *device</code></em>);</pre>
 <p>Gets the tunnel group.</p>
 <div class="refsect3">
-<a name="id-1.5.15.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.15.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -302,7 +313,7 @@ nm_device_tun_get_group (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.15.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.15.9.5.6"></a><h4>Returns</h4>
 <p> the gid of the tunnel group, or -1 if it has no owner.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -320,7 +331,7 @@ nm_device_tun_get_no_pi (<em class="parameter"><code><a class="link" href="NMDev
 nm_device_tun_get_vnet_hdr (<em class="parameter"><code><a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> *device</code></em>);</pre>
 <p>Returns whether the <a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> has the IFF_VNET_HDR flag.</p>
 <div class="refsect3">
-<a name="id-1.5.15.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.15.9.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -335,7 +346,7 @@ nm_device_tun_get_vnet_hdr (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.15.8.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.15.9.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has the flag, <code class="literal">FALSE</code> otherwise</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -347,7 +358,7 @@ nm_device_tun_get_vnet_hdr (<em class="parameter"><code><a class="link" href="NM
 nm_device_tun_get_multi_queue (<em class="parameter"><code><a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> *device</code></em>);</pre>
 <p>Returns whether the <a class="link" href="NMDeviceTun.html" title="NMDeviceTun"><span class="type">NMDeviceTun</span></a> has the IFF_MULTI_QUEUE flag.</p>
 <div class="refsect3">
-<a name="id-1.5.15.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.15.9.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -362,7 +373,7 @@ nm_device_tun_get_multi_queue (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.15.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.15.9.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device doesn't have the flag, <code class="literal">FALSE</code> otherwise</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -411,6 +422,11 @@ nm_device_tun_get_multi_queue (<em class="parameter"><code><a class="link" href=
 <pre class="programlisting">#define NM_DEVICE_TUN_MULTI_QUEUE  "multi-queue"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceTun-struct"></a><h3>NMDeviceTun</h3>
+<pre class="programlisting">typedef struct _NMDeviceTun NMDeviceTun;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceTun.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 08ab3bf0..6acd104f 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceVlan.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceVlan.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceVlan.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceVlan.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceVlan.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -133,6 +134,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceVlan.html#NM-DEVICE-VLAN-VLAN-ID:CAPS" title="NM_DEVICE_VLAN_VLAN_ID">NM_DEVICE_VLAN_VLAN_ID</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceVlan.html#NMDeviceVlan-struct" title="NMDeviceVlan">NMDeviceVlan</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -145,6 +150,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceVlan.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceVlan implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceVlan.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -155,7 +166,7 @@
 nm_device_vlan_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan"><span class="type">NMDeviceVlan</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan"><span class="type">NMDeviceVlan</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.16.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.16.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -170,7 +181,7 @@ nm_device_vlan_get_hw_address (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.16.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.16.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -182,7 +193,7 @@ device, and must not be modified.</p>
 nm_device_vlan_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan"><span class="type">NMDeviceVlan</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.16.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.16.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -197,7 +208,7 @@ nm_device_vlan_get_carrier (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.16.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.16.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier</p>
 </div>
 </div>
@@ -207,7 +218,7 @@ nm_device_vlan_get_carrier (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting"><a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">NMDevice</span></a> *
 nm_device_vlan_get_parent (<em class="parameter"><code><a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan"><span class="type">NMDeviceVlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.16.8.4.4"></a><h4>Parameters</h4>
+<a name="id-1.5.16.9.4.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -222,7 +233,7 @@ nm_device_vlan_get_parent (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.16.8.4.5"></a><h4>Returns</h4>
+<a name="id-1.5.16.9.4.5"></a><h4>Returns</h4>
 <p> the device's parent device. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -233,7 +244,7 @@ nm_device_vlan_get_parent (<em class="parameter"><code><a class="link" href="NMD
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan"><span class="type">NMDeviceVlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.16.8.5.4"></a><h4>Parameters</h4>
+<a name="id-1.5.16.9.5.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -248,7 +259,7 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.16.8.5.5"></a><h4>Returns</h4>
+<a name="id-1.5.16.9.5.5"></a><h4>Returns</h4>
 <p> the device's VLAN ID</p>
 </div>
 </div>
@@ -278,6 +289,11 @@ nm_device_vlan_get_vlan_id (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting">#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceVlan-struct"></a><h3>NMDeviceVlan</h3>
+<pre class="programlisting">typedef struct _NMDeviceVlan NMDeviceVlan;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceVlan.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 074a37fb..98ce3d82 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceVxlan.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceVxlan.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceVxlan.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceVxlan.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceVxlan.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -371,6 +372,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceVxlan.html#NM-DEVICE-VXLAN-DST-PORT:CAPS" title="NM_DEVICE_VXLAN_DST_PORT">NM_DEVICE_VXLAN_DST_PORT</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan-struct" title="NMDeviceVxlan">NMDeviceVxlan</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -383,6 +388,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceVxlan.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceVxlan implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceVxlan.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -393,7 +404,7 @@
 nm_device_vxlan_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.17.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -408,7 +419,7 @@ nm_device_vxlan_get_hw_address (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.2.6"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -421,7 +432,7 @@ device, and must not be modified.</p>
 nm_device_vxlan_get_carrier (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <p>Whether the device has carrier.</p>
 <div class="refsect3">
-<a name="id-1.5.17.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -436,7 +447,7 @@ nm_device_vxlan_get_carrier (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.3.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the device has carrier.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -447,7 +458,7 @@ nm_device_vxlan_get_carrier (<em class="parameter"><code><a class="link" href="N
 <pre class="programlisting"><a class="link" href="NMDevice.html" title="NMDevice"><span class="returnvalue">NMDevice</span></a> *
 nm_device_vxlan_get_parent (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.4.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.4.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -462,7 +473,7 @@ nm_device_vxlan_get_parent (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.4.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.4.5"></a><h4>Returns</h4>
 <p> the device's parent device. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -474,7 +485,7 @@ nm_device_vxlan_get_parent (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_id (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.5.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.5.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -489,7 +500,7 @@ nm_device_vxlan_get_id (<em class="parameter"><code><a class="link" href="NMDevi
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.5.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.5.5"></a><h4>Returns</h4>
 <p> the device's VXLAN ID.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -500,7 +511,7 @@ nm_device_vxlan_get_id (<em class="parameter"><code><a class="link" href="NMDevi
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_device_vxlan_get_group (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.6.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.6.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -515,7 +526,7 @@ nm_device_vxlan_get_group (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.6.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.6.5"></a><h4>Returns</h4>
 <p> The unicast destination IP address or the multicast
 IP address joined</p>
 </div>
@@ -527,7 +538,7 @@ IP address joined</p>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_device_vxlan_get_local (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.7.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.7.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -542,7 +553,7 @@ nm_device_vxlan_get_local (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.7.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.7.5"></a><h4>Returns</h4>
 <p> the source IP address to use in outgoing packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -553,7 +564,7 @@ nm_device_vxlan_get_local (<em class="parameter"><code><a class="link" href="NMD
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_src_port_min (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.8.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.8.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -568,7 +579,7 @@ nm_device_vxlan_get_src_port_min (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.8.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.8.5"></a><h4>Returns</h4>
 <p> the minimum UDP source port</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -579,7 +590,7 @@ nm_device_vxlan_get_src_port_min (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_src_port_max (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.9.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.9.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -594,7 +605,7 @@ nm_device_vxlan_get_src_port_max (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.9.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.9.5"></a><h4>Returns</h4>
 <p>  the maximum UDP source port</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -605,7 +616,7 @@ nm_device_vxlan_get_src_port_max (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_dst_port (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.10.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.10.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -620,7 +631,7 @@ nm_device_vxlan_get_dst_port (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.10.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.10.5"></a><h4>Returns</h4>
 <p> the UDP destination port</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -631,7 +642,7 @@ nm_device_vxlan_get_dst_port (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_vxlan_get_learning (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.11.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.11.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -646,7 +657,7 @@ nm_device_vxlan_get_learning (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.11.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.11.5"></a><h4>Returns</h4>
 <p> whether address learning is enabled</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -657,7 +668,7 @@ nm_device_vxlan_get_learning (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_ageing (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.12.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.12.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -672,7 +683,7 @@ nm_device_vxlan_get_ageing (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.12.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.12.5"></a><h4>Returns</h4>
 <p> the lifetime in seconds of FDB entries learnt by the kernel</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -683,7 +694,7 @@ nm_device_vxlan_get_ageing (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_tos (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.13.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.13.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -698,7 +709,7 @@ nm_device_vxlan_get_tos (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.13.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.13.5"></a><h4>Returns</h4>
 <p> the TOS value to use in outgoing packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -709,7 +720,7 @@ nm_device_vxlan_get_tos (<em class="parameter"><code><a class="link" href="NMDev
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_ttl (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.14.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.14.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -724,7 +735,7 @@ nm_device_vxlan_get_ttl (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.14.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.14.5"></a><h4>Returns</h4>
 <p> the time-to-live value to use in outgoing packets</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -735,7 +746,7 @@ nm_device_vxlan_get_ttl (<em class="parameter"><code><a class="link" href="NMDev
 <pre class="programlisting"><span class="returnvalue">guint</span>
 nm_device_vxlan_get_limit (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.15.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.15.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -750,7 +761,7 @@ nm_device_vxlan_get_limit (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.15.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.15.5"></a><h4>Returns</h4>
 <p> the maximum number of entries that can be added to the
 forwarding table</p>
 </div>
@@ -762,7 +773,7 @@ forwarding table</p>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_vxlan_get_proxy (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.16.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.16.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -777,7 +788,7 @@ nm_device_vxlan_get_proxy (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.16.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.16.5"></a><h4>Returns</h4>
 <p> whether ARP proxy is turned on</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -788,7 +799,7 @@ nm_device_vxlan_get_proxy (<em class="parameter"><code><a class="link" href="NMD
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_vxlan_get_rsc (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.17.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.17.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -803,7 +814,7 @@ nm_device_vxlan_get_rsc (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.17.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.17.5"></a><h4>Returns</h4>
 <p> whether route short circuit is turned on</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -814,7 +825,7 @@ nm_device_vxlan_get_rsc (<em class="parameter"><code><a class="link" href="NMDev
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_vxlan_get_l2miss (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.18.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.18.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -829,7 +840,7 @@ nm_device_vxlan_get_l2miss (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.18.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.18.5"></a><h4>Returns</h4>
 <p> whether netlink LL ADDR miss notifications are generated</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -840,7 +851,7 @@ nm_device_vxlan_get_l2miss (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_device_vxlan_get_l3miss (<em class="parameter"><code><a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan"><span class="type">NMDeviceVxlan</span></a> *device</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.17.8.19.4"></a><h4>Parameters</h4>
+<a name="id-1.5.17.9.19.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -855,7 +866,7 @@ nm_device_vxlan_get_l3miss (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.17.8.19.5"></a><h4>Returns</h4>
+<a name="id-1.5.17.9.19.5"></a><h4>Returns</h4>
 <p> wether netlink IP ADDR miss notifications are generated</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -970,6 +981,11 @@ nm_device_vxlan_get_l3miss (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting">#define NM_DEVICE_VXLAN_DST_PORT      "dst-port"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceVxlan-struct"></a><h3>NMDeviceVxlan</h3>
+<pre class="programlisting">typedef struct _NMDeviceVxlan NMDeviceVxlan;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceVxlan.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index c9c6128c..bb85020c 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceWifi.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceWifi.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceWifi.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceWifi.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceWifi.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#NMDeviceWifi.signals" class="shortcut">Signals</a></span>
 </td>
@@ -255,6 +256,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceWifi.html#NM-DEVICE-WIFI-ACCESS-POINTS:CAPS" title="NM_DEVICE_WIFI_ACCESS_POINTS">NM_DEVICE_WIFI_ACCESS_POINTS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceWifi.html#NMDeviceWifi-struct" title="NMDeviceWifi">NMDeviceWifi</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -267,6 +272,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceWifi.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceWifi implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceWifi.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -277,7 +288,7 @@
 nm_device_wifi_get_hw_address (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the actual hardware (MAC) address of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.18.9.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -292,7 +303,7 @@ nm_device_wifi_get_hw_address (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.2.6"></a><h4>Returns</h4>
 <p> the actual hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -305,7 +316,7 @@ nm_device_wifi_get_permanent_hw_address
                                (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the permanent hardware (MAC) address of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.18.9.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -320,7 +331,7 @@ nm_device_wifi_get_permanent_hw_address
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.3.6"></a><h4>Returns</h4>
 <p> the permanent hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -332,7 +343,7 @@ device, and must not be modified.</p>
 nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> mode.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -347,7 +358,7 @@ nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDev
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.4.6"></a><h4>Returns</h4>
 <p> the mode</p>
 </div>
 </div>
@@ -358,7 +369,7 @@ nm_device_wifi_get_mode (<em class="parameter"><code><a class="link" href="NMDev
 nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the bit rate of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> in kbit/s.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -373,7 +384,7 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.5.6"></a><h4>Returns</h4>
 <p> the bit rate (kbit/s)</p>
 </div>
 </div>
@@ -384,7 +395,7 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 nm_device_wifi_get_capabilities (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the Wi-Fi capabilities of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -399,7 +410,7 @@ nm_device_wifi_get_capabilities (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.6.6"></a><h4>Returns</h4>
 <p> the capabilities</p>
 </div>
 </div>
@@ -411,7 +422,7 @@ nm_device_wifi_get_active_access_point
                                (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets the active <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -426,7 +437,7 @@ nm_device_wifi_get_active_access_point
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.7.6"></a><h4>Returns</h4>
 <p> the access point or <code class="literal">NULL</code> if none is active. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -440,7 +451,7 @@ nm_device_wifi_get_access_point_by_path
                                 <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>Gets a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> by path.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -462,7 +473,7 @@ nm_device_wifi_get_access_point_by_path
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.8.6"></a><h4>Returns</h4>
 <p> the access point or <code class="literal">NULL</code> if none is found. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -474,7 +485,7 @@ nm_device_wifi_get_access_point_by_path
 nm_device_wifi_get_access_points (<em class="parameter"><code><a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a> *device</code></em>);</pre>
 <p>Gets all the scanned access points of the <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><span class="type">NMDeviceWifi</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -489,7 +500,7 @@ nm_device_wifi_get_access_points (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.9.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.9.6"></a><h4>Returns</h4>
 <p> a <span class="type">GPtrArray</span> containing all the
 scanned <a href="NMAccessPoint.html"><span class="type">NMAccessPoints</span></a>.
 The returned array is owned by the client and should not be modified. </p>
@@ -508,7 +519,7 @@ nm_device_wifi_request_scan (<em class="parameter"><code><a class="link" href="N
 returns immediately after requesting the scan, and it may take some time
 after that for the scan to complete.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -535,7 +546,7 @@ after that for the scan to complete.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.10.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be
 set.</p>
@@ -560,7 +571,7 @@ for the scanning. The argument is the dictionary passed to <code class="function
 D-Bus call. Valid otions inside the dictionary are:
 'ssids' =&gt; array of SSIDs (saay)</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -592,7 +603,7 @@ D-Bus call. Valid otions inside the dictionary are:
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.11.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.11.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be
 set.</p>
@@ -613,7 +624,7 @@ nm_device_wifi_request_scan_async (<em class="parameter"><code><a class="link" h
 called immediately after requesting the scan, and it may take some time after
 that for the scan to complete.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.12.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -668,7 +679,7 @@ for the scanning. The argument is the dictionary passed to <code class="function
 D-Bus call. Valid otions inside the dictionary are:
 'ssids' =&gt; array of SSIDs (saay)</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.13.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -716,7 +727,7 @@ nm_device_wifi_request_scan_finish (<em class="parameter"><code><a class="link"
                                     <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMDeviceWifi.html#nm-device-wifi-request-scan-async" title="nm_device_wifi_request_scan_async ()"><code class="function">nm_device_wifi_request_scan_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.18.9.14.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.10.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -743,7 +754,7 @@ nm_device_wifi_request_scan_finish (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.18.9.14.6"></a><h4>Returns</h4>
+<a name="id-1.5.18.10.14.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be
 set.</p>
@@ -793,6 +804,11 @@ set.</p>
 <pre class="programlisting">#define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWifi-struct"></a><h3>NMDeviceWifi</h3>
+<pre class="programlisting">typedef struct _NMDeviceWifi NMDeviceWifi;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWifi.property-details"></a><h2>Property Details</h2>
@@ -860,7 +876,7 @@ user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><sp
                <span class="type">gpointer</span>      user_data)</pre>
 <p>Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is added to the Wi-Fi device.</p>
 <div class="refsect3">
-<a name="id-1.5.18.12.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.13.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -897,7 +913,7 @@ user_function (<a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi"><sp
                <span class="type">gpointer</span>      user_data)</pre>
 <p>Notifies that a <a class="link" href="NMAccessPoint.html" title="NMAccessPoint"><span class="type">NMAccessPoint</span></a> is removed from the Wi-Fi device.</p>
 <div class="refsect3">
-<a name="id-1.5.18.12.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.18.13.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index 24c99f8e..5f751d77 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDeviceWimax.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDeviceWimax.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDeviceWimax.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDeviceWimax.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDeviceWimax.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#NMDeviceWimax.signals" class="shortcut">Signals</a></span>
 </td>
@@ -232,6 +233,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDeviceWimax.html#NM-DEVICE-WIMAX-NSPS:CAPS" title="NM_DEVICE_WIMAX_NSPS">NM_DEVICE_WIMAX_NSPS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDeviceWimax.html#NMDeviceWimax-struct" title="NMDeviceWimax">NMDeviceWimax</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -244,6 +249,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDeviceWimax.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDeviceWimax implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDeviceWimax.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -258,7 +269,7 @@ nm_device_wimax_get_hw_address (<em class="parameter"><code><a class="link" href
 </div>
 <p>Gets the hardware (MAC) address of the <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a></p>
 <div class="refsect3">
-<a name="id-1.5.19.9.2.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.2.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -273,7 +284,7 @@ nm_device_wimax_get_hw_address (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.2.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.2.7"></a><h4>Returns</h4>
 <p> the hardware address. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -289,7 +300,7 @@ nm_device_wimax_get_active_nsp (<em class="parameter"><code><a class="link" href
 </div>
 <p>Gets the active <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.3.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.3.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -304,7 +315,7 @@ nm_device_wimax_get_active_nsp (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.3.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.3.7"></a><h4>Returns</h4>
 <p> the access point or <code class="literal">NULL</code> if none is active. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -321,7 +332,7 @@ nm_device_wimax_get_nsp_by_path (<em class="parameter"><code><a class="link" hre
 </div>
 <p>Gets a <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> by path.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.4.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.4.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -343,7 +354,7 @@ nm_device_wimax_get_nsp_by_path (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.4.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.4.7"></a><h4>Returns</h4>
 <p> the access point or <code class="literal">NULL</code> if none is found. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -359,7 +370,7 @@ nm_device_wimax_get_nsps (<em class="parameter"><code><a class="link" href="NMDe
 </div>
 <p>Gets all the scanned NSPs of the <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><span class="type">NMDeviceWimax</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.5.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.5.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -374,7 +385,7 @@ nm_device_wimax_get_nsps (<em class="parameter"><code><a class="link" href="NMDe
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.5.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.5.7"></a><h4>Returns</h4>
 <p> a <span class="type">GPtrArray</span> containing
 all the scanned <a href="NMWimaxNsp.html"><span class="type">NMWimaxNsps</span></a>.
 The returned array is owned by the client and should not be modified. </p>
@@ -394,7 +405,7 @@ nm_device_wimax_get_center_frequency (<em class="parameter"><code><a class="link
 to communicate with the network when connected.  Has no meaning when the
 device is not connected.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.6.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.6.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -409,7 +420,7 @@ device is not connected.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.6.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.6.7"></a><h4>Returns</h4>
 <p> the center frequency in KHz, or 0</p>
 </div>
 </div>
@@ -427,7 +438,7 @@ strong the raw received RF signal from the base station is, but does not
 indicate the overall quality of the radio link.  Has no meaning when the
 device is not connected.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.7.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.7.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -442,7 +453,7 @@ device is not connected.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.7.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.7.7"></a><h4>Returns</h4>
 <p> the RSSI in dBm, or 0</p>
 </div>
 </div>
@@ -459,7 +470,7 @@ nm_device_wimax_get_cinr (<em class="parameter"><code><a class="link" href="NMDe
 link in dB.  CINR is a more accurate measure of radio link quality.  Has no
 meaning when the device is not connected.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.8.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.8.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -474,7 +485,7 @@ meaning when the device is not connected.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.8.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.8.7"></a><h4>Returns</h4>
 <p> the CINR in dB, or 0</p>
 </div>
 </div>
@@ -491,7 +502,7 @@ nm_device_wimax_get_tx_power (<em class="parameter"><code><a class="link" href="
 0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
 -5.5 dBm.  Has no meaning when the device is not connected.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.9.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.9.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -506,7 +517,7 @@ nm_device_wimax_get_tx_power (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.9.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.9.7"></a><h4>Returns</h4>
 <p> the TX power in dBm, or 0</p>
 </div>
 </div>
@@ -521,7 +532,7 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 </div>
 <p>Gets the ID of the serving Base Station when the device is connected.</p>
 <div class="refsect3">
-<a name="id-1.5.19.9.10.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.10.10.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -536,7 +547,7 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.9.10.7"></a><h4>Returns</h4>
+<a name="id-1.5.19.10.10.7"></a><h4>Returns</h4>
 <p> the ID of the serving Base Station, or <code class="literal">NULL</code></p>
 </div>
 </div>
@@ -590,6 +601,11 @@ nm_device_wimax_get_bsid (<em class="parameter"><code><a class="link" href="NMDe
 <pre class="programlisting">#define NM_DEVICE_WIMAX_NSPS             "nsps"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMDeviceWimax-struct"></a><h3>NMDeviceWimax</h3>
+<pre class="programlisting">typedef struct _NMDeviceWimax NMDeviceWimax;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMDeviceWimax.property-details"></a><h2>Property Details</h2>
@@ -708,7 +724,7 @@ user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><
 <p>WiMAX is no longer supported.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.12.2.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.13.2.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -749,7 +765,7 @@ user_function (<a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax"><
 <p>WiMAX is no longer supported.</p>
 </div>
 <div class="refsect3">
-<a name="id-1.5.19.12.3.6"></a><h4>Parameters</h4>
+<a name="id-1.5.19.13.3.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index b506c4b1..407a1341 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMDhcpConfig.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMDhcpConfig.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMDhcpConfig.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMDhcpConfig.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMDhcpConfig.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -99,6 +100,10 @@
 </colgroup>
 <tbody>
 <tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMDhcpConfig.html#NMDhcpConfig-struct" title="NMDhcpConfig">NMDhcpConfig</a></td>
+</tr>
+<tr>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMDhcpConfig.html#NM-DHCP-CONFIG-FAMILY:CAPS" title="NM_DHCP_CONFIG_FAMILY">NM_DHCP_CONFIG_FAMILY</a></td>
 </tr>
@@ -117,6 +122,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMDhcpConfig.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMDhcpConfig implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMDhcpConfig.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -127,7 +138,7 @@
 nm_dhcp_config_get_family (<em class="parameter"><code><a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> *config</code></em>);</pre>
 <p>Gets the IP address family of the configuration</p>
 <div class="refsect3">
-<a name="id-1.5.26.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.26.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -142,7 +153,7 @@ nm_dhcp_config_get_family (<em class="parameter"><code><a class="link" href="NMD
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.26.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.26.9.2.6"></a><h4>Returns</h4>
 <p> the IP address family; either <code class="literal">AF_INET</code> or
 <code class="literal">AF_INET6</code></p>
 </div>
@@ -154,7 +165,7 @@ nm_dhcp_config_get_family (<em class="parameter"><code><a class="link" href="NMD
 nm_dhcp_config_get_options (<em class="parameter"><code><a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig"><span class="type">NMDhcpConfig</span></a> *config</code></em>);</pre>
 <p>Gets all the options contained in the configuration.</p>
 <div class="refsect3">
-<a name="id-1.5.26.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.26.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -169,7 +180,7 @@ nm_dhcp_config_get_options (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.26.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.26.9.3.6"></a><h4>Returns</h4>
 <p> the <span class="type">GHashTable</span> containing
 strings for keys and values.  This is the internal copy used by the
 configuration, and must not be modified. </p>
@@ -184,7 +195,7 @@ nm_dhcp_config_get_one_option (<em class="parameter"><code><a class="link" href=
                                <em class="parameter"><code>const <span class="type">char</span> *option</code></em>);</pre>
 <p>Gets one option by option name.</p>
 <div class="refsect3">
-<a name="id-1.5.26.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.26.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -206,7 +217,7 @@ nm_dhcp_config_get_one_option (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.26.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.26.9.4.6"></a><h4>Returns</h4>
 <p> the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.</p>
 </div>
@@ -215,6 +226,11 @@ configuration, and must not be modified.</p>
 <div class="refsect1">
 <a name="NMDhcpConfig.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
+<a name="NMDhcpConfig-struct"></a><h3>NMDhcpConfig</h3>
+<pre class="programlisting">typedef struct _NMDhcpConfig NMDhcpConfig;</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-DHCP-CONFIG-FAMILY:CAPS"></a><h3>NM_DHCP_CONFIG_FAMILY</h3>
 <pre class="programlisting">#define NM_DHCP_CONFIG_FAMILY  "family"
 </pre>
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index b21fc882..6435caa6 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMIPConfig.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMIPConfig.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMIPConfig.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMIPConfig.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMIPConfig.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -167,6 +168,10 @@
 </colgroup>
 <tbody>
 <tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMIPConfig.html#NMIPConfig-struct" title="NMIPConfig">NMIPConfig</a></td>
+</tr>
+<tr>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMIPConfig.html#NM-IP-CONFIG-FAMILY:CAPS" title="NM_IP_CONFIG_FAMILY">NM_IP_CONFIG_FAMILY</a></td>
 </tr>
@@ -209,6 +214,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMIPConfig.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMIPConfig implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMIPConfig.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -219,7 +230,7 @@
 nm_ip_config_get_family (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the IP address family</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -234,7 +245,7 @@ nm_ip_config_get_family (<em class="parameter"><code><a class="link" href="NMIPC
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.2.6"></a><h4>Returns</h4>
 <p> the IP address family; either <code class="literal">AF_INET</code> or
 <code class="literal">AF_INET6</code></p>
 </div>
@@ -246,7 +257,7 @@ nm_ip_config_get_family (<em class="parameter"><code><a class="link" href="NMIPC
 nm_ip_config_get_gateway (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the IP gateway address.</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -261,7 +272,7 @@ nm_ip_config_get_gateway (<em class="parameter"><code><a class="link" href="NMIP
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.3.6"></a><h4>Returns</h4>
 <p> the IP address of the gateway. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -273,7 +284,7 @@ nm_ip_config_get_gateway (<em class="parameter"><code><a class="link" href="NMIP
 nm_ip_config_get_addresses (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the IP addresses (containing the address, prefix, and gateway).</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -288,7 +299,7 @@ nm_ip_config_get_addresses (<em class="parameter"><code><a class="link" href="NM
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.4.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span>
 containing <a class="link" href="NMSettingIPConfig.html#NMIPAddress"><span class="type">NMIPAddress</span></a>es.  This is the internal copy used by the
 configuration and must not be modified. The library never modifies the
@@ -303,7 +314,7 @@ returned array and thus it is safe for callers to reference and keep using it. <
 nm_ip_config_get_routes (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the routes.</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -318,7 +329,7 @@ nm_ip_config_get_routes (<em class="parameter"><code><a class="link" href="NMIPC
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.5.6"></a><h4>Returns</h4>
 <p> the <span class="type">GPtrArray</span> containing
 <a href="NMSettingIPConfig.html#NMIPRoute"><span class="type">NMIPRoutes</span></a>. This is the internal copy used by the configuration, and must
 not be modified. The library never modifies the returned array and thus it is
@@ -333,7 +344,7 @@ safe for callers to reference and keep using it. </p>
 nm_ip_config_get_nameservers (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the domain name servers (DNS).</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -348,7 +359,7 @@ nm_ip_config_get_nameservers (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.6.6"></a><h4>Returns</h4>
 <p> the array of nameserver IP addresses. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
@@ -360,7 +371,7 @@ nm_ip_config_get_nameservers (<em class="parameter"><code><a class="link" href="
 nm_ip_config_get_domains (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the domain names.</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -375,7 +386,7 @@ nm_ip_config_get_domains (<em class="parameter"><code><a class="link" href="NMIP
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.7.6"></a><h4>Returns</h4>
 <p> the array of domains.
 (This is never <code class="literal">NULL</code>, though it may be 0-length). </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -388,7 +399,7 @@ nm_ip_config_get_domains (<em class="parameter"><code><a class="link" href="NMIP
 nm_ip_config_get_searches (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the DNS searches.</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -403,7 +414,7 @@ nm_ip_config_get_searches (<em class="parameter"><code><a class="link" href="NMI
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.8.6"></a><h4>Returns</h4>
 <p> the array of DNS search strings.
 (This is never <code class="literal">NULL</code>, though it may be 0-length). </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -416,7 +427,7 @@ nm_ip_config_get_searches (<em class="parameter"><code><a class="link" href="NMI
 nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href="NMIPConfig.html" title="NMIPConfig"><span class="type">NMIPConfig</span></a> *config</code></em>);</pre>
 <p>Gets the Windows Internet Name Service servers (WINS).</p>
 <div class="refsect3">
-<a name="id-1.5.25.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.25.9.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -431,7 +442,7 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.25.8.9.6"></a><h4>Returns</h4>
+<a name="id-1.5.25.9.9.6"></a><h4>Returns</h4>
 <p> the arry of WINS server IP address strings.
 (This is never <code class="literal">NULL</code>, though it may be 0-length.). </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
@@ -441,6 +452,11 @@ nm_ip_config_get_wins_servers (<em class="parameter"><code><a class="link" href=
 <div class="refsect1">
 <a name="NMIPConfig.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
+<a name="NMIPConfig-struct"></a><h3>NMIPConfig</h3>
+<pre class="programlisting">typedef struct _NMIPConfig NMIPConfig;</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-IP-CONFIG-FAMILY:CAPS"></a><h3>NM_IP_CONFIG_FAMILY</h3>
 <pre class="programlisting">#define NM_IP_CONFIG_FAMILY "family"
 </pre>
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index c9779152..ccb3f2c9 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMObject.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMObject.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMObject.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMObject.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMObject.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -94,6 +95,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS" title="NM_OBJECT_DBUS_CONNECTION">NM_OBJECT_DBUS_CONNECTION</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMObject.html#NMObject-struct" title="NMObject">NMObject</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -111,6 +116,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMObject.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMObject implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMObject.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -121,7 +132,7 @@
 nm_object_get_path (<em class="parameter"><code><a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> *object</code></em>);</pre>
 <p>Gets the DBus path of the <a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.4.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.3.4.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -136,7 +147,7 @@ nm_object_get_path (<em class="parameter"><code><a class="link" href="NMObject.h
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.4.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.3.4.9.2.6"></a><h4>Returns</h4>
 <p> the object's path. This is the internal string used by the
 device, and must not be modified.</p>
 </div>
@@ -155,6 +166,11 @@ device, and must not be modified.</p>
 <pre class="programlisting">#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMObject-struct"></a><h3>NMObject</h3>
+<pre class="programlisting">typedef struct _NMObject NMObject;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMObject.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index 48fc088c..47dbcbcc 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMRemoteConnection.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMRemoteConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMRemoteConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMRemoteConnection.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMRemoteConnection.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -202,6 +203,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS" title="NM_REMOTE_CONNECTION_VISIBLE">NM_REMOTE_CONNECTION_VISIBLE</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMRemoteConnection.html#NMRemoteConnection-struct" title="NMRemoteConnection">NMRemoteConnection</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -213,6 +218,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMRemoteConnection.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMRemoteConnection implements
+ GInitable,  GAsyncInitable and  <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>.</p>
+</div>
+<div class="refsect1">
 <a name="NMRemoteConnection.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -230,7 +241,7 @@ NetworkManager. If <em class="parameter"><code>save_to_disk</code></em>
  is <code class="literal">TRUE</code>, the updated connection will be saved to
 disk; if <code class="literal">FALSE</code>, then only the in-memory representation will be changed.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -262,7 +273,7 @@ disk; if <code class="literal">FALSE</code>, then only the in-memory representat
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.2.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -284,7 +295,7 @@ nm_remote_connection_commit_changes_async
 be saved to disk; if <code class="literal">FALSE</code>, then only the in-memory representation will be
 changed.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -332,7 +343,7 @@ nm_remote_connection_commit_changes_finish
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMRemoteConnection.html#nm-remote-connection-commit-changes-async" title="nm_remote_connection_commit_changes_async ()"><code class="function">nm_remote_connection_commit_changes_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -359,7 +370,7 @@ nm_remote_connection_commit_changes_finish
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.4.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -374,7 +385,7 @@ nm_remote_connection_save (<em class="parameter"><code><a class="link" href="NMR
 <p>Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -401,7 +412,7 @@ been written to disk, or if the connection has never been saved.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.5.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -417,7 +428,7 @@ nm_remote_connection_save_async (<em class="parameter"><code><a class="link" hre
 <p>Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -459,7 +470,7 @@ nm_remote_connection_save_finish (<em class="parameter"><code><a class="link" hr
                                   <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMRemoteConnection.html#nm-remote-connection-save-async" title="nm_remote_connection_save_async ()"><code class="function">nm_remote_connection_save_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -486,7 +497,7 @@ nm_remote_connection_save_finish (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.7.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -500,7 +511,7 @@ nm_remote_connection_delete (<em class="parameter"><code><a class="link" href="N
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Deletes the connection.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -527,7 +538,7 @@ nm_remote_connection_delete (<em class="parameter"><code><a class="link" href="N
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -542,7 +553,7 @@ nm_remote_connection_delete_async (<em class="parameter"><code><a class="link" h
                                    <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously deletes the connection.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -584,7 +595,7 @@ nm_remote_connection_delete_finish (<em class="parameter"><code><a class="link"
                                     <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMRemoteConnection.html#nm-remote-connection-delete-async" title="nm_remote_connection_delete_async ()"><code class="function">nm_remote_connection_delete_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -611,7 +622,7 @@ nm_remote_connection_delete_finish (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.10.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error, in which case <em class="parameter"><code>error</code></em>
 will be set.</p>
 </div>
@@ -627,7 +638,7 @@ nm_remote_connection_get_secrets (<em class="parameter"><code><a class="link" hr
 <p>Request the connection's secrets. Note that this is a blocking D-Bus call,
 not a simple property accessor.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.11.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -659,7 +670,7 @@ not a simple property accessor.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.11.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.11.6"></a><h4>Returns</h4>
 <p> a <span class="type">GVariant</span> of type <code class="literal">NM_VARIANT_TYPE_CONNECTION</code> containing
 <em class="parameter"><code>connection</code></em>
 's secrets, or <code class="literal">NULL</code> on error.</p>
@@ -677,7 +688,7 @@ nm_remote_connection_get_secrets_async
                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously requests the connection's secrets.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.12.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -725,7 +736,7 @@ nm_remote_connection_get_secrets_finish
                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMRemoteConnection.html#nm-remote-connection-get-secrets-async" title="nm_remote_connection_get_secrets_async ()"><code class="function">nm_remote_connection_get_secrets_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.13.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.13.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -752,7 +763,7 @@ nm_remote_connection_get_secrets_finish
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.13.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.13.6"></a><h4>Returns</h4>
 <p> a <span class="type">GVariant</span> of type <code class="literal">NM_VARIANT_TYPE_CONNECTION</code>
 containing <em class="parameter"><code>connection</code></em>
 's secrets, or <code class="literal">NULL</code> on error. </p>
@@ -765,7 +776,7 @@ containing <em class="parameter"><code>connection</code></em>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_remote_connection_get_unsaved (<em class="parameter"><code><a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> *connection</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.5.22.8.14.4"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.14.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -780,7 +791,7 @@ nm_remote_connection_get_unsaved (<em class="parameter"><code><a class="link" hr
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.14.5"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.14.5"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the remote connection contains changes that have not
 been saved to disk, <code class="literal">FALSE</code> if the connection is the same as its on-disk
 representation.</p>
@@ -800,7 +811,7 @@ non-visible connections to callers, but it is possible for a
 connection's visibility to change after you already have a
 reference to it.)</p>
 <div class="refsect3">
-<a name="id-1.5.22.8.15.5"></a><h4>Parameters</h4>
+<a name="id-1.5.22.9.15.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -815,7 +826,7 @@ reference to it.)</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.22.8.15.6"></a><h4>Returns</h4>
+<a name="id-1.5.22.9.15.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the remote connection is visible to the current
 user, <code class="literal">FALSE</code> if not.</p>
 </div>
@@ -846,6 +857,11 @@ user, <code class="literal">FALSE</code> if not.</p>
 <pre class="programlisting">#define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMRemoteConnection-struct"></a><h3>NMRemoteConnection</h3>
+<pre class="programlisting">typedef struct _NMRemoteConnection NMRemoteConnection;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMRemoteConnection.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index 3fb7ca3a..b7654a05 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMSecretAgentOld.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMSecretAgentOld.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMSecretAgentOld.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMSecretAgentOld.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMSecretAgentOld.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -205,6 +206,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-CAPABILITIES:CAPS" title="NM_SECRET_AGENT_OLD_CAPABILITIES">NM_SECRET_AGENT_OLD_CAPABILITIES</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSecretAgentOld.html#NMSecretAgentOld-struct" title="NMSecretAgentOld">NMSecretAgentOld</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -215,6 +220,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMSecretAgentOld.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMSecretAgentOld implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMSecretAgentOld.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -223,7 +234,7 @@
 <a name="NMSecretAgentOldGetSecretsFunc"></a><h3>NMSecretAgentOldGetSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentOldGetSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *agent</code></em>,
-                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                   <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><span class="type">GVariant</span> *secrets</code></em>,
                                    <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                    <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
@@ -234,7 +245,7 @@ those secrets or the error.</p>
 <p>To easily create the dictionary to return the Wi-Fi PSK, you could do
 something like this:</p>
 <div class="example">
-<a name="id-1.3.3.8.2.6"></a><p class="title"><b>Example 1. Creating a secrets dictionary</b></p>
+<a name="id-1.3.3.9.2.6"></a><p class="title"><b>Example 1. Creating a secrets dictionary</b></p>
 <div class="example-contents">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
     <tbody>
@@ -264,8 +275,8 @@ something like this:</p>
 <span class="function">g_object_set</span><span class="normal"> </span><span class="symbol">(</span><span class="function">G_OBJECT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">),</span>
 <span class="normal">              <a href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK:CAPS">NM_SETTING_WIRELESS_SECURITY_PSK</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"my really cool PSK"</span><span class="symbol">,</span>
 <span class="normal">              NULL</span><span class="symbol">);</span>
-<span class="function"><a href="libnm-NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
-<span class="normal">secrets_dict </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="libnm-NMConnection.html#nm-connection-to-dbus">nm_connection_to_dbus</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS">NM_CONNECTION_SERIALIZE_ALL</a></span><span class="symbol">);</span>
+<span class="function"><a href="NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> </span><span class="function">NM_SETTING</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">));</span>
+<span class="normal">secrets_dict </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="NMConnection.html#nm-connection-to-dbus">nm_connection_to_dbus</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS">NM_CONNECTION_SERIALIZE_ALL</a></span><span class="symbol">);</span>
 
 <span class="symbol">(</span><span class="normal">call the NMSecretAgentOldGetSecretsFunc </span><span class="usertype">with</span><span class="normal"> secrets_dict</span><span class="symbol">)</span>
 
@@ -278,7 +289,7 @@ something like this:</p>
 
 </div>
 <br class="example-break"><div class="refsect3">
-<a name="id-1.3.3.8.2.7"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.2.7"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -302,9 +313,9 @@ has returned. </p></td>
 <tr>
 <td class="parameter_name"><p>secrets</p></td>
 <td class="parameter_description"><p>the <span class="type">GVariant</span> of type <code class="literal">NM_VARIANT_TYPE_CONNECTION</code> containing the requested
-secrets (as created by <a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> for example).  Each key in <em class="parameter"><code>secrets</code></em>
+secrets (as created by <a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> for example).  Each key in <em class="parameter"><code>secrets</code></em>
 should be the name of a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
-and each value should be an <a class="link" href="libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING"><code class="literal">NM_VARIANT_TYPE_SETTING</code></a> variant.  The sub-dicts
+and each value should be an <a class="link" href="NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING"><code class="literal">NM_VARIANT_TYPE_SETTING</code></a> variant.  The sub-dicts
 map string:value, where the string is the setting property name (like "psk")
 and the value is the secret</p></td>
 <td class="parameter_annotations"> </td>
@@ -328,14 +339,14 @@ and the value is the secret</p></td>
 <a name="NMSecretAgentOldSaveSecretsFunc"></a><h3>NMSecretAgentOldSaveSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentOldSaveSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *agent</code></em>,
-                                    <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                    <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                     <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                     <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to save secrets.  When the
 <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> subclass has finished saving the secrets, this function
 should be called.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -375,14 +386,14 @@ has returned. </p></td>
 <a name="NMSecretAgentOldDeleteSecretsFunc"></a><h3>NMSecretAgentOldDeleteSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentOldDeleteSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *agent</code></em>,
-                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                      <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                       <em class="parameter"><code><span class="type">GError</span> *error</code></em>,
                                       <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to delete secrets.  When the
 <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> subclass has finished deleting the secrets, this function
 should be called.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -430,7 +441,7 @@ secrets for connections on behalf of its user.</p>
 <p>It is a programmer error to attempt to register an agent that is already
 registered, or in the process of registering.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.5.6"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.5.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -457,7 +468,7 @@ registered, or in the process of registering.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.3.8.5.7"></a><h4>Returns</h4>
+<a name="id-1.3.3.9.5.7"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if registration was successful, <code class="literal">FALSE</code> on error.</p>
 </div>
 </div>
@@ -475,7 +486,7 @@ save secrets for connections on behalf of its user.</p>
 <p>It is a programmer error to attempt to register an agent that is already
 registered, or in the process of registering.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.6.6"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.6.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -517,7 +528,7 @@ nm_secret_agent_old_register_finish (<em class="parameter"><code><a class="link"
                                      <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMSecretAgentOld.html#nm-secret-agent-old-register-async" title="nm_secret_agent_old_register_async ()"><code class="function">nm_secret_agent_old_register_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.7.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.7.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -544,7 +555,7 @@ nm_secret_agent_old_register_finish (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.3.8.7.6"></a><h4>Returns</h4>
+<a name="id-1.3.3.9.7.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if registration was successful, <code class="literal">FALSE</code> on error.</p>
 </div>
 </div>
@@ -559,7 +570,7 @@ nm_secret_agent_old_unregister (<em class="parameter"><code><a class="link" href
 indicating to NetworkManager that the agent will no longer provide or
 store secrets on behalf of this user.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.8.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.8.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -586,7 +597,7 @@ store secrets on behalf of this user.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.3.8.8.6"></a><h4>Returns</h4>
+<a name="id-1.3.3.9.8.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if unregistration was successful, <code class="literal">FALSE</code> on error</p>
 </div>
 </div>
@@ -602,7 +613,7 @@ nm_secret_agent_old_unregister_async (<em class="parameter"><code><a class="link
 manager, indicating to NetworkManager that the agent will no longer provide
 or store secrets on behalf of this user.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.9.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.9.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -644,7 +655,7 @@ nm_secret_agent_old_unregister_finish (<em class="parameter"><code><a class="lin
                                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Gets the result of a call to <a class="link" href="NMSecretAgentOld.html#nm-secret-agent-old-unregister-async" title="nm_secret_agent_old_unregister_async ()"><code class="function">nm_secret_agent_old_unregister_async()</code></a>.</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.10.5"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.10.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -671,7 +682,7 @@ nm_secret_agent_old_unregister_finish (<em class="parameter"><code><a class="lin
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.3.8.10.6"></a><h4>Returns</h4>
+<a name="id-1.3.3.9.10.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if unregistration was successful, <code class="literal">FALSE</code> on error.</p>
 </div>
 </div>
@@ -681,7 +692,7 @@ nm_secret_agent_old_unregister_finish (<em class="parameter"><code><a class="lin
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_secret_agent_old_get_registered (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>);</pre>
 <div class="refsect3">
-<a name="id-1.3.3.8.11.4"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.11.4"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -696,7 +707,7 @@ nm_secret_agent_old_get_registered (<em class="parameter"><code><a class="link"
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.3.3.8.11.5"></a><h4>Returns</h4>
+<a name="id-1.3.3.9.11.5"></a><h4>Returns</h4>
 <p> a <code class="literal">TRUE</code> if the agent is registered, <code class="literal">FALSE</code> if it is not.</p>
 </div>
 </div>
@@ -705,7 +716,7 @@ nm_secret_agent_old_get_registered (<em class="parameter"><code><a class="link"
 <a name="nm-secret-agent-old-get-secrets"></a><h3>nm_secret_agent_old_get_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_old_get_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>,
-                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code>const <span class="type">char</span> *setting_name</code></em>,
                                  <em class="parameter"><code>const <span class="type">char</span> **hints</code></em>,
                                  <em class="parameter"><code><a class="link" href="libnm-nm-dbus-interface.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
@@ -721,7 +732,7 @@ existing secrets without user interaction, or requesting entirely new
 secrets from the user.</p>
 <p>Virtual: get_secrets</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.12.6"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.12.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -736,7 +747,7 @@ secrets from the user.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> for which we're asked secrets</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -774,7 +785,7 @@ secrets from the user.</p>
 <a name="nm-secret-agent-old-save-secrets"></a><h3>nm_secret_agent_old_save_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_old_save_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>,
-                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                  <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                   <em class="parameter"><code><a class="link" href="NMSecretAgentOld.html#NMSecretAgentOldSaveSecretsFunc" title="NMSecretAgentOldSaveSecretsFunc ()"><span class="type">NMSecretAgentOldSaveSecretsFunc</span></a> callback</code></em>,
                                   <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously ensures that all secrets inside <em class="parameter"><code>connection</code></em>
@@ -782,7 +793,7 @@ nm_secret_agent_old_save_secrets (<em class="parameter"><code><a class="link" hr
 disk.</p>
 <p>Virtual: save_secrets</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.13.6"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.13.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -797,7 +808,7 @@ disk.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -820,7 +831,7 @@ disk.</p>
 <a name="nm-secret-agent-old-delete-secrets"></a><h3>nm_secret_agent_old_delete_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld"><span class="type">NMSecretAgentOld</span></a> *self</code></em>,
-                                    <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                    <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                     <em class="parameter"><code><a class="link" href="NMSecretAgentOld.html#NMSecretAgentOldDeleteSecretsFunc" title="NMSecretAgentOldDeleteSecretsFunc ()"><span class="type">NMSecretAgentOldDeleteSecretsFunc</span></a> callback</code></em>,
                                     <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Asynchronously asks the agent to delete all saved secrets belonging to
@@ -828,7 +839,7 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 .</p>
 <p>Virtual: delete_secrets</p>
 <div class="refsect3">
-<a name="id-1.3.3.8.14.6"></a><h4>Parameters</h4>
+<a name="id-1.3.3.9.14.6"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -843,7 +854,7 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -887,6 +898,11 @@ nm_secret_agent_old_delete_secrets (<em class="parameter"><code><a class="link"
 <pre class="programlisting">#define NM_SECRET_AGENT_OLD_CAPABILITIES        "capabilities"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSecretAgentOld-struct"></a><h3>NMSecretAgentOld</h3>
+<pre class="programlisting">typedef struct _NMSecretAgentOld NMSecretAgentOld;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSecretAgentOld.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 1a8a870f..c392ec1f 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -207,8 +207,8 @@
 <td class="function_name"><a class="link" href="NMSetting.html#NMSettingMacRandomization" title="enum NMSettingMacRandomization">NMSettingMacRandomization</a></td>
 </tr>
 <tr>
-<td class="datatype_keyword">struct</td>
-<td class="function_name"><a class="link" href="NMSetting.html#NMSetting-struct" title="struct NMSetting">NMSetting</a></td>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a></td>
 </tr>
 <tr>
 <td class="datatype_keyword">enum</td>
@@ -219,11 +219,11 @@
 </div>
 <div class="refsect1">
 <a name="NMSetting.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingCompareFlags
     <span class="lineart">├──</span> NMSettingDiffResult
     <span class="lineart">╰──</span> NMSettingMacRandomization
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+    GFlags
     <span class="lineart">╰──</span> NMSettingSecretFlags
     GObject
     <span class="lineart">╰──</span> NMSetting
@@ -263,7 +263,7 @@
 <p>Each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or Wi-Fi).  A collection of individual settings together
-make up an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. Each property is strongly typed and usually has
+make up an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. Each property is strongly typed and usually has
 a number of allowed values.  See each <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass for a description
 of properties and allowed values.</p>
 </div>
@@ -320,7 +320,7 @@ of properties and allowed values.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>User data passed to <a class="link" href="libnm-NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()"><code class="function">nm_connection_clear_secrets_with_flags()</code></a></p></td>
+<td class="parameter_description"><p>User data passed to <a class="link" href="NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()"><code class="function">nm_connection_clear_secrets_with_flags()</code></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -467,7 +467,7 @@ like 'ppp' or 'wireless' or 'wired'.</p>
 <a name="nm-setting-verify"></a><h3>nm_setting_verify ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_setting_verify (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
-                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                   <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Validates the setting.  Each setting's properties have allowed values, and
 some are dependent on other values (hence the need for <em class="parameter"><code>connection</code></em>
@@ -490,7 +490,7 @@ failed validation, and in what way that property failed validation.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
+<td class="parameter_description"><p> the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
 came from, or
 <code class="literal">NULL</code> if <em class="parameter"><code>setting</code></em>
 is being verified in isolation. </p></td>
@@ -514,7 +514,7 @@ is being verified in isolation. </p></td>
 <a name="nm-setting-verify-secrets"></a><h3>nm_setting_verify_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_setting_verify_secrets (<em class="parameter"><code><a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> *setting</code></em>,
-                           <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                           <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                            <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Verifies the secrets in the setting.
 The returned <span class="type">GError</span> contains information about which secret of the setting
@@ -537,7 +537,7 @@ in some cases connection failure is not desired just for the secrets.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p> the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
+<td class="parameter_description"><p> the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> that <em class="parameter"><code>setting</code></em>
 came from, or
 <code class="literal">NULL</code> if <em class="parameter"><code>setting</code></em>
 is being verified in isolation. </p></td>
@@ -994,7 +994,7 @@ two connections.</p>
 <td class="enum_member_name"><p><a name="NM-SETTING-COMPARE-FLAG-DIFF-RESULT-WITH-DEFAULT:CAPS"></a>NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT</p></td>
 <td class="enum_member_description">
 <p>if this flag is set,
-  <a class="link" href="NMSetting.html#nm-setting-diff" title="nm_setting_diff ()"><code class="function">nm_setting_diff()</code></a> and <a class="link" href="libnm-NMConnection.html#nm-connection-diff" title="nm_connection_diff ()"><code class="function">nm_connection_diff()</code></a> will also include properties that
+  <a class="link" href="NMSetting.html#nm-setting-diff" title="nm_setting_diff ()"><code class="function">nm_setting_diff()</code></a> and <a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()"><code class="function">nm_connection_diff()</code></a> will also include properties that
   are set to their default value. See also <em class="parameter"><code>NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT</code></em>
 .</p>
 </td>
@@ -1004,7 +1004,7 @@ two connections.</p>
 <td class="enum_member_name"><p><a name="NM-SETTING-COMPARE-FLAG-DIFF-RESULT-NO-DEFAULT:CAPS"></a>NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT</p></td>
 <td class="enum_member_description">
 <p>if this flag is set,
-  <a class="link" href="NMSetting.html#nm-setting-diff" title="nm_setting_diff ()"><code class="function">nm_setting_diff()</code></a> and <a class="link" href="libnm-NMConnection.html#nm-connection-diff" title="nm_connection_diff ()"><code class="function">nm_connection_diff()</code></a> will not include properties that
+  <a class="link" href="NMSetting.html#nm-setting-diff" title="nm_setting_diff ()"><code class="function">nm_setting_diff()</code></a> and <a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()"><code class="function">nm_connection_diff()</code></a> will not include properties that
   are set to their default value. This is the opposite of
   <em class="parameter"><code>NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT</code></em>
 . If both flags are set together,
@@ -1074,8 +1074,8 @@ overridden by user-controlled defaults configuration, is "never".</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSetting-struct"></a><h3>struct NMSetting</h3>
-<pre class="programlisting">struct NMSetting;</pre>
+<a name="NMSetting-struct"></a><h3>NMSetting</h3>
+<pre class="programlisting">typedef struct _NMSetting NMSetting;</pre>
 <p>The NMSetting struct contains only private data.
 It should only be accessed through the functions described below.</p>
 </div>
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index a71d5022..16c019d5 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -952,12 +952,16 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" title="NM_SETTING_802_1X_SYSTEM_CA_CERTS">NM_SETTING_802_1X_SYSTEM_CA_CERTS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSetting8021x.html#NMSetting8021x-struct" title="NMSetting8021x">NMSetting8021x</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSetting8021x.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSetting8021xCKFormat
     <span class="lineart">╰──</span> NMSetting8021xCKScheme
     GObject
@@ -3650,6 +3654,11 @@ to a file containing the certificate or key data</p>
 <pre class="programlisting">#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSetting8021x-struct"></a><h3>NMSetting8021x</h3>
+<pre class="programlisting">typedef struct _NMSetting8021x NMSetting8021x;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSetting8021x.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index 3b890722..ce039df3 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -215,6 +215,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS" title="NM_SETTING_ADSL_ENCAPSULATION_LLC">NM_SETTING_ADSL_ENCAPSULATION_LLC</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingAdsl.html#NMSettingAdsl-struct" title="NMSettingAdsl">NMSettingAdsl</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -497,6 +501,11 @@ nm_setting_adsl_get_password_flags (<em class="parameter"><code><a class="link"
 <pre class="programlisting">#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingAdsl-struct"></a><h3>NMSettingAdsl</h3>
+<pre class="programlisting">typedef struct _NMSettingAdsl NMSettingAdsl;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingAdsl.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index dc9095c9..51ce06b7 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -118,6 +118,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS" title="NM_SETTING_BLUETOOTH_TYPE_PANU">NM_SETTING_BLUETOOTH_TYPE_PANU</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth-struct" title="NMSettingBluetooth">NMSettingBluetooth</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -240,6 +244,11 @@ DUN profile.</p>
 <p>Connection type describing a connection to devices that support the Bluetooth
 NAP (Network Access Point) protocol, which accepts connections via PANU.</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBluetooth-struct"></a><h3>NMSettingBluetooth</h3>
+<pre class="programlisting">typedef struct _NMSettingBluetooth NMSettingBluetooth;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingBluetooth.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 94a98924..1da953e2 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -253,6 +253,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS" title="NM_SETTING_BOND_OPTION_LP_INTERVAL">NM_SETTING_BOND_OPTION_LP_INTERVAL</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingBond.html#NMSettingBond-struct" title="NMSettingBond">NMSettingBond</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -764,6 +768,11 @@ the <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The
 <pre class="programlisting">#define NM_SETTING_BOND_OPTION_LP_INTERVAL       "lp_interval"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBond-struct"></a><h3>NMSettingBond</h3>
+<pre class="programlisting">typedef struct _NMSettingBond NMSettingBond;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingBond.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index a5286057..1752d4d5 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -212,6 +212,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingBridge.html#NM-SETTING-BRIDGE-MULTICAST-SNOOPING:CAPS" title="NM_SETTING_BRIDGE_MULTICAST_SNOOPING">NM_SETTING_BRIDGE_MULTICAST_SNOOPING</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingBridge.html#NMSettingBridge-struct" title="NMSettingBridge">NMSettingBridge</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -498,6 +502,11 @@ nm_setting_bridge_get_multicast_snooping
 <pre class="programlisting">#define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridge-struct"></a><h3>NMSettingBridge</h3>
+<pre class="programlisting">typedef struct _NMSettingBridge NMSettingBridge;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingBridge.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index b6aee68e..f6b9cb84 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -127,6 +127,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" title="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE">NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort-struct" title="NMSettingBridgePort">NMSettingBridgePort</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -257,6 +261,11 @@ nm_setting_bridge_port_get_hairpin_mode
 <pre class="programlisting">#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingBridgePort-struct"></a><h3>NMSettingBridgePort</h3>
+<pre class="programlisting">typedef struct _NMSettingBridgePort NMSettingBridgePort;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingBridgePort.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 18180f06..d3533f79 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -144,6 +144,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" title="NM_SETTING_CDMA_PASSWORD_FLAGS">NM_SETTING_CDMA_PASSWORD_FLAGS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingCdma.html#NMSettingCdma-struct" title="NMSettingCdma">NMSettingCdma</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -304,6 +308,11 @@ nm_setting_cdma_get_password_flags (<em class="parameter"><code><a class="link"
 <pre class="programlisting">#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingCdma-struct"></a><h3>NMSettingCdma</h3>
+<pre class="programlisting">typedef struct _NMSettingCdma NMSettingCdma;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingCdma.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 0cb7806e..89b3f606 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -465,15 +465,15 @@
 <td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnectionLldp" title="enum NMSettingConnectionLldp">NMSettingConnectionLldp</a></td>
 </tr>
 <tr>
-<td class="datatype_keyword">struct</td>
-<td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="struct NMSettingConnection">NMSettingConnection</a></td>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="NMSettingConnection">NMSettingConnection</a></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingConnectionAutoconnectSlaves
     <span class="lineart">╰──</span> NMSettingConnectionLldp
     GObject
@@ -484,8 +484,8 @@
 <div class="refsect1">
 <a name="NMSettingConnection.description"></a><h2>Description</h2>
 <p>The <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes
-properties that apply to all <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> objects, regardless of what type
-of network connection they describe.  Each <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object must contain
+properties that apply to all <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> objects, regardless of what type
+of network connection they describe.  Each <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object must contain
 a <a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> setting.</p>
 </div>
 <div class="refsect1">
@@ -1566,8 +1566,8 @@ should be activated when master is activated.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="NMSettingConnection-struct"></a><h3>struct NMSettingConnection</h3>
-<pre class="programlisting">struct NMSettingConnection;</pre>
+<a name="NMSettingConnection-struct"></a><h3>NMSettingConnection</h3>
+<pre class="programlisting">typedef struct _NMSettingConnection NMSettingConnection;</pre>
 <p>The NMSettingConnection struct contains only private data.
 It should only be accessed through the functions described below.</p>
 </div>
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index a662d108..78829261 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -397,12 +397,16 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-TRAFFIC-CLASS:CAPS" title="NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS">NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingDcb.html#NMSettingDcb-struct" title="NMSettingDcb">NMSettingDcb</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingDcb.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+<pre class="screen">    GFlags
     <span class="lineart">╰──</span> NMSettingDcbFlags
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -1238,6 +1242,11 @@ peer configuration advertisements</p>
 <pre class="programlisting">#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingDcb-struct"></a><h3>NMSettingDcb</h3>
+<pre class="programlisting">typedef struct _NMSettingDcb NMSettingDcb;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingDcb.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index 81cb154a..42d890ef 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -56,10 +56,16 @@
 <col width="150px" class="name">
 <col class="description">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingGeneric.html#NM-SETTING-GENERIC-SETTING-NAME:CAPS" title="NM_SETTING_GENERIC_SETTING_NAME">NM_SETTING_GENERIC_SETTING_NAME</a></td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingGeneric.html#NMSettingGeneric-struct" title="NMSettingGeneric">NMSettingGeneric</a></td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <div class="refsect1">
@@ -75,7 +81,7 @@
 optional properties that apply to "generic" devices (ie, devices that
 NetworkManager does not specifically recognize).</p>
 <p>There are currently no properties on this object; it exists only to be
-the "connection type" setting on <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> for generic devices.</p>
+the "connection type" setting on <a href="NMConnection.html"><span class="type">NMConnections</span></a> for generic devices.</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingGeneric.functions_details"></a><h2>Functions</h2>
@@ -98,6 +104,11 @@ nm_setting_generic_new (<em class="parameter"><code><span class="type">void</spa
 <pre class="programlisting">#define NM_SETTING_GENERIC_SETTING_NAME "generic"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingGeneric-struct"></a><h3>NMSettingGeneric</h3>
+<pre class="programlisting">typedef struct _NMSettingGeneric NMSettingGeneric;</pre>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 50ac79d3..63878218 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -280,6 +280,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingGsm.html#NM-SETTING-GSM-SIM-OPERATOR-ID:CAPS" title="NM_SETTING_GSM_SIM_OPERATOR_ID">NM_SETTING_GSM_SIM_OPERATOR_ID</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingGsm.html#NMSettingGsm-struct" title="NMSettingGsm">NMSettingGsm</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -691,6 +695,11 @@ nm_setting_gsm_get_password_flags (<em class="parameter"><code><a class="link" h
 <pre class="programlisting">#define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingGsm-struct"></a><h3>NMSettingGsm</h3>
+<pre class="programlisting">typedef struct _NMSettingGsm NMSettingGsm;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingGsm.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 79eb39d2..162a186c 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -130,6 +130,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS" title="NM_SETTING_IP4_CONFIG_METHOD_DISABLED">NM_SETTING_IP4_CONFIG_METHOD_DISABLED</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config-struct" title="NMSettingIP4Config">NMSettingIP4Config</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -294,6 +298,11 @@ through that interface to the default network.</p>
 </pre>
 <p>This connection does not use or require IPv4 address and it should be disabled.</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingIP4Config-struct"></a><h3>NMSettingIP4Config</h3>
+<pre class="programlisting">typedef struct _NMSettingIP4Config NMSettingIP4Config;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIP4Config.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 8d733c14..0fa2bb56 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -142,12 +142,16 @@
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingIP6Config.html#NMSettingIP6ConfigAddrGenMode" title="enum NMSettingIP6ConfigAddrGenMode">NMSettingIP6ConfigAddrGenMode</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config-struct" title="NMSettingIP6Config">NMSettingIP6Config</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIP6Config.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMSettingIP6ConfigAddrGenMode
     <span class="lineart">╰──</span> NMSettingIP6ConfigPrivacy
     GObject
@@ -401,6 +405,11 @@ specified by RFC7217.</p>
 </div>
 <p class="since">Since: 1.2</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingIP6Config-struct"></a><h3>NMSettingIP6Config</h3>
+<pre class="programlisting">typedef struct _NMSettingIP6Config NMSettingIP6Config;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIP6Config.property-details"></a><h2>Property Details</h2>
@@ -409,7 +418,7 @@ specified by RFC7217.</p>
 <pre class="programlisting">  “addr-gen-mode†           <span class="type">gint</span></pre>
 <p>Configure method for creating the address for use with RFC4862 IPv6
 Stateless Address Autoconfiguration. The permitted values are: "eui64",
-"stable-privacy" or unset.</p>
+or "stable-privacy".</p>
 <p>If the property is set to "eui64", the addresses will be generated
 using the interface tokens derived from  hardware address. This makes
 the host part of the address to stay constant, making it possible
@@ -421,8 +430,10 @@ identification and the network address as specified by RFC7217.
 This makes it impossible to use the address track host's presence,
 and makes the address stable when the network interface hardware is
 replaced.</p>
-<p>Leaving this unset causes a default that could be subject to change
-in future versions to be used.</p>
+<p>On D-Bus, the absence of an addr-gen-mode setting equals enabling
+"stable-privacy". For keyfile plugin, the absence of the setting
+on disk means "eui64" so that the property doesn't change on upgrade
+from older versions.</p>
 <p>Note that this setting is distinct from the Privacy Extensions as
 configured by "ip6-privacy" property and it does not affect the
 temporary addresses configured with this option.</p>
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index f2a9fafc..61034747 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -917,12 +917,16 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS" title="NM_SETTING_DNS_OPTION_USE_VC">NM_SETTING_DNS_OPTION_USE_VC</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig-struct" title="NMSettingIPConfig">NMSettingIPConfig</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPConfig.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+<pre class="screen">    GBoxed
     <span class="lineart">├──</span> NMIPAddress
     <span class="lineart">╰──</span> NMIPRoute
     GObject
@@ -3728,6 +3732,11 @@ the particular kind of device.</p>
 <pre class="programlisting">#define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingIPConfig-struct"></a><h3>NMSettingIPConfig</h3>
+<pre class="programlisting">typedef struct _NMSettingIPConfig NMSettingIPConfig;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPConfig.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html
index 795afe74..d3147dda 100644
--- a/docs/libnm/html/NMSettingIPTunnel.html
+++ b/docs/libnm/html/NMSettingIPTunnel.html
@@ -280,6 +280,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-MTU:CAPS" title="NM_SETTING_IP_TUNNEL_MTU">NM_SETTING_IP_TUNNEL_MTU</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel-struct" title="NMSettingIPTunnel">NMSettingIPTunnel</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -713,6 +717,11 @@ nm_setting_ip_tunnel_get_mtu (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting">#define NM_SETTING_IP_TUNNEL_MTU                 "mtu"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingIPTunnel-struct"></a><h3>NMSettingIPTunnel</h3>
+<pre class="programlisting">typedef struct _NMSettingIPTunnel NMSettingIPTunnel;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIPTunnel.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index 985657f0..5aa72bd5 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -168,6 +168,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-PARENT:CAPS" title="NM_SETTING_INFINIBAND_PARENT">NM_SETTING_INFINIBAND_PARENT</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband-struct" title="NMSettingInfiniband">NMSettingInfiniband</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -395,6 +399,11 @@ return <code class="literal">NULL</code>.)</p>
 <pre class="programlisting">#define NM_SETTING_INFINIBAND_PARENT         "parent"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingInfiniband-struct"></a><h3>NMSettingInfiniband</h3>
+<pre class="programlisting">typedef struct _NMSettingInfiniband NMSettingInfiniband;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingInfiniband.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html
index c96ffbb4..d5d1a207 100644
--- a/docs/libnm/html/NMSettingMacvlan.html
+++ b/docs/libnm/html/NMSettingMacvlan.html
@@ -145,6 +145,10 @@
 <td class="function_name"><a class="link" href="NMSettingMacvlan.html#NM-SETTING-MACVLAN-TAP:CAPS" title="NM_SETTING_MACVLAN_TAP">NM_SETTING_MACVLAN_TAP</a></td>
 </tr>
 <tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingMacvlan.html#NMSettingMacvlan-struct" title="NMSettingMacvlan">NMSettingMacvlan</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingMacvlan.html#NMSettingMacvlanMode" title="enum NMSettingMacvlanMode">NMSettingMacvlanMode</a></td>
 </tr>
@@ -153,7 +157,7 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingMacvlan.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingMacvlanMode
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -317,9 +321,14 @@ nm_setting_macvlan_get_tap (<em class="parameter"><code><a class="link" href="NM
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingMacvlan-struct"></a><h3>NMSettingMacvlan</h3>
+<pre class="programlisting">typedef struct _NMSettingMacvlan NMSettingMacvlan;</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingMacvlanMode"></a><h3>enum NMSettingMacvlanMode</h3>
 <div class="refsect3">
-<a name="id-1.4.21.9.7.3"></a><h4>Members</h4>
+<a name="id-1.4.21.9.8.3"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index 8b6e59fb..900ed774 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -128,6 +128,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS" title="NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS">NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh-struct" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -220,6 +224,11 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 <pre class="programlisting">#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingOlpcMesh-struct"></a><h3>NMSettingOlpcMesh</h3>
+<pre class="programlisting">typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingOlpcMesh.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index a9eb83f6..78e3148f 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -383,6 +383,10 @@ that require PPP to deliver IP capability</p>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingPpp.html#NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS" title="NM_SETTING_PPP_LCP_ECHO_INTERVAL">NM_SETTING_PPP_LCP_ECHO_INTERVAL</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingPpp.html#NMSettingPpp-struct" title="NMSettingPpp">NMSettingPpp</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -978,6 +982,11 @@ nm_setting_ppp_get_lcp_echo_interval (<em class="parameter"><code><a class="link
 <pre class="programlisting">#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingPpp-struct"></a><h3>NMSettingPpp</h3>
+<pre class="programlisting">typedef struct _NMSettingPpp NMSettingPpp;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingPpp.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index 232cb5b4..571c7f95 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -144,6 +144,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" title="NM_SETTING_PPPOE_PASSWORD_FLAGS">NM_SETTING_PPPOE_PASSWORD_FLAGS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingPppoe.html#NMSettingPppoe-struct" title="NMSettingPppoe">NMSettingPppoe</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -305,6 +309,11 @@ nm_setting_pppoe_get_password_flags (<em class="parameter"><code><a class="link"
 <pre class="programlisting">#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingPppoe-struct"></a><h3>NMSettingPppoe</h3>
+<pre class="programlisting">typedef struct _NMSettingPppoe NMSettingPppoe;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingPppoe.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index 41240d6b..07f82316 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -166,12 +166,16 @@ serial communications</p>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingSerial.html#NM-SETTING-SERIAL-SEND-DELAY:CAPS" title="NM_SETTING_SERIAL_SEND_DELAY">NM_SETTING_SERIAL_SEND_DELAY</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingSerial.html#NMSettingSerial-struct" title="NMSettingSerial">NMSettingSerial</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingSerial.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingSerialParity
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -398,6 +402,11 @@ nm_setting_serial_get_send_delay (<em class="parameter"><code><a class="link" hr
 <pre class="programlisting">#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingSerial-struct"></a><h3>NMSettingSerial</h3>
+<pre class="programlisting">typedef struct _NMSettingSerial NMSettingSerial;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingSerial.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 56fd8330..c1a62a83 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -91,6 +91,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingTeam.html#NM-SETTING-TEAM-CONFIG:CAPS" title="NM_SETTING_TEAM_CONFIG">NM_SETTING_TEAM_CONFIG</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingTeam.html#NMSettingTeam-struct" title="NMSettingTeam">NMSettingTeam</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -158,6 +162,11 @@ nm_setting_team_get_config (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting">#define NM_SETTING_TEAM_CONFIG "config"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingTeam-struct"></a><h3>NMSettingTeam</h3>
+<pre class="programlisting">typedef struct _NMSettingTeam NMSettingTeam;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingTeam.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index 77e59635..5bc4544a 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -91,6 +91,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS" title="NM_SETTING_TEAM_PORT_CONFIG">NM_SETTING_TEAM_PORT_CONFIG</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort-struct" title="NMSettingTeamPort">NMSettingTeamPort</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -158,6 +162,11 @@ nm_setting_team_port_get_config (<em class="parameter"><code><a class="link" hre
 <pre class="programlisting">#define NM_SETTING_TEAM_PORT_CONFIG     "config"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingTeamPort-struct"></a><h3>NMSettingTeamPort</h3>
+<pre class="programlisting">typedef struct _NMSettingTeamPort NMSettingTeamPort;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingTeamPort.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index b6be30d1..9a7a9fc5 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -182,12 +182,16 @@
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingTun.html#NMSettingTunMode" title="enum NMSettingTunMode">NMSettingTunMode</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingTun.html#NMSettingTun-struct" title="NMSettingTun">NMSettingTun</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingTun.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingTunMode
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -451,6 +455,11 @@ nm_setting_tun_get_multi_queue (<em class="parameter"><code><a class="link" href
 </table></div>
 </div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingTun-struct"></a><h3>NMSettingTun</h3>
+<pre class="programlisting">typedef struct _NMSettingTun NMSettingTun;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingTun.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index ed4cd4f7..61e4bf45 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -214,6 +214,10 @@
 <td class="function_name"><a class="link" href="NMSettingVlan.html#NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS" title="NM_SETTING_VLAN_EGRESS_PRIORITY_MAP">NM_SETTING_VLAN_EGRESS_PRIORITY_MAP</a></td>
 </tr>
 <tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingVlan.html#NMSettingVlan-struct" title="NMSettingVlan">NMSettingVlan</a></td>
+</tr>
+<tr>
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap">NMVlanPriorityMap</a></td>
 </tr>
@@ -226,9 +230,9 @@
 </div>
 <div class="refsect1">
 <a name="NMSettingVlan.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMVlanPriorityMap
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+    GFlags
     <span class="lineart">╰──</span> NMVlanFlags
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -738,11 +742,16 @@ overwrote the old value, <code class="literal">FALSE</code> if error</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingVlan-struct"></a><h3>NMSettingVlan</h3>
+<pre class="programlisting">typedef struct _NMSettingVlan NMSettingVlan;</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMVlanPriorityMap"></a><h3>enum NMVlanPriorityMap</h3>
 <p>A selector for traffic priority maps; these map Linux SKB priorities
 to 802.1p priorities used in VLANs.</p>
 <div class="refsect3">
-<a name="id-1.4.29.9.8.4"></a><h4>Members</h4>
+<a name="id-1.4.29.9.9.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -773,7 +782,7 @@ to 802.1p priorities used in VLANs.</p>
 <a name="NMVlanFlags"></a><h3>enum NMVlanFlags</h3>
 <p><a class="link" href="NMSettingVlan.html#NMVlanFlags" title="enum NMVlanFlags"><span class="type">NMVlanFlags</span></a> values control the behavior of the VLAN interface.</p>
 <div class="refsect3">
-<a name="id-1.4.29.9.9.4"></a><h4>Members</h4>
+<a name="id-1.4.29.9.10.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index a3413677..047769d6 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -250,6 +250,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingVpn.html#NM-SETTING-VPN-TIMEOUT:CAPS" title="NM_SETTING_VPN_TIMEOUT">NM_SETTING_VPN_TIMEOUT</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingVpn.html#NMSettingVpn-struct" title="NMSettingVpn">NMSettingVpn</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -823,6 +827,11 @@ nm_setting_vpn_get_timeout (<em class="parameter"><code><a class="link" href="NM
 <pre class="programlisting">#define NM_SETTING_VPN_TIMEOUT      "timeout"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingVpn-struct"></a><h3>NMSettingVpn</h3>
+<pre class="programlisting">typedef struct _NMSettingVpn NMSettingVpn;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingVpn.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html
index c22da680..c3189428 100644
--- a/docs/libnm/html/NMSettingVxlan.html
+++ b/docs/libnm/html/NMSettingVxlan.html
@@ -348,6 +348,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingVxlan.html#NM-SETTING-VXLAN-L3-MISS:CAPS" title="NM_SETTING_VXLAN_L3_MISS">NM_SETTING_VXLAN_L3_MISS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingVxlan.html#NMSettingVxlan-struct" title="NMSettingVxlan">NMSettingVxlan</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -897,6 +901,11 @@ nm_setting_vxlan_get_l3_miss (<em class="parameter"><code><a class="link" href="
 <pre class="programlisting">#define NM_SETTING_VXLAN_L3_MISS            "l3-miss"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingVxlan-struct"></a><h3>NMSettingVxlan</h3>
+<pre class="programlisting">typedef struct _NMSettingVxlan NMSettingVxlan;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingVxlan.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index d1ea1056..132a0428 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -110,6 +110,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingWimax.html#NM-SETTING-WIMAX-MAC-ADDRESS:CAPS" title="NM_SETTING_WIMAX_MAC_ADDRESS">NM_SETTING_WIMAX_MAC_ADDRESS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingWimax.html#NMSettingWimax-struct" title="NMSettingWimax">NMSettingWimax</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -226,6 +230,11 @@ to.</p>
 <pre class="programlisting">#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingWimax-struct"></a><h3>NMSettingWimax</h3>
+<pre class="programlisting">typedef struct _NMSettingWimax NMSettingWimax;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWimax.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index ea814585..cdb857f4 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -385,12 +385,16 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN-PASSWORD:CAPS" title="NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD">NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingWired.html#NMSettingWired-struct" title="NMSettingWired">NMSettingWired</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWired.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+<pre class="screen">    GFlags
     <span class="lineart">╰──</span> NMSettingWiredWakeOnLan
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -1343,6 +1347,11 @@ are supported by all devices.</p>
 <pre class="programlisting">#define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingWired-struct"></a><h3>NMSettingWired</h3>
+<pre class="programlisting">typedef struct _NMSettingWired NMSettingWired;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWired.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index c75e3666..b9cb002e 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -417,12 +417,16 @@
 <td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="NMSettingWireless.html#NMSettingWirelessPowersave" title="enum NMSettingWirelessPowersave">NMSettingWirelessPowersave</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingWireless.html#NMSettingWireless-struct" title="NMSettingWireless">NMSettingWireless</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWireless.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMSettingWirelessPowersave
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -1335,6 +1339,11 @@ for this connection.</p>
 </table></div>
 </div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingWireless-struct"></a><h3>NMSettingWireless</h3>
+<pre class="programlisting">typedef struct _NMSettingWireless NMSettingWireless;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWireless.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 82446ce5..9e5098f2 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -474,12 +474,16 @@ use WEP, LEAP, WPA or WPA2/RSN security</p>
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" title="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS">NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWirelessSecurity.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMWepKeyType
     GObject
     <span class="lineart">╰──</span> <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
@@ -1600,6 +1604,11 @@ the actual WEP key using the MD5 hash algorithm.</p>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMSettingWirelessSecurity-struct"></a><h3>NMSettingWirelessSecurity</h3>
+<pre class="programlisting">typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingWirelessSecurity.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index d6bf39e4..b96c0029 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="ch03.html" title="Connection and Setting API Reference">
-<link rel="prev" href="libnm-NMConnection.html" title="NMConnection">
+<link rel="prev" href="NMConnection.html" title="NMConnection">
 <link rel="next" href="NMSetting.html" title="NMSetting">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -16,11 +16,12 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMSimpleConnection.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMSimpleConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+                  <a href="#NMSimpleConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMSimpleConnection.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="libnm-NMConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="NMConnection.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
 <td><a accesskey="n" href="NMSetting.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
@@ -42,7 +43,7 @@
 <tbody>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new" title="nm_simple_connection_new ()">nm_simple_connection_new</a> <span class="c_punctuation">()</span>
@@ -50,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new-from-dbus" title="nm_simple_connection_new_from_dbus ()">nm_simple_connection_new_from_dbus</a> <span class="c_punctuation">()</span>
@@ -58,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new-clone" title="nm_simple_connection_new_clone ()">nm_simple_connection_new_clone</a> <span class="c_punctuation">()</span>
@@ -68,40 +69,59 @@
 </table></div>
 </div>
 <div class="refsect1">
+<a name="NMSimpleConnection.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMSimpleConnection.html#NMSimpleConnection-struct" title="NMSimpleConnection">NMSimpleConnection</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
 <a name="NMSimpleConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    GObject
     <span class="lineart">╰──</span> NMSimpleConnection
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMSimpleConnection.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMSimpleConnection implements
+ <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>.</p>
+</div>
+<div class="refsect1">
 <a name="NMSimpleConnection.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
 <a name="NMSimpleConnection.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="nm-simple-connection-new"></a><h3>nm_simple_connection_new ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 nm_simple_connection_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Creates a new <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> object with no <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> objects. An
 <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> does not directly represent a D-Bus-exported connection,
 but might be used in the process of creating a new one.</p>
 <div class="refsect3">
-<a name="id-1.4.3.6.2.5"></a><h4>Returns</h4>
-<p> the new empty <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object. </p>
+<a name="id-1.4.3.8.2.5"></a><h4>Returns</h4>
+<p> the new empty <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="nm-simple-connection-new-from-dbus"></a><h3>nm_simple_connection_new_from_dbus ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 nm_simple_connection_new_from_dbus (<em class="parameter"><code><span class="type">GVariant</span> *dict</code></em>,
                                     <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Creates a new <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> from a hash table describing the
-connection and normalize the connection.  See <a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> for a
+connection and normalize the connection.  See <a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()"><code class="function">nm_connection_to_dbus()</code></a> for a
 description of the expected hash table.</p>
 <div class="refsect3">
-<a name="id-1.4.3.6.3.5"></a><h4>Parameters</h4>
+<a name="id-1.4.3.8.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -123,7 +143,7 @@ description of the expected hash table.</p>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.3.6.3.6"></a><h4>Returns</h4>
+<a name="id-1.4.3.8.3.6"></a><h4>Returns</h4>
 <p> the new <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a> object, populated with
 settings created from the values in the hash table, or <code class="literal">NULL</code> if the
 connection failed to normalize. </p>
@@ -133,11 +153,11 @@ connection failed to normalize. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-simple-connection-new-clone"></a><h3>nm_simple_connection_new_clone ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
-nm_simple_connection_new_clone (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
-<p>Clones an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> as an <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a>.</p>
+<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
+nm_simple_connection_new_clone (<em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+<p>Clones an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> as an <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection"><span class="type">NMSimpleConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.4.3.6.4.5"></a><h4>Parameters</h4>
+<a name="id-1.4.3.8.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -146,21 +166,25 @@ nm_simple_connection_new_clone (<em class="parameter"><code><a href="/usr/share/
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to clone</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to clone</p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.4.3.6.4.6"></a><h4>Returns</h4>
-<p> a new <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> containing the same settings
-and properties as the source <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>. </p>
+<a name="id-1.4.3.8.4.6"></a><h4>Returns</h4>
+<p> a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> containing the same settings
+and properties as the source <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
 </div>
 <div class="refsect1">
 <a name="NMSimpleConnection.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="NMSimpleConnection-struct"></a><h3>NMSimpleConnection</h3>
+<pre class="programlisting">typedef struct _NMSimpleConnection NMSimpleConnection;</pre>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index b8b766cf..3f0b93bc 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMVpnConnection.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMVpnConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMVpnConnection.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMVpnConnection.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMVpnConnection.properties" class="shortcut">Properties</a></span><span id="nav_signals">  <span class="dim">|</span> 
                   <a href="#NMVpnConnection.signals" class="shortcut">Signals</a></span>
 </td>
@@ -114,6 +115,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMVpnConnection.html#NM-VPN-CONNECTION-BANNER:CAPS" title="NM_VPN_CONNECTION_BANNER">NM_VPN_CONNECTION_BANNER</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMVpnConnection.html#NMVpnConnection-struct" title="NMVpnConnection">NMVpnConnection</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -126,6 +131,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMVpnConnection.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMVpnConnection implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMVpnConnection.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -136,7 +147,7 @@
 nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> *vpn</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> state.</p>
 <div class="refsect3">
-<a name="id-1.5.21.9.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.21.10.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -151,7 +162,7 @@ nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.21.9.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.21.10.2.6"></a><h4>Returns</h4>
 <p> the VPN state of the active VPN connection.</p>
 </div>
 </div>
@@ -162,7 +173,7 @@ nm_vpn_connection_get_vpn_state (<em class="parameter"><code><a class="link" hre
 nm_vpn_connection_get_banner (<em class="parameter"><code><a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a> *vpn</code></em>);</pre>
 <p>Gets the VPN login banner of the active <a class="link" href="NMVpnConnection.html" title="NMVpnConnection"><span class="type">NMVpnConnection</span></a>.</p>
 <div class="refsect3">
-<a name="id-1.5.21.9.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.21.10.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -177,7 +188,7 @@ nm_vpn_connection_get_banner (<em class="parameter"><code><a class="link" href="
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.21.9.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.21.10.3.6"></a><h4>Returns</h4>
 <p> the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.</p>
 </div>
@@ -196,6 +207,11 @@ string used by the connection, and must not be modified.</p>
 <pre class="programlisting">#define NM_VPN_CONNECTION_BANNER "banner"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMVpnConnection-struct"></a><h3>NMVpnConnection</h3>
+<pre class="programlisting">typedef struct _NMVpnConnection NMVpnConnection;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMVpnConnection.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index ad04d23d..1e807951 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -77,7 +77,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="NMVpnEditorPlugin.html#nm-vpn-editor-plugin-import" title="nm_vpn_editor_plugin_import ()">nm_vpn_editor_plugin_import</a> <span class="c_punctuation">()</span>
@@ -192,9 +192,9 @@
 </div>
 <div class="refsect1">
 <a name="NMVpnEditorPlugin.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+<pre class="screen">    GFlags
     <span class="lineart">╰──</span> NMVpnEditorPluginCapability
-    <a href="/usr/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+    GInterface
     <span class="lineart">├──</span> NMVpnEditor
     <span class="lineart">╰──</span> NMVpnEditorPlugin
 </pre>
@@ -226,7 +226,7 @@ nm_vpn_editor_plugin_factory (<em class="parameter"><code><span class="type">GEr
 <a name="nm-vpn-editor-plugin-get-editor"></a><h3>nm_vpn_editor_plugin_get_editor ()</h3>
 <pre class="programlisting"><a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor"><span class="returnvalue">NMVpnEditor</span></a> *
 nm_vpn_editor_plugin_get_editor (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
-                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                 <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="refsect3">
 <a name="id-1.7.3.11.4.4"></a><h4>Parameters</h4>
@@ -244,7 +244,7 @@ nm_vpn_editor_plugin_get_editor (<em class="parameter"><code><a class="link" hre
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to be edited</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to be edited</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -270,7 +270,7 @@ nm_vpn_editor_plugin_get_capabilities (<em class="parameter"><code><a class="lin
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-editor-plugin-import"></a><h3>nm_vpn_editor_plugin_import ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="returnvalue">NMConnection</span></a> *
+<pre class="programlisting"><a class="link" href="NMConnection.html" title="NMConnection"><span class="returnvalue">NMConnection</span></a> *
 nm_vpn_editor_plugin_import (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
@@ -290,7 +290,7 @@ nm_vpn_editor_plugin_import (<em class="parameter"><code><a class="link" href="N
 </tr>
 <tr>
 <td class="parameter_name"><p>path</p></td>
-<td class="parameter_description"><p>full path to the file to attempt to read into a new <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a></p></td>
+<td class="parameter_description"><p>full path to the file to attempt to read into a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -303,7 +303,7 @@ nm_vpn_editor_plugin_import (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="id-1.7.3.11.6.5"></a><h4>Returns</h4>
-<p> a new <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> imported from <em class="parameter"><code>path</code></em>
+<p> a new <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> imported from <em class="parameter"><code>path</code></em>
 , or <code class="literal">NULL</code>
 on error or if the file at <em class="parameter"><code>path</code></em>
 was not recognized by this plugin. </p>
@@ -316,7 +316,7 @@ was not recognized by this plugin. </p>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_vpn_editor_plugin_export (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
                              <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                             <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                             <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>,
                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 </div>
 <hr>
@@ -325,7 +325,7 @@ nm_vpn_editor_plugin_export (<em class="parameter"><code><a class="link" href="N
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_vpn_editor_plugin_get_suggested_filename
                                (<em class="parameter"><code><a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin"><span class="type">NMVpnEditorPlugin</span></a> *plugin</code></em>,
-                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                                <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -522,7 +522,7 @@ if non-<code class="literal">NULL</code>.</p></td>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorPluginInterface.import-from-file"></a>import_from_file</code></em> ()</p></td>
 <td class="struct_member_description"><p>Try to import a connection from the specified path.  On
-success, return a partial <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object.  On error, return <code class="literal">NULL</code> and
+success, return a partial <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object.  On error, return <code class="literal">NULL</code> and
 set <em class="parameter"><code>error</code></em>
 with additional information.  Note that <em class="parameter"><code>error</code></em>
 can be <code class="literal">NULL</code>, in
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 6e343d65..980be14e 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -16,7 +16,8 @@
 <td width="100%" align="left" class="shortcuts">
 <a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
                   <a href="#NMWimaxNsp.description" class="shortcut">Description</a></span><span id="nav_hierarchy">  <span class="dim">|</span> 
-                  <a href="#NMWimaxNsp.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_properties">  <span class="dim">|</span> 
+                  <a href="#NMWimaxNsp.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces">  <span class="dim">|</span> 
+                  <a href="#NMWimaxNsp.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties">  <span class="dim">|</span> 
                   <a href="#NMWimaxNsp.properties" class="shortcut">Properties</a></span>
 </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
@@ -131,6 +132,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS" title="NM_WIMAX_NSP_NETWORK_TYPE">NM_WIMAX_NSP_NETWORK_TYPE</a></td>
 </tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="NMWimaxNsp.html#NMWimaxNsp-struct" title="NMWimaxNsp">NMWimaxNsp</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -142,6 +147,12 @@
 </pre>
 </div>
 <div class="refsect1">
+<a name="NMWimaxNsp.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
+<p>
+NMWimaxNsp implements
+ GInitable and  GAsyncInitable.</p>
+</div>
+<div class="refsect1">
 <a name="NMWimaxNsp.description"></a><h2>Description</h2>
 </div>
 <div class="refsect1">
@@ -152,7 +163,7 @@
 nm_wimax_nsp_get_name (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
 <p>Gets the name of the wimax NSP</p>
 <div class="refsect3">
-<a name="id-1.5.24.8.2.5"></a><h4>Parameters</h4>
+<a name="id-1.5.24.9.2.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -167,7 +178,7 @@ nm_wimax_nsp_get_name (<em class="parameter"><code><a class="link" href="NMWimax
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.24.8.2.6"></a><h4>Returns</h4>
+<a name="id-1.5.24.9.2.6"></a><h4>Returns</h4>
 <p> the name</p>
 </div>
 </div>
@@ -178,7 +189,7 @@ nm_wimax_nsp_get_name (<em class="parameter"><code><a class="link" href="NMWimax
 nm_wimax_nsp_get_signal_quality (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
 <p>Gets the WPA signal quality of the wimax NSP.</p>
 <div class="refsect3">
-<a name="id-1.5.24.8.3.5"></a><h4>Parameters</h4>
+<a name="id-1.5.24.9.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -193,7 +204,7 @@ nm_wimax_nsp_get_signal_quality (<em class="parameter"><code><a class="link" hre
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.24.8.3.6"></a><h4>Returns</h4>
+<a name="id-1.5.24.9.3.6"></a><h4>Returns</h4>
 <p> the signal quality</p>
 </div>
 </div>
@@ -204,7 +215,7 @@ nm_wimax_nsp_get_signal_quality (<em class="parameter"><code><a class="link" hre
 nm_wimax_nsp_get_network_type (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>);</pre>
 <p>Gets the network type of the wimax NSP.</p>
 <div class="refsect3">
-<a name="id-1.5.24.8.4.5"></a><h4>Parameters</h4>
+<a name="id-1.5.24.9.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -219,7 +230,7 @@ nm_wimax_nsp_get_network_type (<em class="parameter"><code><a class="link" href=
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.24.8.4.6"></a><h4>Returns</h4>
+<a name="id-1.5.24.9.4.6"></a><h4>Returns</h4>
 <p> the network type</p>
 </div>
 </div>
@@ -234,7 +245,7 @@ return connections which may be activated with the NSP.  Any returned
 connections will match the <em class="parameter"><code>nsp</code></em>
 's network name and other attributes.</p>
 <div class="refsect3">
-<a name="id-1.5.24.8.5.5"></a><h4>Parameters</h4>
+<a name="id-1.5.24.9.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -249,7 +260,7 @@ connections will match the <em class="parameter"><code>nsp</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
-<td class="parameter_description"><p> an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> to
+<td class="parameter_description"><p> an array of <a href="NMConnection.html"><span class="type">NMConnections</span></a> to
 filter. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></td>
 </tr>
@@ -257,9 +268,9 @@ filter. </p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.24.8.5.6"></a><h4>Returns</h4>
+<a name="id-1.5.24.9.5.6"></a><h4>Returns</h4>
 <p> an array of
-<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>nsp</code></em>
+<a href="NMConnection.html"><span class="type">NMConnections</span></a> that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .  The array should
 be freed with <code class="function">g_ptr_array_unref()</code> when it is no longer required. </p>
 <p><span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMConnection]</span></p>
@@ -270,13 +281,13 @@ be freed with <code class="function">g_ptr_array_unref()</code> when it is no lo
 <a name="nm-wimax-nsp-connection-valid"></a><h3>nm_wimax_nsp_connection_valid ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>
 nm_wimax_nsp_connection_valid (<em class="parameter"><code><a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp"><span class="type">NMWimaxNsp</span></a> *nsp</code></em>,
-                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
+                               <em class="parameter"><code><a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 <p>Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 <em class="parameter"><code>nsp</code></em>
 's network name and other attributes.</p>
 <div class="refsect3">
-<a name="id-1.5.24.8.6.5"></a><h4>Parameters</h4>
+<a name="id-1.5.24.9.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
 <colgroup>
 <col width="150px" class="parameters_name">
@@ -292,7 +303,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
+<td class="parameter_description"><p>an <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -300,7 +311,7 @@ against</p></td>
 </table></div>
 </div>
 <div class="refsect3">
-<a name="id-1.5.24.8.6.6"></a><h4>Returns</h4>
+<a name="id-1.5.24.9.6.6"></a><h4>Returns</h4>
 <p> <code class="literal">TRUE</code> if the connection may be activated with this WiMAX NSP,
 <code class="literal">FALSE</code> if it cannot be.</p>
 </div>
@@ -325,6 +336,11 @@ against</p></td>
 <pre class="programlisting">#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NMWimaxNsp-struct"></a><h3>NMWimaxNsp</h3>
+<pre class="programlisting">typedef struct _NMWimaxNsp NMWimaxNsp;</pre>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMWimaxNsp.property-details"></a><h2>Property Details</h2>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 8e4f01ca..277b9132 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -63,47 +63,51 @@
 <dd></dd>
 <a name="idxA"></a><h3 class="title">A</h3>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--bssid" title="The “bssid†property">NMAccessPoint:bssid</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint-struct" title="NMAccessPoint">NMAccessPoint</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--flags" title="The “flags†property">NMAccessPoint:flags</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--bssid" title="The “bssid†property">NMAccessPoint:bssid</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--frequency" title="The “frequency†property">NMAccessPoint:frequency</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--flags" title="The “flags†property">NMAccessPoint:flags</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--hw-address" title="The “hw-address†property">NMAccessPoint:hw-address</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--frequency" title="The “frequency†property">NMAccessPoint:frequency</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--last-seen" title="The “last-seen†property">NMAccessPoint:last-seen</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--hw-address" title="The “hw-address†property">NMAccessPoint:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--max-bitrate" title="The “max-bitrate†property">NMAccessPoint:max-bitrate</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--last-seen" title="The “last-seen†property">NMAccessPoint:last-seen</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--mode" title="The “mode†property">NMAccessPoint:mode</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--max-bitrate" title="The “max-bitrate†property">NMAccessPoint:max-bitrate</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--rsn-flags" title="The “rsn-flags†property">NMAccessPoint:rsn-flags</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--mode" title="The “mode†property">NMAccessPoint:mode</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--ssid" title="The “ssid†property">NMAccessPoint:ssid</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--rsn-flags" title="The “rsn-flags†property">NMAccessPoint:rsn-flags</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--strength" title="The “strength†property">NMAccessPoint:strength</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--ssid" title="The “ssid†property">NMAccessPoint:ssid</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMAccessPoint.html#NMAccessPoint--wpa-flags" title="The “wpa-flags†property">NMAccessPoint:wpa-flags</a>, object property in <a class="link" href="NMAccessPoint.html" title="NMAccessPoint">NMAccessPoint</a>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--strength" title="The “strength†property">NMAccessPoint:strength</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMAccessPoint.html#NMAccessPoint--wpa-flags" title="The “wpa-flags†property">NMAccessPoint:wpa-flags</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -199,63 +203,67 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--connection" title="The “connection†property">NMActiveConnection:connection</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection-struct" title="NMActiveConnection">NMActiveConnection</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--connection" title="The “connection†property">NMActiveConnection:connection</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--default" title="The “default†property">NMActiveConnection:default</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--default" title="The “default†property">NMActiveConnection:default</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--default6" title="The “default6†property">NMActiveConnection:default6</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--default6" title="The “default6†property">NMActiveConnection:default6</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--devices" title="The “devices†property">NMActiveConnection:devices</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--devices" title="The “devices†property">NMActiveConnection:devices</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--dhcp4-config" title="The “dhcp4-config†property">NMActiveConnection:dhcp4-config</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--dhcp4-config" title="The “dhcp4-config†property">NMActiveConnection:dhcp4-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--dhcp6-config" title="The “dhcp6-config†property">NMActiveConnection:dhcp6-config</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--dhcp6-config" title="The “dhcp6-config†property">NMActiveConnection:dhcp6-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--id" title="The “id†property">NMActiveConnection:id</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--id" title="The “id†property">NMActiveConnection:id</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--ip4-config" title="The “ip4-config†property">NMActiveConnection:ip4-config</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--ip4-config" title="The “ip4-config†property">NMActiveConnection:ip4-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--ip6-config" title="The “ip6-config†property">NMActiveConnection:ip6-config</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--ip6-config" title="The “ip6-config†property">NMActiveConnection:ip6-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--master" title="The “master†property">NMActiveConnection:master</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--master" title="The “master†property">NMActiveConnection:master</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--specific-object-path" title="The “specific-object-path†property">NMActiveConnection:specific-object-path</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--specific-object-path" title="The “specific-object-path†property">NMActiveConnection:specific-object-path</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--state" title="The “state†property">NMActiveConnection:state</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--state" title="The “state†property">NMActiveConnection:state</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--type" title="The “type†property">NMActiveConnection:type</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--type" title="The “type†property">NMActiveConnection:type</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--uuid" title="The “uuid†property">NMActiveConnection:uuid</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--uuid" title="The “uuid†property">NMActiveConnection:uuid</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMActiveConnection.html#NMActiveConnection--vpn" title="The “vpn†property">NMActiveConnection:vpn</a>, object property in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
+<a class="link" href="NMActiveConnection.html#NMActiveConnection--vpn" title="The “vpn†property">NMActiveConnection:vpn</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -417,115 +425,119 @@
 <dd></dd>
 <a name="idxC"></a><h3 class="title">C</h3>
 <dt>
-<a class="link" href="NMClient.html#NMClient-any-device-added" title="The “any-device-added†signal">NMClient::any-device-added</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-struct" title="NMClient">NMClient</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient-any-device-removed" title="The “any-device-removed†signal">NMClient::any-device-removed</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-any-device-added" title="The “any-device-added†signal">NMClient::any-device-added</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient-connection-added" title="The “connection-added†signal">NMClient::connection-added</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-any-device-removed" title="The “any-device-removed†signal">NMClient::any-device-removed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient-connection-removed" title="The “connection-removed†signal">NMClient::connection-removed</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-connection-added" title="The “connection-added†signal">NMClient::connection-added</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient-device-added" title="The “device-added†signal">NMClient::device-added</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-connection-removed" title="The “connection-removed†signal">NMClient::connection-removed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient-device-removed" title="The “device-removed†signal">NMClient::device-removed</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-device-added" title="The “device-added†signal">NMClient::device-added</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient-permission-changed" title="The “permission-changed†signal">NMClient::permission-changed</a>, object signal in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-device-removed" title="The “device-removed†signal">NMClient::device-removed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--activating-connection" title="The “activating-connection†property">NMClient:activating-connection</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient-permission-changed" title="The “permission-changed†signal">NMClient::permission-changed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--active-connections" title="The “active-connections†property">NMClient:active-connections</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--activating-connection" title="The “activating-connection†property">NMClient:activating-connection</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--all-devices" title="The “all-devices†property">NMClient:all-devices</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--active-connections" title="The “active-connections†property">NMClient:active-connections</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--can-modify" title="The “can-modify†property">NMClient:can-modify</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--all-devices" title="The “all-devices†property">NMClient:all-devices</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--connections" title="The “connections†property">NMClient:connections</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--can-modify" title="The “can-modify†property">NMClient:can-modify</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--connectivity" title="The “connectivity†property">NMClient:connectivity</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--connections" title="The “connections†property">NMClient:connections</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--devices" title="The “devices†property">NMClient:devices</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--connectivity" title="The “connectivity†property">NMClient:connectivity</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--hostname" title="The “hostname†property">NMClient:hostname</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--devices" title="The “devices†property">NMClient:devices</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--metered" title="The “metered†property">NMClient:metered</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--hostname" title="The “hostname†property">NMClient:hostname</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--networking-enabled" title="The “networking-enabled†property">NMClient:networking-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--metered" title="The “metered†property">NMClient:metered</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--nm-running" title="The “nm-running†property">NMClient:nm-running</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--networking-enabled" title="The “networking-enabled†property">NMClient:networking-enabled</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--primary-connection" title="The “primary-connection†property">NMClient:primary-connection</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--nm-running" title="The “nm-running†property">NMClient:nm-running</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--startup" title="The “startup†property">NMClient:startup</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--primary-connection" title="The “primary-connection†property">NMClient:primary-connection</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--state" title="The “state†property">NMClient:state</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--startup" title="The “startup†property">NMClient:startup</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--version" title="The “version†property">NMClient:version</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--state" title="The “state†property">NMClient:state</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--wimax-enabled" title="The “wimax-enabled†property">NMClient:wimax-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--version" title="The “version†property">NMClient:version</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--wimax-hardware-enabled" title="The “wimax-hardware-enabled†property">NMClient:wimax-hardware-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--wimax-enabled" title="The “wimax-enabled†property">NMClient:wimax-enabled</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--wireless-enabled" title="The “wireless-enabled†property">NMClient:wireless-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--wimax-hardware-enabled" title="The “wimax-hardware-enabled†property">NMClient:wimax-hardware-enabled</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--wireless-hardware-enabled" title="The “wireless-hardware-enabled†property">NMClient:wireless-hardware-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--wireless-enabled" title="The “wireless-enabled†property">NMClient:wireless-enabled</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--wwan-enabled" title="The “wwan-enabled†property">NMClient:wwan-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--wireless-hardware-enabled" title="The “wireless-hardware-enabled†property">NMClient:wireless-hardware-enabled</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMClient.html#NMClient--wwan-hardware-enabled" title="The “wwan-hardware-enabled†property">NMClient:wwan-hardware-enabled</a>, object property in <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
+<a class="link" href="NMClient.html#NMClient--wwan-enabled" title="The “wwan-enabled†property">NMClient:wwan-enabled</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMClient.html#NMClient--wwan-hardware-enabled" title="The “wwan-hardware-enabled†property">NMClient:wwan-hardware-enabled</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -877,47 +889,63 @@
 </dt>
 <dd></dd>
 <dt>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>, struct in nm-core-types
+</dt>
+<dd></dd>
+<dt>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-changed">NMConnection::changed</a>, object signal in nm-core-types
+</dt>
+<dd></dd>
+<dt>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-cleared">NMConnection::secrets-cleared</a>, object signal in nm-core-types
+</dt>
+<dd></dd>
+<dt>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-updated">NMConnection::secrets-updated</a>, object signal in nm-core-types
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-errors.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>, enum in <a class="link" href="libnm-nm-errors.html" title="nm-errors">nm-errors</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NMConnectionInterface" title="NMConnectionInterface">NMConnectionInterface</a>, struct in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NMConnectionInterface" title="NMConnectionInterface">NMConnectionInterface</a>, struct in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a>, enum in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a>, enum in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-add-setting" title="nm_connection_add_setting ()">nm_connection_add_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NM-CONNECTION-CHANGED:CAPS" title="NM_CONNECTION_CHANGED">NM_CONNECTION_CHANGED</a>, macro in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NM-CONNECTION-CHANGED:CAPS" title="NM_CONNECTION_CHANGED">NM_CONNECTION_CHANGED</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-clear-secrets" title="nm_connection_clear_secrets ()">nm_connection_clear_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()">nm_connection_clear_secrets_with_flags</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-clear-secrets-with-flags" title="nm_connection_clear_secrets_with_flags ()">nm_connection_clear_secrets_with_flags</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-clear-settings" title="nm_connection_clear_settings ()">nm_connection_clear_settings</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-clear-settings" title="nm_connection_clear_settings ()">nm_connection_clear_settings</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-compare" title="nm_connection_compare ()">nm_connection_compare</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-diff" title="nm_connection_diff ()">nm_connection_diff</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-dump" title="nm_connection_dump ()">nm_connection_dump</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -929,219 +957,219 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-for-each-setting-value" title="nm_connection_for_each_setting_value ()">nm_connection_for_each_setting_value</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-connection-type" title="nm_connection_get_connection_type ()">nm_connection_get_connection_type</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-connection-type" title="nm_connection_get_connection_type ()">nm_connection_get_connection_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-id" title="nm_connection_get_id ()">nm_connection_get_id</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-id" title="nm_connection_get_id ()">nm_connection_get_id</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-interface-name" title="nm_connection_get_interface_name ()">nm_connection_get_interface_name</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-interface-name" title="nm_connection_get_interface_name ()">nm_connection_get_interface_name</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-path" title="nm_connection_get_path ()">nm_connection_get_path</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting" title="nm_connection_get_setting ()">nm_connection_get_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-802-1x" title="nm_connection_get_setting_802_1x ()">nm_connection_get_setting_802_1x</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-802-1x" title="nm_connection_get_setting_802_1x ()">nm_connection_get_setting_802_1x</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-adsl" title="nm_connection_get_setting_adsl ()">nm_connection_get_setting_adsl</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-adsl" title="nm_connection_get_setting_adsl ()">nm_connection_get_setting_adsl</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bluetooth" title="nm_connection_get_setting_bluetooth ()">nm_connection_get_setting_bluetooth</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bluetooth" title="nm_connection_get_setting_bluetooth ()">nm_connection_get_setting_bluetooth</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bond" title="nm_connection_get_setting_bond ()">nm_connection_get_setting_bond</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bond" title="nm_connection_get_setting_bond ()">nm_connection_get_setting_bond</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bridge" title="nm_connection_get_setting_bridge ()">nm_connection_get_setting_bridge</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bridge" title="nm_connection_get_setting_bridge ()">nm_connection_get_setting_bridge</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-bridge-port" title="nm_connection_get_setting_bridge_port ()">nm_connection_get_setting_bridge_port</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-bridge-port" title="nm_connection_get_setting_bridge_port ()">nm_connection_get_setting_bridge_port</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-by-name" title="nm_connection_get_setting_by_name ()">nm_connection_get_setting_by_name</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-cdma" title="nm_connection_get_setting_cdma ()">nm_connection_get_setting_cdma</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-cdma" title="nm_connection_get_setting_cdma ()">nm_connection_get_setting_cdma</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-connection" title="nm_connection_get_setting_connection ()">nm_connection_get_setting_connection</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-connection" title="nm_connection_get_setting_connection ()">nm_connection_get_setting_connection</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-dcb" title="nm_connection_get_setting_dcb ()">nm_connection_get_setting_dcb</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-dcb" title="nm_connection_get_setting_dcb ()">nm_connection_get_setting_dcb</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-generic" title="nm_connection_get_setting_generic ()">nm_connection_get_setting_generic</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-generic" title="nm_connection_get_setting_generic ()">nm_connection_get_setting_generic</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-gsm" title="nm_connection_get_setting_gsm ()">nm_connection_get_setting_gsm</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-gsm" title="nm_connection_get_setting_gsm ()">nm_connection_get_setting_gsm</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-infiniband" title="nm_connection_get_setting_infiniband ()">nm_connection_get_setting_infiniband</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-infiniband" title="nm_connection_get_setting_infiniband ()">nm_connection_get_setting_infiniband</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ip4-config" title="nm_connection_get_setting_ip4_config ()">nm_connection_get_setting_ip4_config</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ip4-config" title="nm_connection_get_setting_ip4_config ()">nm_connection_get_setting_ip4_config</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ip6-config" title="nm_connection_get_setting_ip6_config ()">nm_connection_get_setting_ip6_config</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ip6-config" title="nm_connection_get_setting_ip6_config ()">nm_connection_get_setting_ip6_config</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ip-tunnel" title="nm_connection_get_setting_ip_tunnel ()">nm_connection_get_setting_ip_tunnel</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ip-tunnel" title="nm_connection_get_setting_ip_tunnel ()">nm_connection_get_setting_ip_tunnel</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-macvlan" title="nm_connection_get_setting_macvlan ()">nm_connection_get_setting_macvlan</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-macvlan" title="nm_connection_get_setting_macvlan ()">nm_connection_get_setting_macvlan</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-olpc-mesh" title="nm_connection_get_setting_olpc_mesh ()">nm_connection_get_setting_olpc_mesh</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-olpc-mesh" title="nm_connection_get_setting_olpc_mesh ()">nm_connection_get_setting_olpc_mesh</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-ppp" title="nm_connection_get_setting_ppp ()">nm_connection_get_setting_ppp</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-ppp" title="nm_connection_get_setting_ppp ()">nm_connection_get_setting_ppp</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-pppoe" title="nm_connection_get_setting_pppoe ()">nm_connection_get_setting_pppoe</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-pppoe" title="nm_connection_get_setting_pppoe ()">nm_connection_get_setting_pppoe</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-serial" title="nm_connection_get_setting_serial ()">nm_connection_get_setting_serial</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-serial" title="nm_connection_get_setting_serial ()">nm_connection_get_setting_serial</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-team" title="nm_connection_get_setting_team ()">nm_connection_get_setting_team</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-team" title="nm_connection_get_setting_team ()">nm_connection_get_setting_team</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-team-port" title="nm_connection_get_setting_team_port ()">nm_connection_get_setting_team_port</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-team-port" title="nm_connection_get_setting_team_port ()">nm_connection_get_setting_team_port</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-tun" title="nm_connection_get_setting_tun ()">nm_connection_get_setting_tun</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-tun" title="nm_connection_get_setting_tun ()">nm_connection_get_setting_tun</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-vlan" title="nm_connection_get_setting_vlan ()">nm_connection_get_setting_vlan</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-vlan" title="nm_connection_get_setting_vlan ()">nm_connection_get_setting_vlan</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-vpn" title="nm_connection_get_setting_vpn ()">nm_connection_get_setting_vpn</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-vpn" title="nm_connection_get_setting_vpn ()">nm_connection_get_setting_vpn</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-vxlan" title="nm_connection_get_setting_vxlan ()">nm_connection_get_setting_vxlan</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-vxlan" title="nm_connection_get_setting_vxlan ()">nm_connection_get_setting_vxlan</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wimax" title="nm_connection_get_setting_wimax ()">nm_connection_get_setting_wimax</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wimax" title="nm_connection_get_setting_wimax ()">nm_connection_get_setting_wimax</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wired" title="nm_connection_get_setting_wired ()">nm_connection_get_setting_wired</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wired" title="nm_connection_get_setting_wired ()">nm_connection_get_setting_wired</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wireless" title="nm_connection_get_setting_wireless ()">nm_connection_get_setting_wireless</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wireless" title="nm_connection_get_setting_wireless ()">nm_connection_get_setting_wireless</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-setting-wireless-security" title="nm_connection_get_setting_wireless_security ()">nm_connection_get_setting_wireless_security</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-setting-wireless-security" title="nm_connection_get_setting_wireless_security ()">nm_connection_get_setting_wireless_security</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-uuid" title="nm_connection_get_uuid ()">nm_connection_get_uuid</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-uuid" title="nm_connection_get_uuid ()">nm_connection_get_uuid</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-get-virtual-device-description" title="nm_connection_get_virtual_device_description ()">nm_connection_get_virtual_device_description</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-get-virtual-device-description" title="nm_connection_get_virtual_device_description ()">nm_connection_get_virtual_device_description</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-is-type" title="nm_connection_is_type ()">nm_connection_is_type</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-is-type" title="nm_connection_is_type ()">nm_connection_is_type</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-is-virtual" title="nm_connection_is_virtual ()">nm_connection_is_virtual</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-is-virtual" title="nm_connection_is_virtual ()">nm_connection_is_virtual</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-need-secrets" title="nm_connection_need_secrets ()">nm_connection_need_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-normalize" title="nm_connection_normalize ()">nm_connection_normalize</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-normalize" title="nm_connection_normalize ()">nm_connection_normalize</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" title="NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD">NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD</a>, macro in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" title="NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD">NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-remove-setting" title="nm_connection_remove_setting ()">nm_connection_remove_setting</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-replace-settings" title="nm_connection_replace_settings ()">nm_connection_replace_settings</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-replace-settings-from-connection" title="nm_connection_replace_settings_from_connection ()">nm_connection_replace_settings_from_connection</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-replace-settings-from-connection" title="nm_connection_replace_settings_from_connection ()">nm_connection_replace_settings_from_connection</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS" title="NM_CONNECTION_SECRETS_CLEARED">NM_CONNECTION_SECRETS_CLEARED</a>, macro in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS" title="NM_CONNECTION_SECRETS_CLEARED">NM_CONNECTION_SECRETS_CLEARED</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS" title="NM_CONNECTION_SECRETS_UPDATED">NM_CONNECTION_SECRETS_UPDATED</a>, macro in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS" title="NM_CONNECTION_SECRETS_UPDATED">NM_CONNECTION_SECRETS_UPDATED</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-set-path" title="nm_connection_set_path ()">nm_connection_set_path</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()">nm_connection_to_dbus</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm_connection_to_dbus ()">nm_connection_to_dbus</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-update-secrets" title="nm_connection_update_secrets ()">nm_connection_update_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-verify" title="nm_connection_verify ()">nm_connection_verify</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libnm-NMConnection.html#nm-connection-verify-secrets" title="nm_connection_verify_secrets ()">nm_connection_verify_secrets</a>, function in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#nm-connection-verify-secrets" title="nm_connection_verify_secrets ()">nm_connection_verify_secrets</a>, function in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1450,155 +1478,175 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice-state-changed" title="The “state-changed†signal">NMDevice::state-changed</a>, object signal in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice-struct" title="NMDevice">NMDevice</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDevice.html#NMDevice-state-changed" title="The “state-changed†signal">NMDevice::state-changed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--active-connection" title="The “active-connection†property">NMDevice:active-connection</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--active-connection" title="The “active-connection†property">NMDevice:active-connection</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--autoconnect" title="The “autoconnect†property">NMDevice:autoconnect</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--autoconnect" title="The “autoconnect†property">NMDevice:autoconnect</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--available-connections" title="The “available-connections†property">NMDevice:available-connections</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--available-connections" title="The “available-connections†property">NMDevice:available-connections</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--capabilities" title="The “capabilities†property">NMDevice:capabilities</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--capabilities" title="The “capabilities†property">NMDevice:capabilities</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--device-type" title="The “device-type†property">NMDevice:device-type</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--device-type" title="The “device-type†property">NMDevice:device-type</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--dhcp4-config" title="The “dhcp4-config†property">NMDevice:dhcp4-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--dhcp4-config" title="The “dhcp4-config†property">NMDevice:dhcp4-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--dhcp6-config" title="The “dhcp6-config†property">NMDevice:dhcp6-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--dhcp6-config" title="The “dhcp6-config†property">NMDevice:dhcp6-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--driver" title="The “driver†property">NMDevice:driver</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--driver" title="The “driver†property">NMDevice:driver</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--driver-version" title="The “driver-version†property">NMDevice:driver-version</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--driver-version" title="The “driver-version†property">NMDevice:driver-version</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--firmware-missing" title="The “firmware-missing†property">NMDevice:firmware-missing</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--firmware-missing" title="The “firmware-missing†property">NMDevice:firmware-missing</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--firmware-version" title="The “firmware-version†property">NMDevice:firmware-version</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--firmware-version" title="The “firmware-version†property">NMDevice:firmware-version</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--interface" title="The “interface†property">NMDevice:interface</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--interface" title="The “interface†property">NMDevice:interface</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--ip-interface" title="The “ip-interface†property">NMDevice:ip-interface</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--ip-interface" title="The “ip-interface†property">NMDevice:ip-interface</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--ip4-config" title="The “ip4-config†property">NMDevice:ip4-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--ip4-config" title="The “ip4-config†property">NMDevice:ip4-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--ip6-config" title="The “ip6-config†property">NMDevice:ip6-config</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--ip6-config" title="The “ip6-config†property">NMDevice:ip6-config</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--lldp-neighbors" title="The “lldp-neighbors†property">NMDevice:lldp-neighbors</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--lldp-neighbors" title="The “lldp-neighbors†property">NMDevice:lldp-neighbors</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--managed" title="The “managed†property">NMDevice:managed</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--managed" title="The “managed†property">NMDevice:managed</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--metered" title="The “metered†property">NMDevice:metered</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--metered" title="The “metered†property">NMDevice:metered</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--mtu" title="The “mtu†property">NMDevice:mtu</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--mtu" title="The “mtu†property">NMDevice:mtu</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--nm-plugin-missing" title="The “nm-plugin-missing†property">NMDevice:nm-plugin-missing</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--nm-plugin-missing" title="The “nm-plugin-missing†property">NMDevice:nm-plugin-missing</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--physical-port-id" title="The “physical-port-id†property">NMDevice:physical-port-id</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--physical-port-id" title="The “physical-port-id†property">NMDevice:physical-port-id</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--product" title="The “product†property">NMDevice:product</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--product" title="The “product†property">NMDevice:product</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--real" title="The “real†property">NMDevice:real</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--real" title="The “real†property">NMDevice:real</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--state" title="The “state†property">NMDevice:state</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--state" title="The “state†property">NMDevice:state</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--state-reason" title="The “state-reason†property">NMDevice:state-reason</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--state-reason" title="The “state-reason†property">NMDevice:state-reason</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--udi" title="The “udi†property">NMDevice:udi</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--udi" title="The “udi†property">NMDevice:udi</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDevice.html#NMDevice--vendor" title="The “vendor†property">NMDevice:vendor</a>, object property in <a class="link" href="NMDevice.html" title="NMDevice">NMDevice</a>
+<a class="link" href="NMDevice.html#NMDevice--vendor" title="The “vendor†property">NMDevice:vendor</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl--carrier" title="The “carrier†property">NMDeviceAdsl:carrier</a>, object property in <a class="link" href="NMDeviceAdsl.html" title="NMDeviceAdsl">NMDeviceAdsl</a>
+<a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl-struct" title="NMDeviceAdsl">NMDeviceAdsl</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBond.html#NMDeviceBond--carrier" title="The “carrier†property">NMDeviceBond:carrier</a>, object property in <a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a>
+<a class="link" href="NMDeviceAdsl.html#NMDeviceAdsl--carrier" title="The “carrier†property">NMDeviceAdsl:carrier</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBond.html#NMDeviceBond--hw-address" title="The “hw-address†property">NMDeviceBond:hw-address</a>, object property in <a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a>
+<a class="link" href="NMDeviceBond.html#NMDeviceBond-struct" title="NMDeviceBond">NMDeviceBond</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBond.html#NMDeviceBond--slaves" title="The “slaves†property">NMDeviceBond:slaves</a>, object property in <a class="link" href="NMDeviceBond.html" title="NMDeviceBond">NMDeviceBond</a>
+<a class="link" href="NMDeviceBond.html#NMDeviceBond--carrier" title="The “carrier†property">NMDeviceBond:carrier</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBridge.html#NMDeviceBridge--carrier" title="The “carrier†property">NMDeviceBridge:carrier</a>, object property in <a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge">NMDeviceBridge</a>
+<a class="link" href="NMDeviceBond.html#NMDeviceBond--hw-address" title="The “hw-address†property">NMDeviceBond:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBridge.html#NMDeviceBridge--hw-address" title="The “hw-address†property">NMDeviceBridge:hw-address</a>, object property in <a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge">NMDeviceBridge</a>
+<a class="link" href="NMDeviceBond.html#NMDeviceBond--slaves" title="The “slaves†property">NMDeviceBond:slaves</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBridge.html#NMDeviceBridge--slaves" title="The “slaves†property">NMDeviceBridge:slaves</a>, object property in <a class="link" href="NMDeviceBridge.html" title="NMDeviceBridge">NMDeviceBridge</a>
+<a class="link" href="NMDeviceBridge.html#NMDeviceBridge-struct" title="NMDeviceBridge">NMDeviceBridge</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBt.html#NMDeviceBt--bt-capabilities" title="The “bt-capabilities†property">NMDeviceBt:bt-capabilities</a>, object property in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+<a class="link" href="NMDeviceBridge.html#NMDeviceBridge--carrier" title="The “carrier†property">NMDeviceBridge:carrier</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBt.html#NMDeviceBt--hw-address" title="The “hw-address†property">NMDeviceBt:hw-address</a>, object property in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+<a class="link" href="NMDeviceBridge.html#NMDeviceBridge--hw-address" title="The “hw-address†property">NMDeviceBridge:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceBt.html#NMDeviceBt--name" title="The “name†property">NMDeviceBt:name</a>, object property in <a class="link" href="NMDeviceBt.html" title="NMDeviceBt">NMDeviceBt</a>
+<a class="link" href="NMDeviceBridge.html#NMDeviceBridge--slaves" title="The “slaves†property">NMDeviceBridge:slaves</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt-struct" title="NMDeviceBt">NMDeviceBt</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt--bt-capabilities" title="The “bt-capabilities†property">NMDeviceBt:bt-capabilities</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt--hw-address" title="The “hw-address†property">NMDeviceBt:hw-address</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceBt.html#NMDeviceBt--name" title="The “name†property">NMDeviceBt:name</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -1610,111 +1658,135 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--carrier" title="The “carrier†property">NMDeviceEthernet:carrier</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet-struct" title="NMDeviceEthernet">NMDeviceEthernet</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--carrier" title="The “carrier†property">NMDeviceEthernet:carrier</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--hw-address" title="The “hw-address†property">NMDeviceEthernet:hw-address</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--perm-hw-address" title="The “perm-hw-address†property">NMDeviceEthernet:perm-hw-address</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--s390-subchannels" title="The “s390-subchannels†property">NMDeviceEthernet:s390-subchannels</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--hw-address" title="The “hw-address†property">NMDeviceEthernet:hw-address</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--speed" title="The “speed†property">NMDeviceEthernet:speed</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--perm-hw-address" title="The “perm-hw-address†property">NMDeviceEthernet:perm-hw-address</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+<a class="link" href="NMDeviceGeneric.html#NMDeviceGeneric-struct" title="NMDeviceGeneric">NMDeviceGeneric</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--s390-subchannels" title="The “s390-subchannels†property">NMDeviceEthernet:s390-subchannels</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+<a class="link" href="NMDeviceGeneric.html#NMDeviceGeneric--hw-address" title="The “hw-address†property">NMDeviceGeneric:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceEthernet.html#NMDeviceEthernet--speed" title="The “speed†property">NMDeviceEthernet:speed</a>, object property in <a class="link" href="NMDeviceEthernet.html" title="NMDeviceEthernet">NMDeviceEthernet</a>
+<a class="link" href="NMDeviceGeneric.html#NMDeviceGeneric--type-description" title="The “type-description†property">NMDeviceGeneric:type-description</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceGeneric.html#NMDeviceGeneric--hw-address" title="The “hw-address†property">NMDeviceGeneric:hw-address</a>, object property in <a class="link" href="NMDeviceGeneric.html" title="NMDeviceGeneric">NMDeviceGeneric</a>
+<a class="link" href="NMDeviceInfiniband.html#NMDeviceInfiniband-struct" title="NMDeviceInfiniband">NMDeviceInfiniband</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceGeneric.html#NMDeviceGeneric--type-description" title="The “type-description†property">NMDeviceGeneric:type-description</a>, object property in <a class="link" href="NMDeviceGeneric.html" title="NMDeviceGeneric">NMDeviceGeneric</a>
+<a class="link" href="NMDeviceInfiniband.html#NMDeviceInfiniband--carrier" title="The “carrier†property">NMDeviceInfiniband:carrier</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceInfiniband.html#NMDeviceInfiniband--carrier" title="The “carrier†property">NMDeviceInfiniband:carrier</a>, object property in <a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">NMDeviceInfiniband</a>
+<a class="link" href="NMDeviceInfiniband.html#NMDeviceInfiniband--hw-address" title="The “hw-address†property">NMDeviceInfiniband:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceInfiniband.html#NMDeviceInfiniband--hw-address" title="The “hw-address†property">NMDeviceInfiniband:hw-address</a>, object property in <a class="link" href="NMDeviceInfiniband.html" title="NMDeviceInfiniband">NMDeviceInfiniband</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--encapsulation-limit" title="The “encapsulation-limit†property">NMDeviceIPTunnel:encapsulation-limit</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--encapsulation-limit" title="The “encapsulation-limit†property">NMDeviceIPTunnel:encapsulation-limit</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label" title="The “flow-label†property">NMDeviceIPTunnel:flow-label</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label" title="The “flow-label†property">NMDeviceIPTunnel:flow-label</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--input-key" title="The “input-key†property">NMDeviceIPTunnel:input-key</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--input-key" title="The “input-key†property">NMDeviceIPTunnel:input-key</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--local" title="The “local†property">NMDeviceIPTunnel:local</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--local" title="The “local†property">NMDeviceIPTunnel:local</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--mode" title="The “mode†property">NMDeviceIPTunnel:mode</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--mode" title="The “mode†property">NMDeviceIPTunnel:mode</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--output-key" title="The “output-key†property">NMDeviceIPTunnel:output-key</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--output-key" title="The “output-key†property">NMDeviceIPTunnel:output-key</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--parent" title="The “parent†property">NMDeviceIPTunnel:parent</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--parent" title="The “parent†property">NMDeviceIPTunnel:parent</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--path-mtu-discovery" title="The “path-mtu-discovery†property">NMDeviceIPTunnel:path-mtu-discovery</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--path-mtu-discovery" title="The “path-mtu-discovery†property">NMDeviceIPTunnel:path-mtu-discovery</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--remote" title="The “remote†property">NMDeviceIPTunnel:remote</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--remote" title="The “remote†property">NMDeviceIPTunnel:remote</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--tos" title="The “tos†property">NMDeviceIPTunnel:tos</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--tos" title="The “tos†property">NMDeviceIPTunnel:tos</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--ttl" title="The “ttl†property">NMDeviceIPTunnel:ttl</a>, object property in <a class="link" href="NMDeviceIPTunnel.html" title="NMDeviceIPTunnel">NMDeviceIPTunnel</a>
+<a class="link" href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--ttl" title="The “ttl†property">NMDeviceIPTunnel:ttl</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--hw-address" title="The “hw-address†property">NMDeviceMacvlan:hw-address</a>, object property in <a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">NMDeviceMacvlan</a>
+<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan-struct" title="NMDeviceMacvlan">NMDeviceMacvlan</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--mode" title="The “mode†property">NMDeviceMacvlan:mode</a>, object property in <a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">NMDeviceMacvlan</a>
+<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--hw-address" title="The “hw-address†property">NMDeviceMacvlan:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--no-promisc" title="The “no-promisc†property">NMDeviceMacvlan:no-promisc</a>, object property in <a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">NMDeviceMacvlan</a>
+<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--mode" title="The “mode†property">NMDeviceMacvlan:mode</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--parent" title="The “parent†property">NMDeviceMacvlan:parent</a>, object property in <a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">NMDeviceMacvlan</a>
+<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--no-promisc" title="The “no-promisc†property">NMDeviceMacvlan:no-promisc</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--tap" title="The “tap†property">NMDeviceMacvlan:tap</a>, object property in <a class="link" href="NMDeviceMacvlan.html" title="NMDeviceMacvlan">NMDeviceMacvlan</a>
+<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--parent" title="The “parent†property">NMDeviceMacvlan:parent</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceModem.html#NMDeviceModem--current-capabilities" title="The “current-capabilities†property">NMDeviceModem:current-capabilities</a>, object property in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+<a class="link" href="NMDeviceMacvlan.html#NMDeviceMacvlan--tap" title="The “tap†property">NMDeviceMacvlan:tap</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceModem.html#NMDeviceModem--modem-capabilities" title="The “modem-capabilities†property">NMDeviceModem:modem-capabilities</a>, object property in <a class="link" href="NMDeviceModem.html" title="NMDeviceModem">NMDeviceModem</a>
+<a class="link" href="NMDeviceModem.html#NMDeviceModem-struct" title="NMDeviceModem">NMDeviceModem</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NMDeviceModem--current-capabilities" title="The “current-capabilities†property">NMDeviceModem:current-capabilities</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceModem.html#NMDeviceModem--modem-capabilities" title="The “modem-capabilities†property">NMDeviceModem:modem-capabilities</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -1722,15 +1794,19 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--active-channel" title="The “active-channel†property">NMDeviceOlpcMesh:active-channel</a>, object property in <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a>
+<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh-struct" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--companion" title="The “companion†property">NMDeviceOlpcMesh:companion</a>, object property in <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a>
+<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--active-channel" title="The “active-channel†property">NMDeviceOlpcMesh:active-channel</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--hw-address" title="The “hw-address†property">NMDeviceOlpcMesh:hw-address</a>, object property in <a class="link" href="NMDeviceOlpcMesh.html" title="NMDeviceOlpcMesh">NMDeviceOlpcMesh</a>
+<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--companion" title="The “companion†property">NMDeviceOlpcMesh:companion</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--hw-address" title="The “hw-address†property">NMDeviceOlpcMesh:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -1742,43 +1818,51 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTeam.html#NMDeviceTeam--carrier" title="The “carrier†property">NMDeviceTeam:carrier</a>, object property in <a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam">NMDeviceTeam</a>
+<a class="link" href="NMDeviceTeam.html#NMDeviceTeam-struct" title="NMDeviceTeam">NMDeviceTeam</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceTeam.html#NMDeviceTeam--carrier" title="The “carrier†property">NMDeviceTeam:carrier</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTeam.html#NMDeviceTeam--hw-address" title="The “hw-address†property">NMDeviceTeam:hw-address</a>, object property in <a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam">NMDeviceTeam</a>
+<a class="link" href="NMDeviceTeam.html#NMDeviceTeam--hw-address" title="The “hw-address†property">NMDeviceTeam:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTeam.html#NMDeviceTeam--slaves" title="The “slaves†property">NMDeviceTeam:slaves</a>, object property in <a class="link" href="NMDeviceTeam.html" title="NMDeviceTeam">NMDeviceTeam</a>
+<a class="link" href="NMDeviceTeam.html#NMDeviceTeam--slaves" title="The “slaves†property">NMDeviceTeam:slaves</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--group" title="The “group†property">NMDeviceTun:group</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun-struct" title="NMDeviceTun">NMDeviceTun</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--hw-address" title="The “hw-address†property">NMDeviceTun:hw-address</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--group" title="The “group†property">NMDeviceTun:group</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--mode" title="The “mode†property">NMDeviceTun:mode</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--hw-address" title="The “hw-address†property">NMDeviceTun:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--multi-queue" title="The “multi-queue†property">NMDeviceTun:multi-queue</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--mode" title="The “mode†property">NMDeviceTun:mode</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--no-pi" title="The “no-pi†property">NMDeviceTun:no-pi</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--multi-queue" title="The “multi-queue†property">NMDeviceTun:multi-queue</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--owner" title="The “owner†property">NMDeviceTun:owner</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--no-pi" title="The “no-pi†property">NMDeviceTun:no-pi</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceTun.html#NMDeviceTun--vnet-hdr" title="The “vnet-hdr†property">NMDeviceTun:vnet-hdr</a>, object property in <a class="link" href="NMDeviceTun.html" title="NMDeviceTun">NMDeviceTun</a>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--owner" title="The “owner†property">NMDeviceTun:owner</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceTun.html#NMDeviceTun--vnet-hdr" title="The “vnet-hdr†property">NMDeviceTun:vnet-hdr</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -1786,127 +1870,139 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--carrier" title="The “carrier†property">NMDeviceVlan:carrier</a>, object property in <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a>
+<a class="link" href="NMDeviceVlan.html#NMDeviceVlan-struct" title="NMDeviceVlan">NMDeviceVlan</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--carrier" title="The “carrier†property">NMDeviceVlan:carrier</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--hw-address" title="The “hw-address†property">NMDeviceVlan:hw-address</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--parent" title="The “parent†property">NMDeviceVlan:parent</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--hw-address" title="The “hw-address†property">NMDeviceVlan:hw-address</a>, object property in <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a>
+<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--vlan-id" title="The “vlan-id†property">NMDeviceVlan:vlan-id</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--parent" title="The “parent†property">NMDeviceVlan:parent</a>, object property in <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan-struct" title="NMDeviceVxlan">NMDeviceVxlan</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVlan.html#NMDeviceVlan--vlan-id" title="The “vlan-id†property">NMDeviceVlan:vlan-id</a>, object property in <a class="link" href="NMDeviceVlan.html" title="NMDeviceVlan">NMDeviceVlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--ageing" title="The “ageing†property">NMDeviceVxlan:ageing</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--ageing" title="The “ageing†property">NMDeviceVxlan:ageing</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--carrier" title="The “carrier†property">NMDeviceVxlan:carrier</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--carrier" title="The “carrier†property">NMDeviceVxlan:carrier</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--dst-port" title="The “dst-port†property">NMDeviceVxlan:dst-port</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--dst-port" title="The “dst-port†property">NMDeviceVxlan:dst-port</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--group" title="The “group†property">NMDeviceVxlan:group</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--group" title="The “group†property">NMDeviceVxlan:group</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--hw-address" title="The “hw-address†property">NMDeviceVxlan:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--hw-address" title="The “hw-address†property">NMDeviceVxlan:hw-address</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--id" title="The “id†property">NMDeviceVxlan:id</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--id" title="The “id†property">NMDeviceVxlan:id</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--l2miss" title="The “l2miss†property">NMDeviceVxlan:l2miss</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--l2miss" title="The “l2miss†property">NMDeviceVxlan:l2miss</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--l3miss" title="The “l3miss†property">NMDeviceVxlan:l3miss</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--l3miss" title="The “l3miss†property">NMDeviceVxlan:l3miss</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--learning" title="The “learning†property">NMDeviceVxlan:learning</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--learning" title="The “learning†property">NMDeviceVxlan:learning</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--limit" title="The “limit†property">NMDeviceVxlan:limit</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--limit" title="The “limit†property">NMDeviceVxlan:limit</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--local" title="The “local†property">NMDeviceVxlan:local</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--local" title="The “local†property">NMDeviceVxlan:local</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--parent" title="The “parent†property">NMDeviceVxlan:parent</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--parent" title="The “parent†property">NMDeviceVxlan:parent</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--proxy" title="The “proxy†property">NMDeviceVxlan:proxy</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--proxy" title="The “proxy†property">NMDeviceVxlan:proxy</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--rsc" title="The “rsc†property">NMDeviceVxlan:rsc</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--rsc" title="The “rsc†property">NMDeviceVxlan:rsc</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--src-port-max" title="The “src-port-max†property">NMDeviceVxlan:src-port-max</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--src-port-max" title="The “src-port-max†property">NMDeviceVxlan:src-port-max</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--src-port-min" title="The “src-port-min†property">NMDeviceVxlan:src-port-min</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--src-port-min" title="The “src-port-min†property">NMDeviceVxlan:src-port-min</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--tos" title="The “tos†property">NMDeviceVxlan:tos</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--tos" title="The “tos†property">NMDeviceVxlan:tos</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--ttl" title="The “ttl†property">NMDeviceVxlan:ttl</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceVxlan.html#NMDeviceVxlan--ttl" title="The “ttl†property">NMDeviceVxlan:ttl</a>, object property in <a class="link" href="NMDeviceVxlan.html" title="NMDeviceVxlan">NMDeviceVxlan</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-struct" title="NMDeviceWifi">NMDeviceWifi</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-added" title="The “access-point-added†signal">NMDeviceWifi::access-point-added</a>, object signal in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-added" title="The “access-point-added†signal">NMDeviceWifi::access-point-added</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-removed" title="The “access-point-removed†signal">NMDeviceWifi::access-point-removed</a>, object signal in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi-access-point-removed" title="The “access-point-removed†signal">NMDeviceWifi::access-point-removed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--access-points" title="The “access-points†property">NMDeviceWifi:access-points</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--access-points" title="The “access-points†property">NMDeviceWifi:access-points</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--active-access-point" title="The “active-access-point†property">NMDeviceWifi:active-access-point</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--active-access-point" title="The “active-access-point†property">NMDeviceWifi:active-access-point</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--bitrate" title="The “bitrate†property">NMDeviceWifi:bitrate</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--bitrate" title="The “bitrate†property">NMDeviceWifi:bitrate</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--hw-address" title="The “hw-address†property">NMDeviceWifi:hw-address</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--hw-address" title="The “hw-address†property">NMDeviceWifi:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--mode" title="The “mode†property">NMDeviceWifi:mode</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--mode" title="The “mode†property">NMDeviceWifi:mode</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--perm-hw-address" title="The “perm-hw-address†property">NMDeviceWifi:perm-hw-address</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--perm-hw-address" title="The “perm-hw-address†property">NMDeviceWifi:perm-hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities" title="The “wireless-capabilities†property">NMDeviceWifi:wireless-capabilities</a>, object property in <a class="link" href="NMDeviceWifi.html" title="NMDeviceWifi">NMDeviceWifi</a>
+<a class="link" href="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities" title="The “wireless-capabilities†property">NMDeviceWifi:wireless-capabilities</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -1914,43 +2010,47 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-added" title="The “nsp-added†signal">NMDeviceWimax::nsp-added</a>, object signal in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-struct" title="NMDeviceWimax">NMDeviceWimax</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-removed" title="The “nsp-removed†signal">NMDeviceWimax::nsp-removed</a>, object signal in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-added" title="The “nsp-added†signal">NMDeviceWimax::nsp-added</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--active-nsp" title="The “active-nsp†property">NMDeviceWimax:active-nsp</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax-nsp-removed" title="The “nsp-removed†signal">NMDeviceWimax::nsp-removed</a>, object signal in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--bsid" title="The “bsid†property">NMDeviceWimax:bsid</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--active-nsp" title="The “active-nsp†property">NMDeviceWimax:active-nsp</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--center-frequency" title="The “center-frequency†property">NMDeviceWimax:center-frequency</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--bsid" title="The “bsid†property">NMDeviceWimax:bsid</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--cinr" title="The “cinr†property">NMDeviceWimax:cinr</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--center-frequency" title="The “center-frequency†property">NMDeviceWimax:center-frequency</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--hw-address" title="The “hw-address†property">NMDeviceWimax:hw-address</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--cinr" title="The “cinr†property">NMDeviceWimax:cinr</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--nsps" title="The “nsps†property">NMDeviceWimax:nsps</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--hw-address" title="The “hw-address†property">NMDeviceWimax:hw-address</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--rssi" title="The “rssi†property">NMDeviceWimax:rssi</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--nsps" title="The “nsps†property">NMDeviceWimax:nsps</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--tx-power" title="The “tx-power†property">NMDeviceWimax:tx-power</a>, object property in <a class="link" href="NMDeviceWimax.html" title="NMDeviceWimax">NMDeviceWimax</a>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--rssi" title="The “rssi†property">NMDeviceWimax:rssi</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDeviceWimax.html#NMDeviceWimax--tx-power" title="The “tx-power†property">NMDeviceWimax:tx-power</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -2990,11 +3090,15 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDhcpConfig.html#NMDhcpConfig--family" title="The “family†property">NMDhcpConfig:family</a>, object property in <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig">NMDhcpConfig</a>
+<a class="link" href="NMDhcpConfig.html#NMDhcpConfig-struct" title="NMDhcpConfig">NMDhcpConfig</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMDhcpConfig.html#NMDhcpConfig--family" title="The “family†property">NMDhcpConfig:family</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMDhcpConfig.html#NMDhcpConfig--options" title="The “options†property">NMDhcpConfig:options</a>, object property in <a class="link" href="NMDhcpConfig.html" title="NMDhcpConfig">NMDhcpConfig</a>
+<a class="link" href="NMDhcpConfig.html#NMDhcpConfig--options" title="The “options†property">NMDhcpConfig:options</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -3019,35 +3123,39 @@
 <dd></dd>
 <a name="idxI"></a><h3 class="title">I</h3>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--addresses" title="The “addresses†property">NMIPConfig:addresses</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig-struct" title="NMIPConfig">NMIPConfig</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--domains" title="The “domains†property">NMIPConfig:domains</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--addresses" title="The “addresses†property">NMIPConfig:addresses</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--family" title="The “family†property">NMIPConfig:family</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--domains" title="The “domains†property">NMIPConfig:domains</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--gateway" title="The “gateway†property">NMIPConfig:gateway</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--family" title="The “family†property">NMIPConfig:family</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--nameservers" title="The “nameservers†property">NMIPConfig:nameservers</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--gateway" title="The “gateway†property">NMIPConfig:gateway</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--routes" title="The “routes†property">NMIPConfig:routes</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--nameservers" title="The “nameservers†property">NMIPConfig:nameservers</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--searches" title="The “searches†property">NMIPConfig:searches</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--routes" title="The “routes†property">NMIPConfig:routes</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMIPConfig.html#NMIPConfig--wins-servers" title="The “wins-servers†property">NMIPConfig:wins-servers</a>, object property in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+<a class="link" href="NMIPConfig.html#NMIPConfig--searches" title="The “searches†property">NMIPConfig:searches</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMIPConfig.html#NMIPConfig--wins-servers" title="The “wins-servers†property">NMIPConfig:wins-servers</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -3386,15 +3494,19 @@
 <dd></dd>
 <a name="idxO"></a><h3 class="title">O</h3>
 <dt>
-<a class="link" href="NMObject.html#NMObject--dbus-connection" title="The “dbus-connection†property">NMObject:dbus-connection</a>, object property in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+<a class="link" href="NMObject.html#NMObject-struct" title="NMObject">NMObject</a>, struct in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMObject.html#NMObject--dbus-connection" title="The “dbus-connection†property">NMObject:dbus-connection</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMObject.html#NMObject--nm-running-internal" title="The “nm-running-internal†property">NMObject:nm-running-internal</a>, object property in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+<a class="link" href="NMObject.html#NMObject--nm-running-internal" title="The “nm-running-internal†property">NMObject:nm-running-internal</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMObject.html#NMObject--path" title="The “path†property">NMObject:path</a>, object property in <a class="link" href="NMObject.html" title="NMObject">NMObject</a>
+<a class="link" href="NMObject.html#NMObject--path" title="The “path†property">NMObject:path</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -3411,11 +3523,15 @@
 <dd></dd>
 <a name="idxR"></a><h3 class="title">R</h3>
 <dt>
-<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--unsaved" title="The “unsaved†property">NMRemoteConnection:unsaved</a>, object property in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection-struct" title="NMRemoteConnection">NMRemoteConnection</a>, struct in nm-types
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--visible" title="The “visible†property">NMRemoteConnection:visible</a>, object property in <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--unsaved" title="The “unsaved†property">NMRemoteConnection:unsaved</a>, object property in nm-types
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMRemoteConnection.html#NMRemoteConnection--visible" title="The “visible†property">NMRemoteConnection:visible</a>, object property in nm-types
 </dt>
 <dd></dd>
 <dt>
@@ -3504,6 +3620,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSecretAgentOld.html#NMSecretAgentOld-struct" title="NMSecretAgentOld">NMSecretAgentOld</a>, struct in <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld">NMSecretAgentOld</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSecretAgentOld.html#NMSecretAgentOld--auto-register" title="The “auto-register†property">NMSecretAgentOld:auto-register</a>, object property in <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld">NMSecretAgentOld</a>
 </dt>
 <dd></dd>
@@ -3596,7 +3716,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSetting.html#NMSetting-struct" title="struct NMSetting">NMSetting</a>, struct in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+<a class="link" href="NMSetting.html#NMSetting-struct" title="NMSetting">NMSetting</a>, struct in <a class="link" href="NMSetting.html" title="NMSetting">NMSetting</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSetting8021x.html#NMSetting8021x-struct" title="NMSetting8021x">NMSetting8021x</a>, struct in <a class="link" href="NMSetting8021x.html" title="NMSetting8021x">NMSetting8021x</a>
 </dt>
 <dd></dd>
 <dt>
@@ -3748,6 +3872,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingAdsl.html#NMSettingAdsl-struct" title="NMSettingAdsl">NMSettingAdsl</a>, struct in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingAdsl.html#NMSettingAdsl--encapsulation" title="The “encapsulation†property">NMSettingAdsl:encapsulation</a>, object property in <a class="link" href="NMSettingAdsl.html" title="NMSettingAdsl">NMSettingAdsl</a>
 </dt>
 <dd></dd>
@@ -3776,6 +3904,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth-struct" title="NMSettingBluetooth">NMSettingBluetooth</a>, struct in <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBluetooth.html#NMSettingBluetooth--bdaddr" title="The “bdaddr†property">NMSettingBluetooth:bdaddr</a>, object property in <a class="link" href="NMSettingBluetooth.html" title="NMSettingBluetooth">NMSettingBluetooth</a>
 </dt>
 <dd></dd>
@@ -3784,10 +3916,18 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBond.html#NMSettingBond-struct" title="NMSettingBond">NMSettingBond</a>, struct in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBond.html#NMSettingBond--options" title="The “options†property">NMSettingBond:options</a>, object property in <a class="link" href="NMSettingBond.html" title="NMSettingBond">NMSettingBond</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridge.html#NMSettingBridge-struct" title="NMSettingBridge">NMSettingBridge</a>, struct in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridge.html#NMSettingBridge--ageing-time" title="The “ageing-time†property">NMSettingBridge:ageing-time</a>, object property in <a class="link" href="NMSettingBridge.html" title="NMSettingBridge">NMSettingBridge</a>
 </dt>
 <dd></dd>
@@ -3820,6 +3960,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort-struct" title="NMSettingBridgePort">NMSettingBridgePort</a>, struct in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode" title="The “hairpin-mode†property">NMSettingBridgePort:hairpin-mode</a>, object property in <a class="link" href="NMSettingBridgePort.html" title="NMSettingBridgePort">NMSettingBridgePort</a>
 </dt>
 <dd></dd>
@@ -3832,6 +3976,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingCdma.html#NMSettingCdma-struct" title="NMSettingCdma">NMSettingCdma</a>, struct in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingCdma.html#NMSettingCdma--number" title="The “number†property">NMSettingCdma:number</a>, object property in <a class="link" href="NMSettingCdma.html" title="NMSettingCdma">NMSettingCdma</a>
 </dt>
 <dd></dd>
@@ -3856,7 +4004,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="struct NMSettingConnection">NMSettingConnection</a>, struct in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
+<a class="link" href="NMSettingConnection.html#NMSettingConnection-struct" title="NMSettingConnection">NMSettingConnection</a>, struct in <a class="link" href="NMSettingConnection.html" title="NMSettingConnection">NMSettingConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -3936,6 +4084,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingDcb.html#NMSettingDcb-struct" title="NMSettingDcb">NMSettingDcb</a>, struct in <a class="link" href="NMSettingDcb.html" title="NMSettingDcb">NMSettingDcb</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags" title="The “app-fcoe-flags†property">NMSettingDcb:app-fcoe-flags</a>, object property in <a class="link" href="NMSettingDcb.html" title="NMSettingDcb">NMSettingDcb</a>
 </dt>
 <dd></dd>
@@ -4004,6 +4156,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingGeneric.html#NMSettingGeneric-struct" title="NMSettingGeneric">NMSettingGeneric</a>, struct in <a class="link" href="NMSettingGeneric.html" title="NMSettingGeneric">NMSettingGeneric</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="NMSettingGsm.html#NMSettingGsm-struct" title="NMSettingGsm">NMSettingGsm</a>, struct in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingGsm.html#NMSettingGsm--apn" title="The “apn†property">NMSettingGsm:apn</a>, object property in <a class="link" href="NMSettingGsm.html" title="NMSettingGsm">NMSettingGsm</a>
 </dt>
 <dd></dd>
@@ -4052,6 +4212,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband-struct" title="NMSettingInfiniband">NMSettingInfiniband</a>, struct in <a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband">NMSettingInfiniband</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title="The “mac-address†property">NMSettingInfiniband:mac-address</a>, object property in <a class="link" href="NMSettingInfiniband.html" title="NMSettingInfiniband">NMSettingInfiniband</a>
 </dt>
 <dd></dd>
@@ -4072,6 +4236,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config-struct" title="NMSettingIP4Config">NMSettingIP4Config</a>, struct in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id" title="The “dhcp-client-id†property">NMSettingIP4Config:dhcp-client-id</a>, object property in <a class="link" href="NMSettingIP4Config.html" title="NMSettingIP4Config">NMSettingIP4Config</a>
 </dt>
 <dd></dd>
@@ -4080,6 +4248,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config-struct" title="NMSettingIP6Config">NMSettingIP6Config</a>, struct in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--addr-gen-mode" title="The “addr-gen-mode†property">NMSettingIP6Config:addr-gen-mode</a>, object property in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -4096,6 +4268,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig-struct" title="NMSettingIPConfig">NMSettingIPConfig</a>, struct in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPConfig.html#NMSettingIPConfig--addresses" title="The “addresses†property">NMSettingIPConfig:addresses</a>, object property in <a class="link" href="NMSettingIPConfig.html" title="NMSettingIPConfig">NMSettingIPConfig</a>
 </dt>
 <dd></dd>
@@ -4160,6 +4336,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel-struct" title="NMSettingIPTunnel">NMSettingIPTunnel</a>, struct in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIPTunnel.html#NMSettingIPTunnel--encapsulation-limit" title="The “encapsulation-limit†property">NMSettingIPTunnel:encapsulation-limit</a>, object property in <a class="link" href="NMSettingIPTunnel.html" title="NMSettingIPTunnel">NMSettingIPTunnel</a>
 </dt>
 <dd></dd>
@@ -4212,6 +4392,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingMacvlan.html#NMSettingMacvlan-struct" title="NMSettingMacvlan">NMSettingMacvlan</a>, struct in <a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan">NMSettingMacvlan</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingMacvlan.html#NMSettingMacvlan--mode" title="The “mode†property">NMSettingMacvlan:mode</a>, object property in <a class="link" href="NMSettingMacvlan.html" title="NMSettingMacvlan">NMSettingMacvlan</a>
 </dt>
 <dd></dd>
@@ -4232,6 +4416,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh-struct" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>, struct in <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel" title="The “channel†property">NMSettingOlpcMesh:channel</a>, object property in <a class="link" href="NMSettingOlpcMesh.html" title="NMSettingOlpcMesh">NMSettingOlpcMesh</a>
 </dt>
 <dd></dd>
@@ -4244,6 +4432,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPpp.html#NMSettingPpp-struct" title="NMSettingPpp">NMSettingPpp</a>, struct in <a class="link" href="NMSettingPpp.html" title="NMSettingPpp">NMSettingPpp</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPpp.html#NMSettingPpp--baud" title="The “baud†property">NMSettingPpp:baud</a>, object property in <a class="link" href="NMSettingPpp.html" title="NMSettingPpp">NMSettingPpp</a>
 </dt>
 <dd></dd>
@@ -4316,6 +4508,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingPppoe.html#NMSettingPppoe-struct" title="NMSettingPppoe">NMSettingPppoe</a>, struct in <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe">NMSettingPppoe</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingPppoe.html#NMSettingPppoe--password" title="The “password†property">NMSettingPppoe:password</a>, object property in <a class="link" href="NMSettingPppoe.html" title="NMSettingPppoe">NMSettingPppoe</a>
 </dt>
 <dd></dd>
@@ -4336,6 +4532,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingSerial.html#NMSettingSerial-struct" title="NMSettingSerial">NMSettingSerial</a>, struct in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingSerial.html#NMSettingSerial--baud" title="The “baud†property">NMSettingSerial:baud</a>, object property in <a class="link" href="NMSettingSerial.html" title="NMSettingSerial">NMSettingSerial</a>
 </dt>
 <dd></dd>
@@ -4372,14 +4572,26 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingTeam.html#NMSettingTeam-struct" title="NMSettingTeam">NMSettingTeam</a>, struct in <a class="link" href="NMSettingTeam.html" title="NMSettingTeam">NMSettingTeam</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingTeam.html#NMSettingTeam--config" title="The “config†property">NMSettingTeam:config</a>, object property in <a class="link" href="NMSettingTeam.html" title="NMSettingTeam">NMSettingTeam</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort-struct" title="NMSettingTeamPort">NMSettingTeamPort</a>, struct in <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort">NMSettingTeamPort</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingTeamPort.html#NMSettingTeamPort--config" title="The “config†property">NMSettingTeamPort:config</a>, object property in <a class="link" href="NMSettingTeamPort.html" title="NMSettingTeamPort">NMSettingTeamPort</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingTun.html#NMSettingTun-struct" title="NMSettingTun">NMSettingTun</a>, struct in <a class="link" href="NMSettingTun.html" title="NMSettingTun">NMSettingTun</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingTun.html#NMSettingTun--group" title="The “group†property">NMSettingTun:group</a>, object property in <a class="link" href="NMSettingTun.html" title="NMSettingTun">NMSettingTun</a>
 </dt>
 <dd></dd>
@@ -4412,6 +4624,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingVlan.html#NMSettingVlan-struct" title="NMSettingVlan">NMSettingVlan</a>, struct in <a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingVlan.html#NMSettingVlan--egress-priority-map" title="The “egress-priority-map†property">NMSettingVlan:egress-priority-map</a>, object property in <a class="link" href="NMSettingVlan.html" title="NMSettingVlan">NMSettingVlan</a>
 </dt>
 <dd></dd>
@@ -4432,6 +4648,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingVpn.html#NMSettingVpn-struct" title="NMSettingVpn">NMSettingVpn</a>, struct in <a class="link" href="NMSettingVpn.html" title="NMSettingVpn">NMSettingVpn</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingVpn.html#NMSettingVpn--data" title="The “data†property">NMSettingVpn:data</a>, object property in <a class="link" href="NMSettingVpn.html" title="NMSettingVpn">NMSettingVpn</a>
 </dt>
 <dd></dd>
@@ -4456,6 +4676,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingVxlan.html#NMSettingVxlan-struct" title="NMSettingVxlan">NMSettingVxlan</a>, struct in <a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan">NMSettingVxlan</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingVxlan.html#NMSettingVxlan--ageing" title="The “ageing†property">NMSettingVxlan:ageing</a>, object property in <a class="link" href="NMSettingVxlan.html" title="NMSettingVxlan">NMSettingVxlan</a>
 </dt>
 <dd></dd>
@@ -4520,6 +4744,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWimax.html#NMSettingWimax-struct" title="NMSettingWimax">NMSettingWimax</a>, struct in <a class="link" href="NMSettingWimax.html" title="NMSettingWimax">NMSettingWimax</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWimax.html#NMSettingWimax--mac-address" title="The “mac-address†property">NMSettingWimax:mac-address</a>, object property in <a class="link" href="NMSettingWimax.html" title="NMSettingWimax">NMSettingWimax</a>
 </dt>
 <dd></dd>
@@ -4528,6 +4756,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWired.html#NMSettingWired-struct" title="NMSettingWired">NMSettingWired</a>, struct in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWired.html#NMSettingWired--auto-negotiate" title="The “auto-negotiate†property">NMSettingWired:auto-negotiate</a>, object property in <a class="link" href="NMSettingWired.html" title="NMSettingWired">NMSettingWired</a>
 </dt>
 <dd></dd>
@@ -4584,6 +4816,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWireless.html#NMSettingWireless-struct" title="NMSettingWireless">NMSettingWireless</a>, struct in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWireless.html#NMSettingWireless--band" title="The “band†property">NMSettingWireless:band</a>, object property in <a class="link" href="NMSettingWireless.html" title="NMSettingWireless">NMSettingWireless</a>
 </dt>
 <dd></dd>
@@ -4648,6 +4884,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>, struct in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg" title="The “auth-alg†property">NMSettingWirelessSecurity:auth-alg</a>, object property in <a class="link" href="NMSettingWirelessSecurity.html" title="NMSettingWirelessSecurity">NMSettingWirelessSecurity</a>
 </dt>
 <dd></dd>
@@ -7884,6 +8124,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSimpleConnection.html#NMSimpleConnection-struct" title="NMSimpleConnection">NMSimpleConnection</a>, struct in <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection">NMSimpleConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSimpleConnection.html#nm-simple-connection-new" title="nm_simple_connection_new ()">nm_simple_connection_new</a>, function in <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection">NMSimpleConnection</a>
 </dt>
 <dd></dd>
@@ -8162,7 +8406,7 @@
 <dd></dd>
 <a name="idxV"></a><h3 class="title">V</h3>
 <dt>
-<a class="link" href="libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING">NM_VARIANT_TYPE_SETTING</a>, macro in <a class="link" href="libnm-NMConnection.html" title="NMConnection">NMConnection</a>
+<a class="link" href="NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS" title="NM_VARIANT_TYPE_SETTING">NM_VARIANT_TYPE_SETTING</a>, macro in <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
 </dt>
 <dd></dd>
 <dt>
@@ -8186,6 +8430,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMVpnConnection.html#NMVpnConnection-struct" title="NMVpnConnection">NMVpnConnection</a>, struct in <a class="link" href="NMVpnConnection.html" title="NMVpnConnection">NMVpnConnection</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMVpnConnection.html#NMVpnConnection-vpn-state-changed" title="The “vpn-state-changed†signal">NMVpnConnection::vpn-state-changed</a>, object signal in <a class="link" href="NMVpnConnection.html" title="NMVpnConnection">NMVpnConnection</a>
 </dt>
 <dd></dd>
@@ -8254,6 +8502,10 @@
 </dt>
 <dd></dd>
 <dt>
+NMVpnPluginInfo, struct in nm-vpn-plugin-info
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a>, enum in <a class="link" href="libnm-nm-vpn-dbus-interface.html" title="nm-vpn-dbus-interface">nm-vpn-dbus-interface</a>
 </dt>
 <dd></dd>
@@ -8519,6 +8771,10 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMWimaxNsp.html#NMWimaxNsp-struct" title="NMWimaxNsp">NMWimaxNsp</a>, struct in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMWimaxNsp.html#NMWimaxNsp--name" title="The “name†property">NMWimaxNsp:name</a>, object property in <a class="link" href="NMWimaxNsp.html" title="NMWimaxNsp">NMWimaxNsp</a>
 </dt>
 <dd></dd>
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 2bd5219f..79fcec44 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libnm Reference Manual">
 <link rel="up" href="index.html" title="libnm Reference Manual">
 <link rel="prev" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">
-<link rel="next" href="libnm-NMConnection.html" title="NMConnection">
+<link rel="next" href="NMConnection.html" title="NMConnection">
 <meta name="generator" content="GTK-Doc V1.24 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -17,14 +17,14 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
 <td><a accesskey="p" href="libnm-nm-dbus-interface.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="libnm-NMConnection.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="NMConnection.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="id-1.4"></a>Connection and Setting API Reference</h1></div></div></div>
 <div class="toc"><dl class="toc">
 <dt>
-<span class="refentrytitle"><a href="libnm-NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
+<span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSimpleConnection.html">NMSimpleConnection</a></span><span class="refpurpose"></span>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index eec37428..eea02301 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.2.0
+      for libnm 1.2.2
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
@@ -69,7 +69,7 @@
 <dt><span class="chapter"><a href="ch03.html">Connection and Setting API Reference</a></span></dt>
 <dd><dl>
 <dt>
-<span class="refentrytitle"><a href="libnm-NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
+<span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span>
 </dt>
 <dt>
 <span class="refentrytitle"><a href="NMSimpleConnection.html">NMSimpleConnection</a></span><span class="refpurpose"></span>
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index 9aa08657..e2a6f09d 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -4,6 +4,7 @@
 <ANCHOR id="NMClient.signals" href="libnm/NMClient.html#NMClient.signals">
 <ANCHOR id="NMClient.other" href="libnm/NMClient.html#NMClient.other">
 <ANCHOR id="NMClient.object-hierarchy" href="libnm/NMClient.html#NMClient.object-hierarchy">
+<ANCHOR id="NMClient.implemented-interfaces" href="libnm/NMClient.html#NMClient.implemented-interfaces">
 <ANCHOR id="NMClient.description" href="libnm/NMClient.html#NMClient.description">
 <ANCHOR id="NMClient.functions_details" href="libnm/NMClient.html#NMClient.functions_details">
 <ANCHOR id="nm-client-error-quark" href="libnm/NMClient.html#nm-client-error-quark">
@@ -114,6 +115,7 @@
 <ANCHOR id="NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR-MANAGER-NOT-RUNNING:CAPS">
 <ANCHOR id="NM-CLIENT-ERROR-OBJECT-CREATION-FAILED:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR-OBJECT-CREATION-FAILED:CAPS">
 <ANCHOR id="NM-CLIENT-ERROR:CAPS" href="libnm/NMClient.html#NM-CLIENT-ERROR:CAPS">
+<ANCHOR id="NMClient-struct" href="libnm/NMClient.html#NMClient-struct">
 <ANCHOR id="NMClient.property-details" href="libnm/NMClient.html#NMClient.property-details">
 <ANCHOR id="NMClient--activating-connection" href="libnm/NMClient.html#NMClient--activating-connection">
 <ANCHOR id="NMClient--active-connections" href="libnm/NMClient.html#NMClient--active-connections">
@@ -149,6 +151,7 @@
 <ANCHOR id="NMSecretAgentOld.properties" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.properties">
 <ANCHOR id="NMSecretAgentOld.other" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.other">
 <ANCHOR id="NMSecretAgentOld.object-hierarchy" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.object-hierarchy">
+<ANCHOR id="NMSecretAgentOld.implemented-interfaces" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.implemented-interfaces">
 <ANCHOR id="NMSecretAgentOld.description" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.description">
 <ANCHOR id="NMSecretAgentOld.functions_details" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.functions_details">
 <ANCHOR id="NMSecretAgentOldGetSecretsFunc" href="libnm/NMSecretAgentOld.html#NMSecretAgentOldGetSecretsFunc">
@@ -169,6 +172,7 @@
 <ANCHOR id="NM-SECRET-AGENT-OLD-AUTO-REGISTER:CAPS" href="libnm/NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-AUTO-REGISTER:CAPS">
 <ANCHOR id="NM-SECRET-AGENT-OLD-REGISTERED:CAPS" href="libnm/NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-REGISTERED:CAPS">
 <ANCHOR id="NM-SECRET-AGENT-OLD-CAPABILITIES:CAPS" href="libnm/NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-CAPABILITIES:CAPS">
+<ANCHOR id="NMSecretAgentOld-struct" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld-struct">
 <ANCHOR id="NMSecretAgentOld.property-details" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld.property-details">
 <ANCHOR id="NMSecretAgentOld--auto-register" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld--auto-register">
 <ANCHOR id="NMSecretAgentOld--capabilities" href="libnm/NMSecretAgentOld.html#NMSecretAgentOld--capabilities">
@@ -179,12 +183,14 @@
 <ANCHOR id="NMObject.properties" href="libnm/NMObject.html#NMObject.properties">
 <ANCHOR id="NMObject.other" href="libnm/NMObject.html#NMObject.other">
 <ANCHOR id="NMObject.object-hierarchy" href="libnm/NMObject.html#NMObject.object-hierarchy">
+<ANCHOR id="NMObject.implemented-interfaces" href="libnm/NMObject.html#NMObject.implemented-interfaces">
 <ANCHOR id="NMObject.description" href="libnm/NMObject.html#NMObject.description">
 <ANCHOR id="NMObject.functions_details" href="libnm/NMObject.html#NMObject.functions_details">
 <ANCHOR id="nm-object-get-path" href="libnm/NMObject.html#nm-object-get-path">
 <ANCHOR id="NMObject.other_details" href="libnm/NMObject.html#NMObject.other_details">
 <ANCHOR id="NM-OBJECT-PATH:CAPS" href="libnm/NMObject.html#NM-OBJECT-PATH:CAPS">
 <ANCHOR id="NM-OBJECT-DBUS-CONNECTION:CAPS" href="libnm/NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS">
+<ANCHOR id="NMObject-struct" href="libnm/NMObject.html#NMObject-struct">
 <ANCHOR id="NMObject.property-details" href="libnm/NMObject.html#NMObject.property-details">
 <ANCHOR id="NMObject--dbus-connection" href="libnm/NMObject.html#NMObject--dbus-connection">
 <ANCHOR id="NMObject--nm-running-internal" href="libnm/NMObject.html#NMObject--nm-running-internal">
@@ -551,90 +557,93 @@
 <ANCHOR id="NM-IP-TUNNEL-MODE-IPIP6:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-IP-TUNNEL-MODE-IPIP6:CAPS">
 <ANCHOR id="NM-IP-TUNNEL-MODE-IP6GRE:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-IP-TUNNEL-MODE-IP6GRE:CAPS">
 <ANCHOR id="NM-IP-TUNNEL-MODE-VTI6:CAPS" href="libnm/libnm-nm-dbus-interface.html#NM-IP-TUNNEL-MODE-VTI6:CAPS">
-<ANCHOR id="libnm-NMConnection" href="libnm/libnm-NMConnection.html">
-<ANCHOR id="libnm-NMConnection.functions" href="libnm/libnm-NMConnection.html#libnm-NMConnection.functions">
-<ANCHOR id="libnm-NMConnection.other" href="libnm/libnm-NMConnection.html#libnm-NMConnection.other">
-<ANCHOR id="libnm-NMConnection.object-hierarchy" href="libnm/libnm-NMConnection.html#libnm-NMConnection.object-hierarchy">
-<ANCHOR id="libnm-NMConnection.description" href="libnm/libnm-NMConnection.html#libnm-NMConnection.description">
-<ANCHOR id="libnm-NMConnection.functions_details" href="libnm/libnm-NMConnection.html#libnm-NMConnection.functions_details">
-<ANCHOR id="nm-connection-add-setting" href="libnm/libnm-NMConnection.html#nm-connection-add-setting">
-<ANCHOR id="nm-connection-remove-setting" href="libnm/libnm-NMConnection.html#nm-connection-remove-setting">
-<ANCHOR id="nm-connection-get-setting" href="libnm/libnm-NMConnection.html#nm-connection-get-setting">
-<ANCHOR id="nm-connection-get-setting-by-name" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-by-name">
-<ANCHOR id="nm-connection-to-dbus" href="libnm/libnm-NMConnection.html#nm-connection-to-dbus">
-<ANCHOR id="nm-connection-replace-settings" href="libnm/libnm-NMConnection.html#nm-connection-replace-settings">
-<ANCHOR id="nm-connection-replace-settings-from-connection" href="libnm/libnm-NMConnection.html#nm-connection-replace-settings-from-connection">
-<ANCHOR id="nm-connection-clear-settings" href="libnm/libnm-NMConnection.html#nm-connection-clear-settings">
-<ANCHOR id="nm-connection-compare" href="libnm/libnm-NMConnection.html#nm-connection-compare">
-<ANCHOR id="nm-connection-diff" href="libnm/libnm-NMConnection.html#nm-connection-diff">
-<ANCHOR id="nm-connection-verify" href="libnm/libnm-NMConnection.html#nm-connection-verify">
-<ANCHOR id="nm-connection-verify-secrets" href="libnm/libnm-NMConnection.html#nm-connection-verify-secrets">
-<ANCHOR id="nm-connection-normalize" href="libnm/libnm-NMConnection.html#nm-connection-normalize">
-<ANCHOR id="nm-connection-need-secrets" href="libnm/libnm-NMConnection.html#nm-connection-need-secrets">
-<ANCHOR id="nm-connection-clear-secrets" href="libnm/libnm-NMConnection.html#nm-connection-clear-secrets">
-<ANCHOR id="nm-connection-clear-secrets-with-flags" href="libnm/libnm-NMConnection.html#nm-connection-clear-secrets-with-flags">
-<ANCHOR id="nm-connection-update-secrets" href="libnm/libnm-NMConnection.html#nm-connection-update-secrets">
-<ANCHOR id="nm-connection-set-path" href="libnm/libnm-NMConnection.html#nm-connection-set-path">
-<ANCHOR id="nm-connection-get-path" href="libnm/libnm-NMConnection.html#nm-connection-get-path">
-<ANCHOR id="nm-connection-get-interface-name" href="libnm/libnm-NMConnection.html#nm-connection-get-interface-name">
-<ANCHOR id="nm-connection-is-type" href="libnm/libnm-NMConnection.html#nm-connection-is-type">
-<ANCHOR id="nm-connection-for-each-setting-value" href="libnm/libnm-NMConnection.html#nm-connection-for-each-setting-value">
-<ANCHOR id="nm-connection-dump" href="libnm/libnm-NMConnection.html#nm-connection-dump">
-<ANCHOR id="nm-connection-get-uuid" href="libnm/libnm-NMConnection.html#nm-connection-get-uuid">
-<ANCHOR id="nm-connection-get-id" href="libnm/libnm-NMConnection.html#nm-connection-get-id">
-<ANCHOR id="nm-connection-get-connection-type" href="libnm/libnm-NMConnection.html#nm-connection-get-connection-type">
-<ANCHOR id="nm-connection-is-virtual" href="libnm/libnm-NMConnection.html#nm-connection-is-virtual">
-<ANCHOR id="nm-connection-get-virtual-device-description" href="libnm/libnm-NMConnection.html#nm-connection-get-virtual-device-description">
-<ANCHOR id="nm-connection-get-setting-802-1x" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-802-1x">
-<ANCHOR id="nm-connection-get-setting-bluetooth" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-bluetooth">
-<ANCHOR id="nm-connection-get-setting-bond" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-bond">
-<ANCHOR id="nm-connection-get-setting-team" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-team">
-<ANCHOR id="nm-connection-get-setting-team-port" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-team-port">
-<ANCHOR id="nm-connection-get-setting-bridge" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-bridge">
-<ANCHOR id="nm-connection-get-setting-bridge-port" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-bridge-port">
-<ANCHOR id="nm-connection-get-setting-cdma" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-cdma">
-<ANCHOR id="nm-connection-get-setting-connection" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-connection">
-<ANCHOR id="nm-connection-get-setting-dcb" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-dcb">
-<ANCHOR id="nm-connection-get-setting-generic" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-generic">
-<ANCHOR id="nm-connection-get-setting-gsm" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-gsm">
-<ANCHOR id="nm-connection-get-setting-infiniband" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-infiniband">
-<ANCHOR id="nm-connection-get-setting-ip-tunnel" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-ip-tunnel">
-<ANCHOR id="nm-connection-get-setting-ip4-config" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-ip4-config">
-<ANCHOR id="nm-connection-get-setting-ip6-config" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-ip6-config">
-<ANCHOR id="nm-connection-get-setting-macvlan" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-macvlan">
-<ANCHOR id="nm-connection-get-setting-olpc-mesh" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-olpc-mesh">
-<ANCHOR id="nm-connection-get-setting-ppp" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-ppp">
-<ANCHOR id="nm-connection-get-setting-pppoe" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-pppoe">
-<ANCHOR id="nm-connection-get-setting-serial" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-serial">
-<ANCHOR id="nm-connection-get-setting-tun" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-tun">
-<ANCHOR id="nm-connection-get-setting-vpn" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-vpn">
-<ANCHOR id="nm-connection-get-setting-wimax" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-wimax">
-<ANCHOR id="nm-connection-get-setting-adsl" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-adsl">
-<ANCHOR id="nm-connection-get-setting-wired" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-wired">
-<ANCHOR id="nm-connection-get-setting-wireless" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-wireless">
-<ANCHOR id="nm-connection-get-setting-wireless-security" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-wireless-security">
-<ANCHOR id="nm-connection-get-setting-vlan" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-vlan">
-<ANCHOR id="nm-connection-get-setting-vxlan" href="libnm/libnm-NMConnection.html#nm-connection-get-setting-vxlan">
-<ANCHOR id="libnm-NMConnection.other_details" href="libnm/libnm-NMConnection.html#libnm-NMConnection.other_details">
-<ANCHOR id="NM-CONNECTION-SECRETS-UPDATED:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS">
-<ANCHOR id="NM-CONNECTION-SECRETS-CLEARED:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS">
-<ANCHOR id="NM-CONNECTION-CHANGED:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-CHANGED:CAPS">
-<ANCHOR id="NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS">
-<ANCHOR id="NMConnectionInterface" href="libnm/libnm-NMConnection.html#NMConnectionInterface">
-<ANCHOR id="NM-VARIANT-TYPE-SETTING:CAPS" href="libnm/libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS">
-<ANCHOR id="NMConnectionSerializationFlags" href="libnm/libnm-NMConnection.html#NMConnectionSerializationFlags">
-<ANCHOR id="NM-CONNECTION-SERIALIZE-ALL:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS">
-<ANCHOR id="NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS">
-<ANCHOR id="NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS" href="libnm/libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS">
+<ANCHOR id="NMConnection" href="libnm/NMConnection.html">
+<ANCHOR id="NMConnection.functions" href="libnm/NMConnection.html#NMConnection.functions">
+<ANCHOR id="NMConnection.other" href="libnm/NMConnection.html#NMConnection.other">
+<ANCHOR id="NMConnection.object-hierarchy" href="libnm/NMConnection.html#NMConnection.object-hierarchy">
+<ANCHOR id="NMConnection.description" href="libnm/NMConnection.html#NMConnection.description">
+<ANCHOR id="NMConnection.functions_details" href="libnm/NMConnection.html#NMConnection.functions_details">
+<ANCHOR id="nm-connection-add-setting" href="libnm/NMConnection.html#nm-connection-add-setting">
+<ANCHOR id="nm-connection-remove-setting" href="libnm/NMConnection.html#nm-connection-remove-setting">
+<ANCHOR id="nm-connection-get-setting" href="libnm/NMConnection.html#nm-connection-get-setting">
+<ANCHOR id="nm-connection-get-setting-by-name" href="libnm/NMConnection.html#nm-connection-get-setting-by-name">
+<ANCHOR id="nm-connection-to-dbus" href="libnm/NMConnection.html#nm-connection-to-dbus">
+<ANCHOR id="nm-connection-replace-settings" href="libnm/NMConnection.html#nm-connection-replace-settings">
+<ANCHOR id="nm-connection-replace-settings-from-connection" href="libnm/NMConnection.html#nm-connection-replace-settings-from-connection">
+<ANCHOR id="nm-connection-clear-settings" href="libnm/NMConnection.html#nm-connection-clear-settings">
+<ANCHOR id="nm-connection-compare" href="libnm/NMConnection.html#nm-connection-compare">
+<ANCHOR id="nm-connection-diff" href="libnm/NMConnection.html#nm-connection-diff">
+<ANCHOR id="nm-connection-verify" href="libnm/NMConnection.html#nm-connection-verify">
+<ANCHOR id="nm-connection-verify-secrets" href="libnm/NMConnection.html#nm-connection-verify-secrets">
+<ANCHOR id="nm-connection-normalize" href="libnm/NMConnection.html#nm-connection-normalize">
+<ANCHOR id="nm-connection-need-secrets" href="libnm/NMConnection.html#nm-connection-need-secrets">
+<ANCHOR id="nm-connection-clear-secrets" href="libnm/NMConnection.html#nm-connection-clear-secrets">
+<ANCHOR id="nm-connection-clear-secrets-with-flags" href="libnm/NMConnection.html#nm-connection-clear-secrets-with-flags">
+<ANCHOR id="nm-connection-update-secrets" href="libnm/NMConnection.html#nm-connection-update-secrets">
+<ANCHOR id="nm-connection-set-path" href="libnm/NMConnection.html#nm-connection-set-path">
+<ANCHOR id="nm-connection-get-path" href="libnm/NMConnection.html#nm-connection-get-path">
+<ANCHOR id="nm-connection-get-interface-name" href="libnm/NMConnection.html#nm-connection-get-interface-name">
+<ANCHOR id="nm-connection-is-type" href="libnm/NMConnection.html#nm-connection-is-type">
+<ANCHOR id="nm-connection-for-each-setting-value" href="libnm/NMConnection.html#nm-connection-for-each-setting-value">
+<ANCHOR id="nm-connection-dump" href="libnm/NMConnection.html#nm-connection-dump">
+<ANCHOR id="nm-connection-get-uuid" href="libnm/NMConnection.html#nm-connection-get-uuid">
+<ANCHOR id="nm-connection-get-id" href="libnm/NMConnection.html#nm-connection-get-id">
+<ANCHOR id="nm-connection-get-connection-type" href="libnm/NMConnection.html#nm-connection-get-connection-type">
+<ANCHOR id="nm-connection-is-virtual" href="libnm/NMConnection.html#nm-connection-is-virtual">
+<ANCHOR id="nm-connection-get-virtual-device-description" href="libnm/NMConnection.html#nm-connection-get-virtual-device-description">
+<ANCHOR id="nm-connection-get-setting-802-1x" href="libnm/NMConnection.html#nm-connection-get-setting-802-1x">
+<ANCHOR id="nm-connection-get-setting-bluetooth" href="libnm/NMConnection.html#nm-connection-get-setting-bluetooth">
+<ANCHOR id="nm-connection-get-setting-bond" href="libnm/NMConnection.html#nm-connection-get-setting-bond">
+<ANCHOR id="nm-connection-get-setting-team" href="libnm/NMConnection.html#nm-connection-get-setting-team">
+<ANCHOR id="nm-connection-get-setting-team-port" href="libnm/NMConnection.html#nm-connection-get-setting-team-port">
+<ANCHOR id="nm-connection-get-setting-bridge" href="libnm/NMConnection.html#nm-connection-get-setting-bridge">
+<ANCHOR id="nm-connection-get-setting-bridge-port" href="libnm/NMConnection.html#nm-connection-get-setting-bridge-port">
+<ANCHOR id="nm-connection-get-setting-cdma" href="libnm/NMConnection.html#nm-connection-get-setting-cdma">
+<ANCHOR id="nm-connection-get-setting-connection" href="libnm/NMConnection.html#nm-connection-get-setting-connection">
+<ANCHOR id="nm-connection-get-setting-dcb" href="libnm/NMConnection.html#nm-connection-get-setting-dcb">
+<ANCHOR id="nm-connection-get-setting-generic" href="libnm/NMConnection.html#nm-connection-get-setting-generic">
+<ANCHOR id="nm-connection-get-setting-gsm" href="libnm/NMConnection.html#nm-connection-get-setting-gsm">
+<ANCHOR id="nm-connection-get-setting-infiniband" href="libnm/NMConnection.html#nm-connection-get-setting-infiniband">
+<ANCHOR id="nm-connection-get-setting-ip-tunnel" href="libnm/NMConnection.html#nm-connection-get-setting-ip-tunnel">
+<ANCHOR id="nm-connection-get-setting-ip4-config" href="libnm/NMConnection.html#nm-connection-get-setting-ip4-config">
+<ANCHOR id="nm-connection-get-setting-ip6-config" href="libnm/NMConnection.html#nm-connection-get-setting-ip6-config">
+<ANCHOR id="nm-connection-get-setting-macvlan" href="libnm/NMConnection.html#nm-connection-get-setting-macvlan">
+<ANCHOR id="nm-connection-get-setting-olpc-mesh" href="libnm/NMConnection.html#nm-connection-get-setting-olpc-mesh">
+<ANCHOR id="nm-connection-get-setting-ppp" href="libnm/NMConnection.html#nm-connection-get-setting-ppp">
+<ANCHOR id="nm-connection-get-setting-pppoe" href="libnm/NMConnection.html#nm-connection-get-setting-pppoe">
+<ANCHOR id="nm-connection-get-setting-serial" href="libnm/NMConnection.html#nm-connection-get-setting-serial">
+<ANCHOR id="nm-connection-get-setting-tun" href="libnm/NMConnection.html#nm-connection-get-setting-tun">
+<ANCHOR id="nm-connection-get-setting-vpn" href="libnm/NMConnection.html#nm-connection-get-setting-vpn">
+<ANCHOR id="nm-connection-get-setting-wimax" href="libnm/NMConnection.html#nm-connection-get-setting-wimax">
+<ANCHOR id="nm-connection-get-setting-adsl" href="libnm/NMConnection.html#nm-connection-get-setting-adsl">
+<ANCHOR id="nm-connection-get-setting-wired" href="libnm/NMConnection.html#nm-connection-get-setting-wired">
+<ANCHOR id="nm-connection-get-setting-wireless" href="libnm/NMConnection.html#nm-connection-get-setting-wireless">
+<ANCHOR id="nm-connection-get-setting-wireless-security" href="libnm/NMConnection.html#nm-connection-get-setting-wireless-security">
+<ANCHOR id="nm-connection-get-setting-vlan" href="libnm/NMConnection.html#nm-connection-get-setting-vlan">
+<ANCHOR id="nm-connection-get-setting-vxlan" href="libnm/NMConnection.html#nm-connection-get-setting-vxlan">
+<ANCHOR id="NMConnection.other_details" href="libnm/NMConnection.html#NMConnection.other_details">
+<ANCHOR id="NM-CONNECTION-SECRETS-UPDATED:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS">
+<ANCHOR id="NM-CONNECTION-SECRETS-CLEARED:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS">
+<ANCHOR id="NM-CONNECTION-CHANGED:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-CHANGED:CAPS">
+<ANCHOR id="NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS">
+<ANCHOR id="NMConnectionInterface" href="libnm/NMConnection.html#NMConnectionInterface">
+<ANCHOR id="NM-VARIANT-TYPE-SETTING:CAPS" href="libnm/NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS">
+<ANCHOR id="NMConnectionSerializationFlags" href="libnm/NMConnection.html#NMConnectionSerializationFlags">
+<ANCHOR id="NM-CONNECTION-SERIALIZE-ALL:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS">
+<ANCHOR id="NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS">
+<ANCHOR id="NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS" href="libnm/NMConnection.html#NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS">
 <ANCHOR id="NMSimpleConnection" href="libnm/NMSimpleConnection.html">
 <ANCHOR id="NMSimpleConnection.functions" href="libnm/NMSimpleConnection.html#NMSimpleConnection.functions">
+<ANCHOR id="NMSimpleConnection.other" href="libnm/NMSimpleConnection.html#NMSimpleConnection.other">
 <ANCHOR id="NMSimpleConnection.object-hierarchy" href="libnm/NMSimpleConnection.html#NMSimpleConnection.object-hierarchy">
+<ANCHOR id="NMSimpleConnection.implemented-interfaces" href="libnm/NMSimpleConnection.html#NMSimpleConnection.implemented-interfaces">
 <ANCHOR id="NMSimpleConnection.description" href="libnm/NMSimpleConnection.html#NMSimpleConnection.description">
 <ANCHOR id="NMSimpleConnection.functions_details" href="libnm/NMSimpleConnection.html#NMSimpleConnection.functions_details">
 <ANCHOR id="nm-simple-connection-new" href="libnm/NMSimpleConnection.html#nm-simple-connection-new">
 <ANCHOR id="nm-simple-connection-new-from-dbus" href="libnm/NMSimpleConnection.html#nm-simple-connection-new-from-dbus">
 <ANCHOR id="nm-simple-connection-new-clone" href="libnm/NMSimpleConnection.html#nm-simple-connection-new-clone">
 <ANCHOR id="NMSimpleConnection.other_details" href="libnm/NMSimpleConnection.html#NMSimpleConnection.other_details">
+<ANCHOR id="NMSimpleConnection-struct" href="libnm/NMSimpleConnection.html#NMSimpleConnection-struct">
 <ANCHOR id="NMSetting" href="libnm/NMSetting.html">
 <ANCHOR id="NMSetting.functions" href="libnm/NMSetting.html#NMSetting.functions">
 <ANCHOR id="NMSetting.properties" href="libnm/NMSetting.html#NMSetting.properties">
@@ -897,6 +906,7 @@
 <ANCHOR id="NM-SETTING-802-1X-PIN:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-PIN-FLAGS:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS" href="libnm/NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS">
+<ANCHOR id="NMSetting8021x-struct" href="libnm/NMSetting8021x.html#NMSetting8021x-struct">
 <ANCHOR id="NMSetting8021x.property-details" href="libnm/NMSetting8021x.html#NMSetting8021x.property-details">
 <ANCHOR id="NMSetting8021x--altsubject-matches" href="libnm/NMSetting8021x.html#NMSetting8021x--altsubject-matches">
 <ANCHOR id="NMSetting8021x--anonymous-identity" href="libnm/NMSetting8021x.html#NMSetting8021x--anonymous-identity">
@@ -961,6 +971,7 @@
 <ANCHOR id="NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS" href="libnm/NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS">
 <ANCHOR id="NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS" href="libnm/NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS">
 <ANCHOR id="NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS" href="libnm/NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS">
+<ANCHOR id="NMSettingAdsl-struct" href="libnm/NMSettingAdsl.html#NMSettingAdsl-struct">
 <ANCHOR id="NMSettingAdsl.property-details" href="libnm/NMSettingAdsl.html#NMSettingAdsl.property-details">
 <ANCHOR id="NMSettingAdsl--encapsulation" href="libnm/NMSettingAdsl.html#NMSettingAdsl--encapsulation">
 <ANCHOR id="NMSettingAdsl--password" href="libnm/NMSettingAdsl.html#NMSettingAdsl--password">
@@ -985,6 +996,7 @@
 <ANCHOR id="NM-SETTING-BLUETOOTH-TYPE:CAPS" href="libnm/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE:CAPS">
 <ANCHOR id="NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS" href="libnm/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS">
 <ANCHOR id="NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS" href="libnm/NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS">
+<ANCHOR id="NMSettingBluetooth-struct" href="libnm/NMSettingBluetooth.html#NMSettingBluetooth-struct">
 <ANCHOR id="NMSettingBluetooth.property-details" href="libnm/NMSettingBluetooth.html#NMSettingBluetooth.property-details">
 <ANCHOR id="NMSettingBluetooth--bdaddr" href="libnm/NMSettingBluetooth.html#NMSettingBluetooth--bdaddr">
 <ANCHOR id="NMSettingBluetooth--type" href="libnm/NMSettingBluetooth.html#NMSettingBluetooth--type">
@@ -1034,6 +1046,7 @@
 <ANCHOR id="NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS">
 <ANCHOR id="NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS">
 <ANCHOR id="NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS" href="libnm/NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS">
+<ANCHOR id="NMSettingBond-struct" href="libnm/NMSettingBond.html#NMSettingBond-struct">
 <ANCHOR id="NMSettingBond.property-details" href="libnm/NMSettingBond.html#NMSettingBond.property-details">
 <ANCHOR id="NMSettingBond--options" href="libnm/NMSettingBond.html#NMSettingBond--options">
 <ANCHOR id="NMSettingBridge" href="libnm/NMSettingBridge.html">
@@ -1062,6 +1075,7 @@
 <ANCHOR id="NM-SETTING-BRIDGE-MAX-AGE:CAPS" href="libnm/NMSettingBridge.html#NM-SETTING-BRIDGE-MAX-AGE:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-AGEING-TIME:CAPS" href="libnm/NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-MULTICAST-SNOOPING:CAPS" href="libnm/NMSettingBridge.html#NM-SETTING-BRIDGE-MULTICAST-SNOOPING:CAPS">
+<ANCHOR id="NMSettingBridge-struct" href="libnm/NMSettingBridge.html#NMSettingBridge-struct">
 <ANCHOR id="NMSettingBridge.property-details" href="libnm/NMSettingBridge.html#NMSettingBridge.property-details">
 <ANCHOR id="NMSettingBridge--ageing-time" href="libnm/NMSettingBridge.html#NMSettingBridge--ageing-time">
 <ANCHOR id="NMSettingBridge--forward-delay" href="libnm/NMSettingBridge.html#NMSettingBridge--forward-delay">
@@ -1087,6 +1101,7 @@
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS" href="libnm/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS" href="libnm/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS">
 <ANCHOR id="NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS" href="libnm/NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS">
+<ANCHOR id="NMSettingBridgePort-struct" href="libnm/NMSettingBridgePort.html#NMSettingBridgePort-struct">
 <ANCHOR id="NMSettingBridgePort.property-details" href="libnm/NMSettingBridgePort.html#NMSettingBridgePort.property-details">
 <ANCHOR id="NMSettingBridgePort--hairpin-mode" href="libnm/NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode">
 <ANCHOR id="NMSettingBridgePort--path-cost" href="libnm/NMSettingBridgePort.html#NMSettingBridgePort--path-cost">
@@ -1109,6 +1124,7 @@
 <ANCHOR id="NM-SETTING-CDMA-USERNAME:CAPS" href="libnm/NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-PASSWORD:CAPS" href="libnm/NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS">
 <ANCHOR id="NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS" href="libnm/NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS">
+<ANCHOR id="NMSettingCdma-struct" href="libnm/NMSettingCdma.html#NMSettingCdma-struct">
 <ANCHOR id="NMSettingCdma.property-details" href="libnm/NMSettingCdma.html#NMSettingCdma.property-details">
 <ANCHOR id="NMSettingCdma--number" href="libnm/NMSettingCdma.html#NMSettingCdma--number">
 <ANCHOR id="NMSettingCdma--password" href="libnm/NMSettingCdma.html#NMSettingCdma--password">
@@ -1167,6 +1183,7 @@
 <ANCHOR id="NM-SETTING-DCB-PRIORITY-BANDWIDTH:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-BANDWIDTH:CAPS">
 <ANCHOR id="NM-SETTING-DCB-PRIORITY-STRICT-BANDWIDTH:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-STRICT-BANDWIDTH:CAPS">
 <ANCHOR id="NM-SETTING-DCB-PRIORITY-TRAFFIC-CLASS:CAPS" href="libnm/NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-TRAFFIC-CLASS:CAPS">
+<ANCHOR id="NMSettingDcb-struct" href="libnm/NMSettingDcb.html#NMSettingDcb-struct">
 <ANCHOR id="NMSettingDcb.property-details" href="libnm/NMSettingDcb.html#NMSettingDcb.property-details">
 <ANCHOR id="NMSettingDcb--app-fcoe-flags" href="libnm/NMSettingDcb.html#NMSettingDcb--app-fcoe-flags">
 <ANCHOR id="NMSettingDcb--app-fcoe-mode" href="libnm/NMSettingDcb.html#NMSettingDcb--app-fcoe-mode">
@@ -1192,6 +1209,7 @@
 <ANCHOR id="nm-setting-generic-new" href="libnm/NMSettingGeneric.html#nm-setting-generic-new">
 <ANCHOR id="NMSettingGeneric.other_details" href="libnm/NMSettingGeneric.html#NMSettingGeneric.other_details">
 <ANCHOR id="NM-SETTING-GENERIC-SETTING-NAME:CAPS" href="libnm/NMSettingGeneric.html#NM-SETTING-GENERIC-SETTING-NAME:CAPS">
+<ANCHOR id="NMSettingGeneric-struct" href="libnm/NMSettingGeneric.html#NMSettingGeneric-struct">
 <ANCHOR id="NMSettingGsm" href="libnm/NMSettingGsm.html">
 <ANCHOR id="NMSettingGsm.functions" href="libnm/NMSettingGsm.html#NMSettingGsm.functions">
 <ANCHOR id="NMSettingGsm.properties" href="libnm/NMSettingGsm.html#NMSettingGsm.properties">
@@ -1226,6 +1244,7 @@
 <ANCHOR id="NM-SETTING-GSM-DEVICE-ID:CAPS" href="libnm/NMSettingGsm.html#NM-SETTING-GSM-DEVICE-ID:CAPS">
 <ANCHOR id="NM-SETTING-GSM-SIM-ID:CAPS" href="libnm/NMSettingGsm.html#NM-SETTING-GSM-SIM-ID:CAPS">
 <ANCHOR id="NM-SETTING-GSM-SIM-OPERATOR-ID:CAPS" href="libnm/NMSettingGsm.html#NM-SETTING-GSM-SIM-OPERATOR-ID:CAPS">
+<ANCHOR id="NMSettingGsm-struct" href="libnm/NMSettingGsm.html#NMSettingGsm-struct">
 <ANCHOR id="NMSettingGsm.property-details" href="libnm/NMSettingGsm.html#NMSettingGsm.property-details">
 <ANCHOR id="NMSettingGsm--apn" href="libnm/NMSettingGsm.html#NMSettingGsm--apn">
 <ANCHOR id="NMSettingGsm--device-id" href="libnm/NMSettingGsm.html#NMSettingGsm--device-id">
@@ -1260,6 +1279,7 @@
 <ANCHOR id="NM-SETTING-INFINIBAND-TRANSPORT-MODE:CAPS" href="libnm/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-TRANSPORT-MODE:CAPS">
 <ANCHOR id="NM-SETTING-INFINIBAND-P-KEY:CAPS" href="libnm/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-P-KEY:CAPS">
 <ANCHOR id="NM-SETTING-INFINIBAND-PARENT:CAPS" href="libnm/NMSettingInfiniband.html#NM-SETTING-INFINIBAND-PARENT:CAPS">
+<ANCHOR id="NMSettingInfiniband-struct" href="libnm/NMSettingInfiniband.html#NMSettingInfiniband-struct">
 <ANCHOR id="NMSettingInfiniband.property-details" href="libnm/NMSettingInfiniband.html#NMSettingInfiniband.property-details">
 <ANCHOR id="NMSettingInfiniband--mac-address" href="libnm/NMSettingInfiniband.html#NMSettingInfiniband--mac-address">
 <ANCHOR id="NMSettingInfiniband--mtu" href="libnm/NMSettingInfiniband.html#NMSettingInfiniband--mtu">
@@ -1285,6 +1305,7 @@
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS" href="libnm/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS" href="libnm/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS">
 <ANCHOR id="NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS" href="libnm/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS">
+<ANCHOR id="NMSettingIP4Config-struct" href="libnm/NMSettingIP4Config.html#NMSettingIP4Config-struct">
 <ANCHOR id="NMSettingIP4Config.property-details" href="libnm/NMSettingIP4Config.html#NMSettingIP4Config.property-details">
 <ANCHOR id="NMSettingIP4Config--dhcp-client-id" href="libnm/NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id">
 <ANCHOR id="NMSettingIP4Config--dhcp-fqdn" href="libnm/NMSettingIP4Config.html#NMSettingIP4Config--dhcp-fqdn">
@@ -1316,6 +1337,7 @@
 <ANCHOR id="NMSettingIP6ConfigAddrGenMode" href="libnm/NMSettingIP6Config.html#NMSettingIP6ConfigAddrGenMode">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-EUI64:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-EUI64:CAPS">
 <ANCHOR id="NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-STABLE-PRIVACY:CAPS" href="libnm/NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE-STABLE-PRIVACY:CAPS">
+<ANCHOR id="NMSettingIP6Config-struct" href="libnm/NMSettingIP6Config.html#NMSettingIP6Config-struct">
 <ANCHOR id="NMSettingIP6Config.property-details" href="libnm/NMSettingIP6Config.html#NMSettingIP6Config.property-details">
 <ANCHOR id="NMSettingIP6Config--addr-gen-mode" href="libnm/NMSettingIP6Config.html#NMSettingIP6Config--addr-gen-mode">
 <ANCHOR id="NMSettingIP6Config--ip6-privacy" href="libnm/NMSettingIP6Config.html#NMSettingIP6Config--ip6-privacy">
@@ -1443,6 +1465,7 @@
 <ANCHOR id="NM-SETTING-DNS-OPTION-SINGLE-REQUEST-REOPEN:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-SINGLE-REQUEST-REOPEN:CAPS">
 <ANCHOR id="NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS">
 <ANCHOR id="NM-SETTING-DNS-OPTION-USE-VC:CAPS" href="libnm/NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS">
+<ANCHOR id="NMSettingIPConfig-struct" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig-struct">
 <ANCHOR id="NMSettingIPConfig.property-details" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig.property-details">
 <ANCHOR id="NMSettingIPConfig--addresses" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig--addresses">
 <ANCHOR id="NMSettingIPConfig--dad-timeout" href="libnm/NMSettingIPConfig.html#NMSettingIPConfig--dad-timeout">
@@ -1495,6 +1518,7 @@
 <ANCHOR id="NM-SETTING-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS" href="libnm/NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS">
 <ANCHOR id="NM-SETTING-IP-TUNNEL-FLOW-LABEL:CAPS" href="libnm/NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLOW-LABEL:CAPS">
 <ANCHOR id="NM-SETTING-IP-TUNNEL-MTU:CAPS" href="libnm/NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-MTU:CAPS">
+<ANCHOR id="NMSettingIPTunnel-struct" href="libnm/NMSettingIPTunnel.html#NMSettingIPTunnel-struct">
 <ANCHOR id="NMSettingIPTunnel.property-details" href="libnm/NMSettingIPTunnel.html#NMSettingIPTunnel.property-details">
 <ANCHOR id="NMSettingIPTunnel--encapsulation-limit" href="libnm/NMSettingIPTunnel.html#NMSettingIPTunnel--encapsulation-limit">
 <ANCHOR id="NMSettingIPTunnel--flow-label" href="libnm/NMSettingIPTunnel.html#NMSettingIPTunnel--flow-label">
@@ -1526,6 +1550,7 @@
 <ANCHOR id="NM-SETTING-MACVLAN-MODE:CAPS" href="libnm/NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE:CAPS">
 <ANCHOR id="NM-SETTING-MACVLAN-PROMISCUOUS:CAPS" href="libnm/NMSettingMacvlan.html#NM-SETTING-MACVLAN-PROMISCUOUS:CAPS">
 <ANCHOR id="NM-SETTING-MACVLAN-TAP:CAPS" href="libnm/NMSettingMacvlan.html#NM-SETTING-MACVLAN-TAP:CAPS">
+<ANCHOR id="NMSettingMacvlan-struct" href="libnm/NMSettingMacvlan.html#NMSettingMacvlan-struct">
 <ANCHOR id="NMSettingMacvlanMode" href="libnm/NMSettingMacvlan.html#NMSettingMacvlanMode">
 <ANCHOR id="NM-SETTING-MACVLAN-MODE-UNKNOWN:CAPS" href="libnm/NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE-UNKNOWN:CAPS">
 <ANCHOR id="NM-SETTING-MACVLAN-MODE-VEPA:CAPS" href="libnm/NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE-VEPA:CAPS">
@@ -1556,6 +1581,7 @@
 <ANCHOR id="NM-SETTING-OLPC-MESH-SSID:CAPS" href="libnm/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SSID:CAPS">
 <ANCHOR id="NM-SETTING-OLPC-MESH-CHANNEL:CAPS" href="libnm/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-CHANNEL:CAPS">
 <ANCHOR id="NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS" href="libnm/NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS">
+<ANCHOR id="NMSettingOlpcMesh-struct" href="libnm/NMSettingOlpcMesh.html#NMSettingOlpcMesh-struct">
 <ANCHOR id="NMSettingOlpcMesh.property-details" href="libnm/NMSettingOlpcMesh.html#NMSettingOlpcMesh.property-details">
 <ANCHOR id="NMSettingOlpcMesh--channel" href="libnm/NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel">
 <ANCHOR id="NMSettingOlpcMesh--dhcp-anycast-address" href="libnm/NMSettingOlpcMesh.html#NMSettingOlpcMesh--dhcp-anycast-address">
@@ -1606,6 +1632,7 @@
 <ANCHOR id="NM-SETTING-PPP-MTU:CAPS" href="libnm/NMSettingPpp.html#NM-SETTING-PPP-MTU:CAPS">
 <ANCHOR id="NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS" href="libnm/NMSettingPpp.html#NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS">
 <ANCHOR id="NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS" href="libnm/NMSettingPpp.html#NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS">
+<ANCHOR id="NMSettingPpp-struct" href="libnm/NMSettingPpp.html#NMSettingPpp-struct">
 <ANCHOR id="NMSettingPpp.property-details" href="libnm/NMSettingPpp.html#NMSettingPpp.property-details">
 <ANCHOR id="NMSettingPpp--baud" href="libnm/NMSettingPpp.html#NMSettingPpp--baud">
 <ANCHOR id="NMSettingPpp--crtscts" href="libnm/NMSettingPpp.html#NMSettingPpp--crtscts">
@@ -1643,6 +1670,7 @@
 <ANCHOR id="NM-SETTING-PPPOE-USERNAME:CAPS" href="libnm/NMSettingPppoe.html#NM-SETTING-PPPOE-USERNAME:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-PASSWORD:CAPS" href="libnm/NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD:CAPS">
 <ANCHOR id="NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS" href="libnm/NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS">
+<ANCHOR id="NMSettingPppoe-struct" href="libnm/NMSettingPppoe.html#NMSettingPppoe-struct">
 <ANCHOR id="NMSettingPppoe.property-details" href="libnm/NMSettingPppoe.html#NMSettingPppoe.property-details">
 <ANCHOR id="NMSettingPppoe--password" href="libnm/NMSettingPppoe.html#NMSettingPppoe--password">
 <ANCHOR id="NMSettingPppoe--password-flags" href="libnm/NMSettingPppoe.html#NMSettingPppoe--password-flags">
@@ -1672,6 +1700,7 @@
 <ANCHOR id="NM-SETTING-SERIAL-PARITY:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-PARITY:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-STOPBITS:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-STOPBITS:CAPS">
 <ANCHOR id="NM-SETTING-SERIAL-SEND-DELAY:CAPS" href="libnm/NMSettingSerial.html#NM-SETTING-SERIAL-SEND-DELAY:CAPS">
+<ANCHOR id="NMSettingSerial-struct" href="libnm/NMSettingSerial.html#NMSettingSerial-struct">
 <ANCHOR id="NMSettingSerial.property-details" href="libnm/NMSettingSerial.html#NMSettingSerial.property-details">
 <ANCHOR id="NMSettingSerial--baud" href="libnm/NMSettingSerial.html#NMSettingSerial--baud">
 <ANCHOR id="NMSettingSerial--bits" href="libnm/NMSettingSerial.html#NMSettingSerial--bits">
@@ -1690,6 +1719,7 @@
 <ANCHOR id="NMSettingTeam.other_details" href="libnm/NMSettingTeam.html#NMSettingTeam.other_details">
 <ANCHOR id="NM-SETTING-TEAM-SETTING-NAME:CAPS" href="libnm/NMSettingTeam.html#NM-SETTING-TEAM-SETTING-NAME:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-CONFIG:CAPS" href="libnm/NMSettingTeam.html#NM-SETTING-TEAM-CONFIG:CAPS">
+<ANCHOR id="NMSettingTeam-struct" href="libnm/NMSettingTeam.html#NMSettingTeam-struct">
 <ANCHOR id="NMSettingTeam.property-details" href="libnm/NMSettingTeam.html#NMSettingTeam.property-details">
 <ANCHOR id="NMSettingTeam--config" href="libnm/NMSettingTeam.html#NMSettingTeam--config">
 <ANCHOR id="NMSettingTeamPort" href="libnm/NMSettingTeamPort.html">
@@ -1704,6 +1734,7 @@
 <ANCHOR id="NMSettingTeamPort.other_details" href="libnm/NMSettingTeamPort.html#NMSettingTeamPort.other_details">
 <ANCHOR id="NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS" href="libnm/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS">
 <ANCHOR id="NM-SETTING-TEAM-PORT-CONFIG:CAPS" href="libnm/NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS">
+<ANCHOR id="NMSettingTeamPort-struct" href="libnm/NMSettingTeamPort.html#NMSettingTeamPort-struct">
 <ANCHOR id="NMSettingTeamPort.property-details" href="libnm/NMSettingTeamPort.html#NMSettingTeamPort.property-details">
 <ANCHOR id="NMSettingTeamPort--config" href="libnm/NMSettingTeamPort.html#NMSettingTeamPort--config">
 <ANCHOR id="NMSettingTun" href="libnm/NMSettingTun.html">
@@ -1732,6 +1763,7 @@
 <ANCHOR id="NM-SETTING-TUN-MODE-UNKNOWN:CAPS" href="libnm/NMSettingTun.html#NM-SETTING-TUN-MODE-UNKNOWN:CAPS">
 <ANCHOR id="NM-SETTING-TUN-MODE-TUN:CAPS" href="libnm/NMSettingTun.html#NM-SETTING-TUN-MODE-TUN:CAPS">
 <ANCHOR id="NM-SETTING-TUN-MODE-TAP:CAPS" href="libnm/NMSettingTun.html#NM-SETTING-TUN-MODE-TAP:CAPS">
+<ANCHOR id="NMSettingTun-struct" href="libnm/NMSettingTun.html#NMSettingTun-struct">
 <ANCHOR id="NMSettingTun.property-details" href="libnm/NMSettingTun.html#NMSettingTun.property-details">
 <ANCHOR id="NMSettingTun--group" href="libnm/NMSettingTun.html#NMSettingTun--group">
 <ANCHOR id="NMSettingTun--mode" href="libnm/NMSettingTun.html#NMSettingTun--mode">
@@ -1766,6 +1798,7 @@
 <ANCHOR id="NM-SETTING-VLAN-FLAGS:CAPS" href="libnm/NMSettingVlan.html#NM-SETTING-VLAN-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS">
 <ANCHOR id="NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS">
+<ANCHOR id="NMSettingVlan-struct" href="libnm/NMSettingVlan.html#NMSettingVlan-struct">
 <ANCHOR id="NMVlanPriorityMap" href="libnm/NMSettingVlan.html#NMVlanPriorityMap">
 <ANCHOR id="NM-VLAN-INGRESS-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-INGRESS-MAP:CAPS">
 <ANCHOR id="NM-VLAN-EGRESS-MAP:CAPS" href="libnm/NMSettingVlan.html#NM-VLAN-EGRESS-MAP:CAPS">
@@ -1811,6 +1844,7 @@
 <ANCHOR id="NM-SETTING-VPN-DATA:CAPS" href="libnm/NMSettingVpn.html#NM-SETTING-VPN-DATA:CAPS">
 <ANCHOR id="NM-SETTING-VPN-SECRETS:CAPS" href="libnm/NMSettingVpn.html#NM-SETTING-VPN-SECRETS:CAPS">
 <ANCHOR id="NM-SETTING-VPN-TIMEOUT:CAPS" href="libnm/NMSettingVpn.html#NM-SETTING-VPN-TIMEOUT:CAPS">
+<ANCHOR id="NMSettingVpn-struct" href="libnm/NMSettingVpn.html#NMSettingVpn-struct">
 <ANCHOR id="NMSettingVpn.property-details" href="libnm/NMSettingVpn.html#NMSettingVpn.property-details">
 <ANCHOR id="NMSettingVpn--data" href="libnm/NMSettingVpn.html#NMSettingVpn--data">
 <ANCHOR id="NMSettingVpn--persistent" href="libnm/NMSettingVpn.html#NMSettingVpn--persistent">
@@ -1860,6 +1894,7 @@
 <ANCHOR id="NM-SETTING-VXLAN-RSC:CAPS" href="libnm/NMSettingVxlan.html#NM-SETTING-VXLAN-RSC:CAPS">
 <ANCHOR id="NM-SETTING-VXLAN-L2-MISS:CAPS" href="libnm/NMSettingVxlan.html#NM-SETTING-VXLAN-L2-MISS:CAPS">
 <ANCHOR id="NM-SETTING-VXLAN-L3-MISS:CAPS" href="libnm/NMSettingVxlan.html#NM-SETTING-VXLAN-L3-MISS:CAPS">
+<ANCHOR id="NMSettingVxlan-struct" href="libnm/NMSettingVxlan.html#NMSettingVxlan-struct">
 <ANCHOR id="NMSettingVxlan.property-details" href="libnm/NMSettingVxlan.html#NMSettingVxlan.property-details">
 <ANCHOR id="NMSettingVxlan--ageing" href="libnm/NMSettingVxlan.html#NMSettingVxlan--ageing">
 <ANCHOR id="NMSettingVxlan--destination-port" href="libnm/NMSettingVxlan.html#NMSettingVxlan--destination-port">
@@ -1891,6 +1926,7 @@
 <ANCHOR id="NM-SETTING-WIMAX-SETTING-NAME:CAPS" href="libnm/NMSettingWimax.html#NM-SETTING-WIMAX-SETTING-NAME:CAPS">
 <ANCHOR id="NM-SETTING-WIMAX-NETWORK-NAME:CAPS" href="libnm/NMSettingWimax.html#NM-SETTING-WIMAX-NETWORK-NAME:CAPS">
 <ANCHOR id="NM-SETTING-WIMAX-MAC-ADDRESS:CAPS" href="libnm/NMSettingWimax.html#NM-SETTING-WIMAX-MAC-ADDRESS:CAPS">
+<ANCHOR id="NMSettingWimax-struct" href="libnm/NMSettingWimax.html#NMSettingWimax-struct">
 <ANCHOR id="NMSettingWimax.property-details" href="libnm/NMSettingWimax.html#NMSettingWimax.property-details">
 <ANCHOR id="NMSettingWimax--mac-address" href="libnm/NMSettingWimax.html#NMSettingWimax--mac-address">
 <ANCHOR id="NMSettingWimax--network-name" href="libnm/NMSettingWimax.html#NMSettingWimax--network-name">
@@ -1954,6 +1990,7 @@
 <ANCHOR id="NM-SETTING-WIRED-S390-OPTIONS:CAPS" href="libnm/NMSettingWired.html#NM-SETTING-WIRED-S390-OPTIONS:CAPS">
 <ANCHOR id="NM-SETTING-WIRED-WAKE-ON-LAN:CAPS" href="libnm/NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN:CAPS">
 <ANCHOR id="NM-SETTING-WIRED-WAKE-ON-LAN-PASSWORD:CAPS" href="libnm/NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN-PASSWORD:CAPS">
+<ANCHOR id="NMSettingWired-struct" href="libnm/NMSettingWired.html#NMSettingWired-struct">
 <ANCHOR id="NMSettingWired.property-details" href="libnm/NMSettingWired.html#NMSettingWired.property-details">
 <ANCHOR id="NMSettingWired--auto-negotiate" href="libnm/NMSettingWired.html#NMSettingWired--auto-negotiate">
 <ANCHOR id="NMSettingWired--cloned-mac-address" href="libnm/NMSettingWired.html#NMSettingWired--cloned-mac-address">
@@ -2027,6 +2064,7 @@
 <ANCHOR id="NM-SETTING-WIRELESS-POWERSAVE-ENABLE:CAPS" href="libnm/NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-ENABLE:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-POWERSAVE-NUM:CAPS" href="libnm/NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-NUM:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-POWERSAVE-LAST:CAPS" href="libnm/NMSettingWireless.html#NM-SETTING-WIRELESS-POWERSAVE-LAST:CAPS">
+<ANCHOR id="NMSettingWireless-struct" href="libnm/NMSettingWireless.html#NMSettingWireless-struct">
 <ANCHOR id="NMSettingWireless.property-details" href="libnm/NMSettingWireless.html#NMSettingWireless.property-details">
 <ANCHOR id="NMSettingWireless--band" href="libnm/NMSettingWireless.html#NMSettingWireless--band">
 <ANCHOR id="NMSettingWireless--bssid" href="libnm/NMSettingWireless.html#NMSettingWireless--bssid">
@@ -2105,6 +2143,7 @@
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS">
 <ANCHOR id="NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS" href="libnm/NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS">
+<ANCHOR id="NMSettingWirelessSecurity-struct" href="libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">
 <ANCHOR id="NMSettingWirelessSecurity.property-details" href="libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity.property-details">
 <ANCHOR id="NMSettingWirelessSecurity--auth-alg" href="libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg">
 <ANCHOR id="NMSettingWirelessSecurity--group" href="libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group">
@@ -2130,6 +2169,7 @@
 <ANCHOR id="NMLldpNeighbor" href="libnm/NMDevice.html#NMLldpNeighbor">
 <ANCHOR id="NMDevice.other" href="libnm/NMDevice.html#NMDevice.other">
 <ANCHOR id="NMDevice.object-hierarchy" href="libnm/NMDevice.html#NMDevice.object-hierarchy">
+<ANCHOR id="NMDevice.implemented-interfaces" href="libnm/NMDevice.html#NMDevice.implemented-interfaces">
 <ANCHOR id="NMDevice.description" href="libnm/NMDevice.html#NMDevice.description">
 <ANCHOR id="NMDevice.functions_details" href="libnm/NMDevice.html#NMDevice.functions_details">
 <ANCHOR id="nm-device-get-iface" href="libnm/NMDevice.html#nm-device-get-iface">
@@ -2217,6 +2257,7 @@
 <ANCHOR id="NM-DEVICE-MTU:CAPS" href="libnm/NMDevice.html#NM-DEVICE-MTU:CAPS">
 <ANCHOR id="NM-DEVICE-METERED:CAPS" href="libnm/NMDevice.html#NM-DEVICE-METERED:CAPS">
 <ANCHOR id="NM-DEVICE-LLDP-NEIGHBORS:CAPS" href="libnm/NMDevice.html#NM-DEVICE-LLDP-NEIGHBORS:CAPS">
+<ANCHOR id="NMDevice-struct" href="libnm/NMDevice.html#NMDevice-struct">
 <ANCHOR id="NMDevice.property-details" href="libnm/NMDevice.html#NMDevice.property-details">
 <ANCHOR id="NMDevice--active-connection" href="libnm/NMDevice.html#NMDevice--active-connection">
 <ANCHOR id="NMDevice--autoconnect" href="libnm/NMDevice.html#NMDevice--autoconnect">
@@ -2252,11 +2293,13 @@
 <ANCHOR id="NMDeviceAdsl.properties" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.properties">
 <ANCHOR id="NMDeviceAdsl.other" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.other">
 <ANCHOR id="NMDeviceAdsl.object-hierarchy" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.object-hierarchy">
+<ANCHOR id="NMDeviceAdsl.implemented-interfaces" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.implemented-interfaces">
 <ANCHOR id="NMDeviceAdsl.description" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.description">
 <ANCHOR id="NMDeviceAdsl.functions_details" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.functions_details">
 <ANCHOR id="nm-device-adsl-get-carrier" href="libnm/NMDeviceAdsl.html#nm-device-adsl-get-carrier">
 <ANCHOR id="NMDeviceAdsl.other_details" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.other_details">
 <ANCHOR id="NM-DEVICE-ADSL-CARRIER:CAPS" href="libnm/NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS">
+<ANCHOR id="NMDeviceAdsl-struct" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl-struct">
 <ANCHOR id="NMDeviceAdsl.property-details" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl.property-details">
 <ANCHOR id="NMDeviceAdsl--carrier" href="libnm/NMDeviceAdsl.html#NMDeviceAdsl--carrier">
 <ANCHOR id="NMDeviceBond" href="libnm/NMDeviceBond.html">
@@ -2264,6 +2307,7 @@
 <ANCHOR id="NMDeviceBond.properties" href="libnm/NMDeviceBond.html#NMDeviceBond.properties">
 <ANCHOR id="NMDeviceBond.other" href="libnm/NMDeviceBond.html#NMDeviceBond.other">
 <ANCHOR id="NMDeviceBond.object-hierarchy" href="libnm/NMDeviceBond.html#NMDeviceBond.object-hierarchy">
+<ANCHOR id="NMDeviceBond.implemented-interfaces" href="libnm/NMDeviceBond.html#NMDeviceBond.implemented-interfaces">
 <ANCHOR id="NMDeviceBond.description" href="libnm/NMDeviceBond.html#NMDeviceBond.description">
 <ANCHOR id="NMDeviceBond.functions_details" href="libnm/NMDeviceBond.html#NMDeviceBond.functions_details">
 <ANCHOR id="nm-device-bond-get-hw-address" href="libnm/NMDeviceBond.html#nm-device-bond-get-hw-address">
@@ -2273,6 +2317,7 @@
 <ANCHOR id="NM-DEVICE-BOND-HW-ADDRESS:CAPS" href="libnm/NMDeviceBond.html#NM-DEVICE-BOND-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-BOND-CARRIER:CAPS" href="libnm/NMDeviceBond.html#NM-DEVICE-BOND-CARRIER:CAPS">
 <ANCHOR id="NM-DEVICE-BOND-SLAVES:CAPS" href="libnm/NMDeviceBond.html#NM-DEVICE-BOND-SLAVES:CAPS">
+<ANCHOR id="NMDeviceBond-struct" href="libnm/NMDeviceBond.html#NMDeviceBond-struct">
 <ANCHOR id="NMDeviceBond.property-details" href="libnm/NMDeviceBond.html#NMDeviceBond.property-details">
 <ANCHOR id="NMDeviceBond--carrier" href="libnm/NMDeviceBond.html#NMDeviceBond--carrier">
 <ANCHOR id="NMDeviceBond--hw-address" href="libnm/NMDeviceBond.html#NMDeviceBond--hw-address">
@@ -2282,6 +2327,7 @@
 <ANCHOR id="NMDeviceBridge.properties" href="libnm/NMDeviceBridge.html#NMDeviceBridge.properties">
 <ANCHOR id="NMDeviceBridge.other" href="libnm/NMDeviceBridge.html#NMDeviceBridge.other">
 <ANCHOR id="NMDeviceBridge.object-hierarchy" href="libnm/NMDeviceBridge.html#NMDeviceBridge.object-hierarchy">
+<ANCHOR id="NMDeviceBridge.implemented-interfaces" href="libnm/NMDeviceBridge.html#NMDeviceBridge.implemented-interfaces">
 <ANCHOR id="NMDeviceBridge.description" href="libnm/NMDeviceBridge.html#NMDeviceBridge.description">
 <ANCHOR id="NMDeviceBridge.functions_details" href="libnm/NMDeviceBridge.html#NMDeviceBridge.functions_details">
 <ANCHOR id="nm-device-bridge-get-hw-address" href="libnm/NMDeviceBridge.html#nm-device-bridge-get-hw-address">
@@ -2291,6 +2337,7 @@
 <ANCHOR id="NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS" href="libnm/NMDeviceBridge.html#NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-BRIDGE-CARRIER:CAPS" href="libnm/NMDeviceBridge.html#NM-DEVICE-BRIDGE-CARRIER:CAPS">
 <ANCHOR id="NM-DEVICE-BRIDGE-SLAVES:CAPS" href="libnm/NMDeviceBridge.html#NM-DEVICE-BRIDGE-SLAVES:CAPS">
+<ANCHOR id="NMDeviceBridge-struct" href="libnm/NMDeviceBridge.html#NMDeviceBridge-struct">
 <ANCHOR id="NMDeviceBridge.property-details" href="libnm/NMDeviceBridge.html#NMDeviceBridge.property-details">
 <ANCHOR id="NMDeviceBridge--carrier" href="libnm/NMDeviceBridge.html#NMDeviceBridge--carrier">
 <ANCHOR id="NMDeviceBridge--hw-address" href="libnm/NMDeviceBridge.html#NMDeviceBridge--hw-address">
@@ -2300,6 +2347,7 @@
 <ANCHOR id="NMDeviceBt.properties" href="libnm/NMDeviceBt.html#NMDeviceBt.properties">
 <ANCHOR id="NMDeviceBt.other" href="libnm/NMDeviceBt.html#NMDeviceBt.other">
 <ANCHOR id="NMDeviceBt.object-hierarchy" href="libnm/NMDeviceBt.html#NMDeviceBt.object-hierarchy">
+<ANCHOR id="NMDeviceBt.implemented-interfaces" href="libnm/NMDeviceBt.html#NMDeviceBt.implemented-interfaces">
 <ANCHOR id="NMDeviceBt.description" href="libnm/NMDeviceBt.html#NMDeviceBt.description">
 <ANCHOR id="NMDeviceBt.functions_details" href="libnm/NMDeviceBt.html#NMDeviceBt.functions_details">
 <ANCHOR id="nm-device-bt-get-hw-address" href="libnm/NMDeviceBt.html#nm-device-bt-get-hw-address">
@@ -2309,6 +2357,7 @@
 <ANCHOR id="NM-DEVICE-BT-HW-ADDRESS:CAPS" href="libnm/NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-BT-NAME:CAPS" href="libnm/NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS">
 <ANCHOR id="NM-DEVICE-BT-CAPABILITIES:CAPS" href="libnm/NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS">
+<ANCHOR id="NMDeviceBt-struct" href="libnm/NMDeviceBt.html#NMDeviceBt-struct">
 <ANCHOR id="NMDeviceBt.property-details" href="libnm/NMDeviceBt.html#NMDeviceBt.property-details">
 <ANCHOR id="NMDeviceBt--bt-capabilities" href="libnm/NMDeviceBt.html#NMDeviceBt--bt-capabilities">
 <ANCHOR id="NMDeviceBt--hw-address" href="libnm/NMDeviceBt.html#NMDeviceBt--hw-address">
@@ -2318,6 +2367,7 @@
 <ANCHOR id="NMDeviceEthernet.properties" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.properties">
 <ANCHOR id="NMDeviceEthernet.other" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.other">
 <ANCHOR id="NMDeviceEthernet.object-hierarchy" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.object-hierarchy">
+<ANCHOR id="NMDeviceEthernet.implemented-interfaces" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.implemented-interfaces">
 <ANCHOR id="NMDeviceEthernet.description" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.description">
 <ANCHOR id="NMDeviceEthernet.functions_details" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.functions_details">
 <ANCHOR id="nm-device-ethernet-get-hw-address" href="libnm/NMDeviceEthernet.html#nm-device-ethernet-get-hw-address">
@@ -2331,6 +2381,7 @@
 <ANCHOR id="NM-DEVICE-ETHERNET-SPEED:CAPS" href="libnm/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-SPEED:CAPS">
 <ANCHOR id="NM-DEVICE-ETHERNET-CARRIER:CAPS" href="libnm/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-CARRIER:CAPS">
 <ANCHOR id="NM-DEVICE-ETHERNET-S390-SUBCHANNELS:CAPS" href="libnm/NMDeviceEthernet.html#NM-DEVICE-ETHERNET-S390-SUBCHANNELS:CAPS">
+<ANCHOR id="NMDeviceEthernet-struct" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet-struct">
 <ANCHOR id="NMDeviceEthernet.property-details" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet.property-details">
 <ANCHOR id="NMDeviceEthernet--carrier" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet--carrier">
 <ANCHOR id="NMDeviceEthernet--hw-address" href="libnm/NMDeviceEthernet.html#NMDeviceEthernet--hw-address">
@@ -2342,12 +2393,14 @@
 <ANCHOR id="NMDeviceGeneric.properties" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.properties">
 <ANCHOR id="NMDeviceGeneric.other" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.other">
 <ANCHOR id="NMDeviceGeneric.object-hierarchy" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.object-hierarchy">
+<ANCHOR id="NMDeviceGeneric.implemented-interfaces" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.implemented-interfaces">
 <ANCHOR id="NMDeviceGeneric.description" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.description">
 <ANCHOR id="NMDeviceGeneric.functions_details" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.functions_details">
 <ANCHOR id="nm-device-generic-get-hw-address" href="libnm/NMDeviceGeneric.html#nm-device-generic-get-hw-address">
 <ANCHOR id="NMDeviceGeneric.other_details" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.other_details">
 <ANCHOR id="NM-DEVICE-GENERIC-HW-ADDRESS:CAPS" href="libnm/NMDeviceGeneric.html#NM-DEVICE-GENERIC-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS" href="libnm/NMDeviceGeneric.html#NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS">
+<ANCHOR id="NMDeviceGeneric-struct" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric-struct">
 <ANCHOR id="NMDeviceGeneric.property-details" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric.property-details">
 <ANCHOR id="NMDeviceGeneric--hw-address" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric--hw-address">
 <ANCHOR id="NMDeviceGeneric--type-description" href="libnm/NMDeviceGeneric.html#NMDeviceGeneric--type-description">
@@ -2356,6 +2409,7 @@
 <ANCHOR id="NMDeviceInfiniband.properties" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.properties">
 <ANCHOR id="NMDeviceInfiniband.other" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.other">
 <ANCHOR id="NMDeviceInfiniband.object-hierarchy" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.object-hierarchy">
+<ANCHOR id="NMDeviceInfiniband.implemented-interfaces" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.implemented-interfaces">
 <ANCHOR id="NMDeviceInfiniband.description" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.description">
 <ANCHOR id="NMDeviceInfiniband.functions_details" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.functions_details">
 <ANCHOR id="nm-device-infiniband-get-hw-address" href="libnm/NMDeviceInfiniband.html#nm-device-infiniband-get-hw-address">
@@ -2363,6 +2417,7 @@
 <ANCHOR id="NMDeviceInfiniband.other_details" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.other_details">
 <ANCHOR id="NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS" href="libnm/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-INFINIBAND-CARRIER:CAPS" href="libnm/NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-CARRIER:CAPS">
+<ANCHOR id="NMDeviceInfiniband-struct" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband-struct">
 <ANCHOR id="NMDeviceInfiniband.property-details" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband.property-details">
 <ANCHOR id="NMDeviceInfiniband--carrier" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband--carrier">
 <ANCHOR id="NMDeviceInfiniband--hw-address" href="libnm/NMDeviceInfiniband.html#NMDeviceInfiniband--hw-address">
@@ -2371,6 +2426,7 @@
 <ANCHOR id="NMDeviceIPTunnel.properties" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.properties">
 <ANCHOR id="NMDeviceIPTunnel.other" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.other">
 <ANCHOR id="NMDeviceIPTunnel.object-hierarchy" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.object-hierarchy">
+<ANCHOR id="NMDeviceIPTunnel.implemented-interfaces" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.implemented-interfaces">
 <ANCHOR id="NMDeviceIPTunnel.description" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.description">
 <ANCHOR id="NMDeviceIPTunnel.functions_details" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.functions_details">
 <ANCHOR id="nm-device-ip-tunnel-get-parent" href="libnm/NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-parent">
@@ -2396,6 +2452,7 @@
 <ANCHOR id="NM-DEVICE-IP-TUNNEL-OUTPUT-KEY:CAPS" href="libnm/NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-OUTPUT-KEY:CAPS">
 <ANCHOR id="NM-DEVICE-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS" href="libnm/NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS">
 <ANCHOR id="NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS" href="libnm/NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS">
+<ANCHOR id="NMDeviceIPTunnel-struct" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct">
 <ANCHOR id="NMDeviceIPTunnel.property-details" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel.property-details">
 <ANCHOR id="NMDeviceIPTunnel--encapsulation-limit" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel--encapsulation-limit">
 <ANCHOR id="NMDeviceIPTunnel--flow-label" href="libnm/NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label">
@@ -2413,6 +2470,7 @@
 <ANCHOR id="NMDeviceMacvlan.properties" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.properties">
 <ANCHOR id="NMDeviceMacvlan.other" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.other">
 <ANCHOR id="NMDeviceMacvlan.object-hierarchy" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.object-hierarchy">
+<ANCHOR id="NMDeviceMacvlan.implemented-interfaces" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.implemented-interfaces">
 <ANCHOR id="NMDeviceMacvlan.description" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.description">
 <ANCHOR id="NMDeviceMacvlan.functions_details" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.functions_details">
 <ANCHOR id="nm-device-macvlan-get-parent" href="libnm/NMDeviceMacvlan.html#nm-device-macvlan-get-parent">
@@ -2426,6 +2484,7 @@
 <ANCHOR id="NM-DEVICE-MACVLAN-NO-PROMISC:CAPS" href="libnm/NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-NO-PROMISC:CAPS">
 <ANCHOR id="NM-DEVICE-MACVLAN-TAP:CAPS" href="libnm/NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-TAP:CAPS">
 <ANCHOR id="NM-DEVICE-MACVLAN-HW-ADDRESS:CAPS" href="libnm/NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-HW-ADDRESS:CAPS">
+<ANCHOR id="NMDeviceMacvlan-struct" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan-struct">
 <ANCHOR id="NMDeviceMacvlan.property-details" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan.property-details">
 <ANCHOR id="NMDeviceMacvlan--hw-address" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan--hw-address">
 <ANCHOR id="NMDeviceMacvlan--mode" href="libnm/NMDeviceMacvlan.html#NMDeviceMacvlan--mode">
@@ -2437,6 +2496,7 @@
 <ANCHOR id="NMDeviceModem.properties" href="libnm/NMDeviceModem.html#NMDeviceModem.properties">
 <ANCHOR id="NMDeviceModem.other" href="libnm/NMDeviceModem.html#NMDeviceModem.other">
 <ANCHOR id="NMDeviceModem.object-hierarchy" href="libnm/NMDeviceModem.html#NMDeviceModem.object-hierarchy">
+<ANCHOR id="NMDeviceModem.implemented-interfaces" href="libnm/NMDeviceModem.html#NMDeviceModem.implemented-interfaces">
 <ANCHOR id="NMDeviceModem.description" href="libnm/NMDeviceModem.html#NMDeviceModem.description">
 <ANCHOR id="NMDeviceModem.functions_details" href="libnm/NMDeviceModem.html#NMDeviceModem.functions_details">
 <ANCHOR id="nm-device-modem-get-modem-capabilities" href="libnm/NMDeviceModem.html#nm-device-modem-get-modem-capabilities">
@@ -2444,6 +2504,7 @@
 <ANCHOR id="NMDeviceModem.other_details" href="libnm/NMDeviceModem.html#NMDeviceModem.other_details">
 <ANCHOR id="NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS" href="libnm/NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS">
 <ANCHOR id="NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS" href="libnm/NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS">
+<ANCHOR id="NMDeviceModem-struct" href="libnm/NMDeviceModem.html#NMDeviceModem-struct">
 <ANCHOR id="NMDeviceModem.property-details" href="libnm/NMDeviceModem.html#NMDeviceModem.property-details">
 <ANCHOR id="NMDeviceModem--current-capabilities" href="libnm/NMDeviceModem.html#NMDeviceModem--current-capabilities">
 <ANCHOR id="NMDeviceModem--modem-capabilities" href="libnm/NMDeviceModem.html#NMDeviceModem--modem-capabilities">
@@ -2452,6 +2513,7 @@
 <ANCHOR id="NMDeviceOlpcMesh.properties" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.properties">
 <ANCHOR id="NMDeviceOlpcMesh.other" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.other">
 <ANCHOR id="NMDeviceOlpcMesh.object-hierarchy" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.object-hierarchy">
+<ANCHOR id="NMDeviceOlpcMesh.implemented-interfaces" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.implemented-interfaces">
 <ANCHOR id="NMDeviceOlpcMesh.description" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.description">
 <ANCHOR id="NMDeviceOlpcMesh.functions_details" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.functions_details">
 <ANCHOR id="nm-device-olpc-mesh-get-hw-address" href="libnm/NMDeviceOlpcMesh.html#nm-device-olpc-mesh-get-hw-address">
@@ -2461,6 +2523,7 @@
 <ANCHOR id="NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS" href="libnm/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-OLPC-MESH-COMPANION:CAPS" href="libnm/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-COMPANION:CAPS">
 <ANCHOR id="NM-DEVICE-OLPC-MESH-ACTIVE-CHANNEL:CAPS" href="libnm/NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ACTIVE-CHANNEL:CAPS">
+<ANCHOR id="NMDeviceOlpcMesh-struct" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh-struct">
 <ANCHOR id="NMDeviceOlpcMesh.property-details" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh.property-details">
 <ANCHOR id="NMDeviceOlpcMesh--active-channel" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--active-channel">
 <ANCHOR id="NMDeviceOlpcMesh--companion" href="libnm/NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--companion">
@@ -2470,6 +2533,7 @@
 <ANCHOR id="NMDeviceTeam.properties" href="libnm/NMDeviceTeam.html#NMDeviceTeam.properties">
 <ANCHOR id="NMDeviceTeam.other" href="libnm/NMDeviceTeam.html#NMDeviceTeam.other">
 <ANCHOR id="NMDeviceTeam.object-hierarchy" href="libnm/NMDeviceTeam.html#NMDeviceTeam.object-hierarchy">
+<ANCHOR id="NMDeviceTeam.implemented-interfaces" href="libnm/NMDeviceTeam.html#NMDeviceTeam.implemented-interfaces">
 <ANCHOR id="NMDeviceTeam.description" href="libnm/NMDeviceTeam.html#NMDeviceTeam.description">
 <ANCHOR id="NMDeviceTeam.functions_details" href="libnm/NMDeviceTeam.html#NMDeviceTeam.functions_details">
 <ANCHOR id="nm-device-team-get-hw-address" href="libnm/NMDeviceTeam.html#nm-device-team-get-hw-address">
@@ -2479,6 +2543,7 @@
 <ANCHOR id="NM-DEVICE-TEAM-HW-ADDRESS:CAPS" href="libnm/NMDeviceTeam.html#NM-DEVICE-TEAM-HW-ADDRESS:CAPS">
 <ANCHOR id="NM-DEVICE-TEAM-CARRIER:CAPS" href="libnm/NMDeviceTeam.html#NM-DEVICE-TEAM-CARRIER:CAPS">
 <ANCHOR id="NM-DEVICE-TEAM-SLAVES:CAPS" href="libnm/NMDeviceTeam.html#NM-DEVICE-TEAM-SLAVES:CAPS">
+<ANCHOR id="NMDeviceTeam-struct" href="libnm/NMDeviceTeam.html#NMDeviceTeam-struct">
 <ANCHOR id="NMDeviceTeam.property-details" href="libnm/NMDeviceTeam.html#NMDeviceTeam.property-details">
 <ANCHOR id="NMDeviceTeam--carrier" href="libnm/NMDeviceTeam.html#NMDeviceTeam--carrier">
 <ANCHOR id="NMDeviceTeam--hw-address" href="libnm/NMDeviceTeam.html#NMDeviceTeam--hw-address">
@@ -2488,6 +2553,7 @@
 <ANCHOR id="NMDeviceTun.properties" href="libnm/NMDeviceTun.html#NMDeviceTun.properties">
 <ANCHOR id="NMDeviceTun.other" href="libnm/NMDeviceTun.html#NMDeviceTun.other">
 <ANCHOR id="NMDeviceTun.object-hierarchy" href="libnm/NMDeviceTun.html#NMDeviceTun.object-hierarchy">
+<ANCHOR id="NMDeviceTun.implemented-interfaces" href="libnm/NMDeviceTun.html#NMDeviceTun.implemented-interfaces">
 <ANCHOR id="NMDeviceTun.description" href="libnm/NMDeviceTun.html#NMDeviceTun.description">
 <ANCHOR id="NMDeviceTun.functions_details" href="libnm/NMDeviceTun.html#NMDeviceTun.functions_details">
 <ANCHOR id="nm-device-tun-get-hw-address" href="libnm/NMDeviceTun.html#nm-device-tun-get-hw-address">
@@ -2505,6 +2571,7 @@
 <ANCHOR id="NM-DEVICE-TUN-NO-PI:CAPS" href="libnm/NMDeviceTun.html#NM-DEVICE-TUN-NO-PI:CAPS">
 <ANCHOR id="NM-DEVICE-TUN-VNET-HDR:CAPS" href="libnm/NMDeviceTun.html#NM-DEVICE-TUN-VNET-HDR:CAPS">
 <ANCHOR id="NM-DEVICE-TUN-MULTI-QUEUE:CAPS" href="libnm/NMDeviceTun.html#NM-DEVICE-TUN-MULTI-QUEUE:CAPS">
+<ANCHOR id="NMDeviceTun-struct" href="libnm/NMDeviceTun.html#NMDeviceTun-struct">
 <ANCHOR id="NMDeviceTun.property-details" href="libnm/NMDeviceTun.html#NMDeviceTun.property-details">
 <ANCHOR id="NMDeviceTun--group" href="libnm/NMDeviceTun.html#NMDeviceTun--group">
 <ANCHOR id="NMDeviceTun--hw-address" href="libnm/NMDeviceTun.html#NMDeviceTun--hw-address">
@@ -2518,6 +2585,7 @@
 <ANCHOR id="NMDeviceVlan.properties" href="libnm/NMDeviceVlan.html#NMDeviceVlan.properties">
 <ANCHOR id="NMDeviceVlan.other" href="libnm/NMDeviceVlan.html#NMDeviceVlan.other">
 <ANCHOR id="NMDeviceVlan.object-hierarchy" href="libnm/NMDeviceVlan.html#NMDeviceVlan.object-hierarchy">
+<ANCHOR id="NMDeviceVlan.implemented-interfaces" href="libnm/NMDeviceVlan.html#NMDeviceVlan.implemented-interfaces">
 <ANCHOR id="NMDeviceVlan.description" href="libnm/NMDeviceVlan.html#NMDeviceVlan.description">
 <ANCHOR id="NMDeviceVlan.functions_details" href="libnm/NMDeviceVlan.html#NMDeviceVlan.functions_details">
 <ANCHOR id="nm-device-vlan-get-hw-address" href="libnm/NMDeviceVlan.html#nm-device-vlan-get-hw-address">
@@ -2529,6 +2597,7 @@
 <ANCHOR id="NM-DEVICE-VLAN-CARRIER:CAPS" href="libnm/NMDeviceVlan.html#NM-DEVICE-VLAN-CARRIER:CAPS">
 <ANCHOR id="NM-DEVICE-VLAN-PARENT:CAPS" href="libnm/NMDeviceVlan.html#NM-DEVICE-VLAN-PARENT:CAPS">
 <ANCHOR id="NM-DEVICE-VLAN-VLAN-ID:CAPS" href="libnm/NMDeviceVlan.html#NM-DEVICE-VLAN-VLAN-ID:CAPS">
+<ANCHOR id="NMDeviceVlan-struct" href="libnm/NMDeviceVlan.html#NMDeviceVlan-struct">
 <ANCHOR id="NMDeviceVlan.property-details" href="libnm/NMDeviceVlan.html#NMDeviceVlan.property-details">
 <ANCHOR id="NMDeviceVlan--carrier" href="libnm/NMDeviceVlan.html#NMDeviceVlan--carrier">
 <ANCHOR id="NMDeviceVlan--hw-address" href="libnm/NMDeviceVlan.html#NMDeviceVlan--hw-address">
@@ -2539,6 +2608,7 @@
 <ANCHOR id="NMDeviceVxlan.properties" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.properties">
 <ANCHOR id="NMDeviceVxlan.other" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.other">
 <ANCHOR id="NMDeviceVxlan.object-hierarchy" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.object-hierarchy">
+<ANCHOR id="NMDeviceVxlan.implemented-interfaces" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.implemented-interfaces">
 <ANCHOR id="NMDeviceVxlan.description" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.description">
 <ANCHOR id="NMDeviceVxlan.functions_details" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.functions_details">
 <ANCHOR id="nm-device-vxlan-get-hw-address" href="libnm/NMDeviceVxlan.html#nm-device-vxlan-get-hw-address">
@@ -2578,6 +2648,7 @@
 <ANCHOR id="NM-DEVICE-VXLAN-L2MISS:CAPS" href="libnm/NMDeviceVxlan.html#NM-DEVICE-VXLAN-L2MISS:CAPS">
 <ANCHOR id="NM-DEVICE-VXLAN-L3MISS:CAPS" href="libnm/NMDeviceVxlan.html#NM-DEVICE-VXLAN-L3MISS:CAPS">
 <ANCHOR id="NM-DEVICE-VXLAN-DST-PORT:CAPS" href="libnm/NMDeviceVxlan.html#NM-DEVICE-VXLAN-DST-PORT:CAPS">
+<ANCHOR id="NMDeviceVxlan-struct" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan-struct">
 <ANCHOR id="NMDeviceVxlan.property-details" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan.property-details">
 <ANCHOR id="NMDeviceVxlan--ageing" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan--ageing">
 <ANCHOR id="NMDeviceVxlan--carrier" href="libnm/NMDeviceVxlan.html#NMDeviceVxlan--carrier">
@@ -2603,6 +2674,7 @@
 <ANCHOR id="NMDeviceWifi.signals" href="libnm/NMDeviceWifi.html#NMDeviceWifi.signals">
 <ANCHOR id="NMDeviceWifi.other" href="libnm/NMDeviceWifi.html#NMDeviceWifi.other">
 <ANCHOR id="NMDeviceWifi.object-hierarchy" href="libnm/NMDeviceWifi.html#NMDeviceWifi.object-hierarchy">
+<ANCHOR id="NMDeviceWifi.implemented-interfaces" href="libnm/NMDeviceWifi.html#NMDeviceWifi.implemented-interfaces">
 <ANCHOR id="NMDeviceWifi.description" href="libnm/NMDeviceWifi.html#NMDeviceWifi.description">
 <ANCHOR id="NMDeviceWifi.functions_details" href="libnm/NMDeviceWifi.html#NMDeviceWifi.functions_details">
 <ANCHOR id="nm-device-wifi-get-hw-address" href="libnm/NMDeviceWifi.html#nm-device-wifi-get-hw-address">
@@ -2626,6 +2698,7 @@
 <ANCHOR id="NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS" href="libnm/NMDeviceWifi.html#NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-CAPABILITIES:CAPS" href="libnm/NMDeviceWifi.html#NM-DEVICE-WIFI-CAPABILITIES:CAPS">
 <ANCHOR id="NM-DEVICE-WIFI-ACCESS-POINTS:CAPS" href="libnm/NMDeviceWifi.html#NM-DEVICE-WIFI-ACCESS-POINTS:CAPS">
+<ANCHOR id="NMDeviceWifi-struct" href="libnm/NMDeviceWifi.html#NMDeviceWifi-struct">
 <ANCHOR id="NMDeviceWifi.property-details" href="libnm/NMDeviceWifi.html#NMDeviceWifi.property-details">
 <ANCHOR id="NMDeviceWifi--access-points" href="libnm/NMDeviceWifi.html#NMDeviceWifi--access-points">
 <ANCHOR id="NMDeviceWifi--active-access-point" href="libnm/NMDeviceWifi.html#NMDeviceWifi--active-access-point">
@@ -2643,6 +2716,7 @@
 <ANCHOR id="NMDeviceWimax.signals" href="libnm/NMDeviceWimax.html#NMDeviceWimax.signals">
 <ANCHOR id="NMDeviceWimax.other" href="libnm/NMDeviceWimax.html#NMDeviceWimax.other">
 <ANCHOR id="NMDeviceWimax.object-hierarchy" href="libnm/NMDeviceWimax.html#NMDeviceWimax.object-hierarchy">
+<ANCHOR id="NMDeviceWimax.implemented-interfaces" href="libnm/NMDeviceWimax.html#NMDeviceWimax.implemented-interfaces">
 <ANCHOR id="NMDeviceWimax.description" href="libnm/NMDeviceWimax.html#NMDeviceWimax.description">
 <ANCHOR id="NMDeviceWimax.functions_details" href="libnm/NMDeviceWimax.html#NMDeviceWimax.functions_details">
 <ANCHOR id="nm-device-wimax-get-hw-address" href="libnm/NMDeviceWimax.html#nm-device-wimax-get-hw-address">
@@ -2663,6 +2737,7 @@
 <ANCHOR id="NM-DEVICE-WIMAX-TX-POWER:CAPS" href="libnm/NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS">
 <ANCHOR id="NM-DEVICE-WIMAX-BSID:CAPS" href="libnm/NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS">
 <ANCHOR id="NM-DEVICE-WIMAX-NSPS:CAPS" href="libnm/NMDeviceWimax.html#NM-DEVICE-WIMAX-NSPS:CAPS">
+<ANCHOR id="NMDeviceWimax-struct" href="libnm/NMDeviceWimax.html#NMDeviceWimax-struct">
 <ANCHOR id="NMDeviceWimax.property-details" href="libnm/NMDeviceWimax.html#NMDeviceWimax.property-details">
 <ANCHOR id="NMDeviceWimax--active-nsp" href="libnm/NMDeviceWimax.html#NMDeviceWimax--active-nsp">
 <ANCHOR id="NMDeviceWimax--bsid" href="libnm/NMDeviceWimax.html#NMDeviceWimax--bsid">
@@ -2680,6 +2755,7 @@
 <ANCHOR id="NMActiveConnection.properties" href="libnm/NMActiveConnection.html#NMActiveConnection.properties">
 <ANCHOR id="NMActiveConnection.other" href="libnm/NMActiveConnection.html#NMActiveConnection.other">
 <ANCHOR id="NMActiveConnection.object-hierarchy" href="libnm/NMActiveConnection.html#NMActiveConnection.object-hierarchy">
+<ANCHOR id="NMActiveConnection.implemented-interfaces" href="libnm/NMActiveConnection.html#NMActiveConnection.implemented-interfaces">
 <ANCHOR id="NMActiveConnection.description" href="libnm/NMActiveConnection.html#NMActiveConnection.description">
 <ANCHOR id="NMActiveConnection.functions_details" href="libnm/NMActiveConnection.html#NMActiveConnection.functions_details">
 <ANCHOR id="nm-active-connection-get-connection" href="libnm/NMActiveConnection.html#nm-active-connection-get-connection">
@@ -2713,6 +2789,7 @@
 <ANCHOR id="NM-ACTIVE-CONNECTION-DHCP6-CONFIG:CAPS" href="libnm/NMActiveConnection.html#NM-ACTIVE-CONNECTION-DHCP6-CONFIG:CAPS">
 <ANCHOR id="NM-ACTIVE-CONNECTION-VPN:CAPS" href="libnm/NMActiveConnection.html#NM-ACTIVE-CONNECTION-VPN:CAPS">
 <ANCHOR id="NM-ACTIVE-CONNECTION-MASTER:CAPS" href="libnm/NMActiveConnection.html#NM-ACTIVE-CONNECTION-MASTER:CAPS">
+<ANCHOR id="NMActiveConnection-struct" href="libnm/NMActiveConnection.html#NMActiveConnection-struct">
 <ANCHOR id="NMActiveConnection.property-details" href="libnm/NMActiveConnection.html#NMActiveConnection.property-details">
 <ANCHOR id="NMActiveConnection--connection" href="libnm/NMActiveConnection.html#NMActiveConnection--connection">
 <ANCHOR id="NMActiveConnection--default" href="libnm/NMActiveConnection.html#NMActiveConnection--default">
@@ -2735,6 +2812,7 @@
 <ANCHOR id="NMVpnConnection.signals" href="libnm/NMVpnConnection.html#NMVpnConnection.signals">
 <ANCHOR id="NMVpnConnection.other" href="libnm/NMVpnConnection.html#NMVpnConnection.other">
 <ANCHOR id="NMVpnConnection.object-hierarchy" href="libnm/NMVpnConnection.html#NMVpnConnection.object-hierarchy">
+<ANCHOR id="NMVpnConnection.implemented-interfaces" href="libnm/NMVpnConnection.html#NMVpnConnection.implemented-interfaces">
 <ANCHOR id="NMVpnConnection.description" href="libnm/NMVpnConnection.html#NMVpnConnection.description">
 <ANCHOR id="NMVpnConnection.functions_details" href="libnm/NMVpnConnection.html#NMVpnConnection.functions_details">
 <ANCHOR id="nm-vpn-connection-get-vpn-state" href="libnm/NMVpnConnection.html#nm-vpn-connection-get-vpn-state">
@@ -2742,6 +2820,7 @@
 <ANCHOR id="NMVpnConnection.other_details" href="libnm/NMVpnConnection.html#NMVpnConnection.other_details">
 <ANCHOR id="NM-VPN-CONNECTION-VPN-STATE:CAPS" href="libnm/NMVpnConnection.html#NM-VPN-CONNECTION-VPN-STATE:CAPS">
 <ANCHOR id="NM-VPN-CONNECTION-BANNER:CAPS" href="libnm/NMVpnConnection.html#NM-VPN-CONNECTION-BANNER:CAPS">
+<ANCHOR id="NMVpnConnection-struct" href="libnm/NMVpnConnection.html#NMVpnConnection-struct">
 <ANCHOR id="NMVpnConnection.property-details" href="libnm/NMVpnConnection.html#NMVpnConnection.property-details">
 <ANCHOR id="NMVpnConnection--banner" href="libnm/NMVpnConnection.html#NMVpnConnection--banner">
 <ANCHOR id="NMVpnConnection--vpn-state" href="libnm/NMVpnConnection.html#NMVpnConnection--vpn-state">
@@ -2752,6 +2831,7 @@
 <ANCHOR id="NMRemoteConnection.properties" href="libnm/NMRemoteConnection.html#NMRemoteConnection.properties">
 <ANCHOR id="NMRemoteConnection.other" href="libnm/NMRemoteConnection.html#NMRemoteConnection.other">
 <ANCHOR id="NMRemoteConnection.object-hierarchy" href="libnm/NMRemoteConnection.html#NMRemoteConnection.object-hierarchy">
+<ANCHOR id="NMRemoteConnection.implemented-interfaces" href="libnm/NMRemoteConnection.html#NMRemoteConnection.implemented-interfaces">
 <ANCHOR id="NMRemoteConnection.description" href="libnm/NMRemoteConnection.html#NMRemoteConnection.description">
 <ANCHOR id="NMRemoteConnection.functions_details" href="libnm/NMRemoteConnection.html#NMRemoteConnection.functions_details">
 <ANCHOR id="nm-remote-connection-commit-changes" href="libnm/NMRemoteConnection.html#nm-remote-connection-commit-changes">
@@ -2773,6 +2853,7 @@
 <ANCHOR id="NM-REMOTE-CONNECTION-PATH:CAPS" href="libnm/NMRemoteConnection.html#NM-REMOTE-CONNECTION-PATH:CAPS">
 <ANCHOR id="NM-REMOTE-CONNECTION-UNSAVED:CAPS" href="libnm/NMRemoteConnection.html#NM-REMOTE-CONNECTION-UNSAVED:CAPS">
 <ANCHOR id="NM-REMOTE-CONNECTION-VISIBLE:CAPS" href="libnm/NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS">
+<ANCHOR id="NMRemoteConnection-struct" href="libnm/NMRemoteConnection.html#NMRemoteConnection-struct">
 <ANCHOR id="NMRemoteConnection.property-details" href="libnm/NMRemoteConnection.html#NMRemoteConnection.property-details">
 <ANCHOR id="NMRemoteConnection--unsaved" href="libnm/NMRemoteConnection.html#NMRemoteConnection--unsaved">
 <ANCHOR id="NMRemoteConnection--visible" href="libnm/NMRemoteConnection.html#NMRemoteConnection--visible">
@@ -2781,6 +2862,7 @@
 <ANCHOR id="NMAccessPoint.properties" href="libnm/NMAccessPoint.html#NMAccessPoint.properties">
 <ANCHOR id="NMAccessPoint.other" href="libnm/NMAccessPoint.html#NMAccessPoint.other">
 <ANCHOR id="NMAccessPoint.object-hierarchy" href="libnm/NMAccessPoint.html#NMAccessPoint.object-hierarchy">
+<ANCHOR id="NMAccessPoint.implemented-interfaces" href="libnm/NMAccessPoint.html#NMAccessPoint.implemented-interfaces">
 <ANCHOR id="NMAccessPoint.description" href="libnm/NMAccessPoint.html#NMAccessPoint.description">
 <ANCHOR id="NMAccessPoint.functions_details" href="libnm/NMAccessPoint.html#NMAccessPoint.functions_details">
 <ANCHOR id="nm-access-point-get-flags" href="libnm/NMAccessPoint.html#nm-access-point-get-flags">
@@ -2807,6 +2889,7 @@
 <ANCHOR id="NM-ACCESS-POINT-STRENGTH:CAPS" href="libnm/NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-LAST-SEEN:CAPS" href="libnm/NMAccessPoint.html#NM-ACCESS-POINT-LAST-SEEN:CAPS">
 <ANCHOR id="NM-ACCESS-POINT-HW-ADDRESS:CAPS" href="libnm/NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS">
+<ANCHOR id="NMAccessPoint-struct" href="libnm/NMAccessPoint.html#NMAccessPoint-struct">
 <ANCHOR id="NMAccessPoint.property-details" href="libnm/NMAccessPoint.html#NMAccessPoint.property-details">
 <ANCHOR id="NMAccessPoint--bssid" href="libnm/NMAccessPoint.html#NMAccessPoint--bssid">
 <ANCHOR id="NMAccessPoint--flags" href="libnm/NMAccessPoint.html#NMAccessPoint--flags">
@@ -2824,6 +2907,7 @@
 <ANCHOR id="NMWimaxNsp.properties" href="libnm/NMWimaxNsp.html#NMWimaxNsp.properties">
 <ANCHOR id="NMWimaxNsp.other" href="libnm/NMWimaxNsp.html#NMWimaxNsp.other">
 <ANCHOR id="NMWimaxNsp.object-hierarchy" href="libnm/NMWimaxNsp.html#NMWimaxNsp.object-hierarchy">
+<ANCHOR id="NMWimaxNsp.implemented-interfaces" href="libnm/NMWimaxNsp.html#NMWimaxNsp.implemented-interfaces">
 <ANCHOR id="NMWimaxNsp.description" href="libnm/NMWimaxNsp.html#NMWimaxNsp.description">
 <ANCHOR id="NMWimaxNsp.functions_details" href="libnm/NMWimaxNsp.html#NMWimaxNsp.functions_details">
 <ANCHOR id="nm-wimax-nsp-get-name" href="libnm/NMWimaxNsp.html#nm-wimax-nsp-get-name">
@@ -2835,6 +2919,7 @@
 <ANCHOR id="NM-WIMAX-NSP-NAME:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS">
 <ANCHOR id="NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS">
 <ANCHOR id="NM-WIMAX-NSP-NETWORK-TYPE:CAPS" href="libnm/NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS">
+<ANCHOR id="NMWimaxNsp-struct" href="libnm/NMWimaxNsp.html#NMWimaxNsp-struct">
 <ANCHOR id="NMWimaxNsp.property-details" href="libnm/NMWimaxNsp.html#NMWimaxNsp.property-details">
 <ANCHOR id="NMWimaxNsp--name" href="libnm/NMWimaxNsp.html#NMWimaxNsp--name">
 <ANCHOR id="NMWimaxNsp--network-type" href="libnm/NMWimaxNsp.html#NMWimaxNsp--network-type">
@@ -2844,6 +2929,7 @@
 <ANCHOR id="NMIPConfig.properties" href="libnm/NMIPConfig.html#NMIPConfig.properties">
 <ANCHOR id="NMIPConfig.other" href="libnm/NMIPConfig.html#NMIPConfig.other">
 <ANCHOR id="NMIPConfig.object-hierarchy" href="libnm/NMIPConfig.html#NMIPConfig.object-hierarchy">
+<ANCHOR id="NMIPConfig.implemented-interfaces" href="libnm/NMIPConfig.html#NMIPConfig.implemented-interfaces">
 <ANCHOR id="NMIPConfig.description" href="libnm/NMIPConfig.html#NMIPConfig.description">
 <ANCHOR id="NMIPConfig.functions_details" href="libnm/NMIPConfig.html#NMIPConfig.functions_details">
 <ANCHOR id="nm-ip-config-get-family" href="libnm/NMIPConfig.html#nm-ip-config-get-family">
@@ -2855,6 +2941,7 @@
 <ANCHOR id="nm-ip-config-get-searches" href="libnm/NMIPConfig.html#nm-ip-config-get-searches">
 <ANCHOR id="nm-ip-config-get-wins-servers" href="libnm/NMIPConfig.html#nm-ip-config-get-wins-servers">
 <ANCHOR id="NMIPConfig.other_details" href="libnm/NMIPConfig.html#NMIPConfig.other_details">
+<ANCHOR id="NMIPConfig-struct" href="libnm/NMIPConfig.html#NMIPConfig-struct">
 <ANCHOR id="NM-IP-CONFIG-FAMILY:CAPS" href="libnm/NMIPConfig.html#NM-IP-CONFIG-FAMILY:CAPS">
 <ANCHOR id="NM-IP-CONFIG-GATEWAY:CAPS" href="libnm/NMIPConfig.html#NM-IP-CONFIG-GATEWAY:CAPS">
 <ANCHOR id="NM-IP-CONFIG-ADDRESSES:CAPS" href="libnm/NMIPConfig.html#NM-IP-CONFIG-ADDRESSES:CAPS">
@@ -2877,12 +2964,14 @@
 <ANCHOR id="NMDhcpConfig.properties" href="libnm/NMDhcpConfig.html#NMDhcpConfig.properties">
 <ANCHOR id="NMDhcpConfig.other" href="libnm/NMDhcpConfig.html#NMDhcpConfig.other">
 <ANCHOR id="NMDhcpConfig.object-hierarchy" href="libnm/NMDhcpConfig.html#NMDhcpConfig.object-hierarchy">
+<ANCHOR id="NMDhcpConfig.implemented-interfaces" href="libnm/NMDhcpConfig.html#NMDhcpConfig.implemented-interfaces">
 <ANCHOR id="NMDhcpConfig.description" href="libnm/NMDhcpConfig.html#NMDhcpConfig.description">
 <ANCHOR id="NMDhcpConfig.functions_details" href="libnm/NMDhcpConfig.html#NMDhcpConfig.functions_details">
 <ANCHOR id="nm-dhcp-config-get-family" href="libnm/NMDhcpConfig.html#nm-dhcp-config-get-family">
 <ANCHOR id="nm-dhcp-config-get-options" href="libnm/NMDhcpConfig.html#nm-dhcp-config-get-options">
 <ANCHOR id="nm-dhcp-config-get-one-option" href="libnm/NMDhcpConfig.html#nm-dhcp-config-get-one-option">
 <ANCHOR id="NMDhcpConfig.other_details" href="libnm/NMDhcpConfig.html#NMDhcpConfig.other_details">
+<ANCHOR id="NMDhcpConfig-struct" href="libnm/NMDhcpConfig.html#NMDhcpConfig-struct">
 <ANCHOR id="NM-DHCP-CONFIG-FAMILY:CAPS" href="libnm/NMDhcpConfig.html#NM-DHCP-CONFIG-FAMILY:CAPS">
 <ANCHOR id="NM-DHCP-CONFIG-OPTIONS:CAPS" href="libnm/NMDhcpConfig.html#NM-DHCP-CONFIG-OPTIONS:CAPS">
 <ANCHOR id="NMDhcpConfig.property-details" href="libnm/NMDhcpConfig.html#NMDhcpConfig.property-details">
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 0dae564f..2dcd7309 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -353,7 +353,7 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-dbus-interface.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NM80211Mode
     <span class="lineart">├──</span> NMActiveConnectionState
     <span class="lineart">├──</span> NMConnectivityState
@@ -364,7 +364,7 @@
     <span class="lineart">├──</span> NMMetered
     <span class="lineart">├──</span> NMState
     <span class="lineart">╰──</span> NMWimaxNspNetworkType
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+    GFlags
     <span class="lineart">├──</span> NM80211ApFlags
     <span class="lineart">├──</span> NM80211ApSecurityFlags
     <span class="lineart">├──</span> NMBluetoothCapabilities
@@ -764,8 +764,8 @@
 <hr>
 <div class="refsect2">
 <a name="NMDeviceType"></a><h3>enum NMDeviceType</h3>
-<p><a class="link" href="libnm-nm-dbus-interface.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a> values indicate the type of hardware represented by
-an <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>.</p>
+<p><a class="link" href="libnm-nm-dbus-interface.html#NMDeviceType" title="enum NMDeviceType"><span class="type">NMDeviceType</span></a> values indicate the type of hardware represented by a
+device object.</p>
 <div class="refsect3">
 <a name="id-1.3.6.7.46.4"></a><h4>Members</h4>
 <div class="informaltable"><table width="100%" border="0">
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index eee7968d..f2720bfe 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -184,7 +184,7 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-errors.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMAgentManagerError
     <span class="lineart">├──</span> NMConnectionError
     <span class="lineart">├──</span> NMCryptoError
@@ -349,9 +349,9 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.</p>
 <hr>
 <div class="refsect2">
 <a name="NMConnectionError"></a><h3>enum NMConnectionError</h3>
-<p>Describes errors that may result from operations involving a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a>
+<p>Describes errors that may result from operations involving a <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a>
 or its <a href="NMSetting.html"><span class="type">NMSettings</span></a>.</p>
-<p>These errors may be returned directly from <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> and <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
+<p>These errors may be returned directly from <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> and <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>
 methods, or may be returned from D-Bus operations (eg on <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> or
 <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>), where they correspond to errors in the
 "org.freedesktop.NetworkManager.Settings.Connection" namespace.</p>
@@ -374,7 +374,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-SETTING-NOT-FOUND:CAPS"></a>NM_CONNECTION_ERROR_SETTING_NOT_FOUND</p></td>
 <td class="enum_member_description">
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object
+<p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object
   did not contain the specified <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> object</p>
 </td>
 <td class="enum_member_annotations"> </td>
@@ -382,7 +382,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-PROPERTY-NOT-FOUND:CAPS"></a>NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND</p></td>
 <td class="enum_member_description">
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> did not contain the
+<p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> did not contain the
   requested <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> property</p>
 </td>
 <td class="enum_member_annotations"> </td>
@@ -398,7 +398,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-MISSING-SETTING:CAPS"></a>NM_CONNECTION_ERROR_MISSING_SETTING</p></td>
 <td class="enum_member_description">
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object is missing an
+<p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object is missing an
   <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> which is required for its configuration. The error message will
   always be prefixed with "&lt;setting-name&gt;: ", where "&lt;setting-name&gt;" is the
   name of the setting that is missing.</p>
@@ -408,7 +408,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-INVALID-SETTING:CAPS"></a>NM_CONNECTION_ERROR_INVALID_SETTING</p></td>
 <td class="enum_member_description">
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object contains an
+<p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object contains an
   invalid or inappropriate <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a>. The error message will always be
   prefixed with "&lt;setting-name&gt;: ", where "&lt;setting-name&gt;" is the name of the
   setting that is invalid.</p>
@@ -418,7 +418,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-MISSING-PROPERTY:CAPS"></a>NM_CONNECTION_ERROR_MISSING_PROPERTY</p></td>
 <td class="enum_member_description">
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object is invalid
+<p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object is invalid
   because it is missing a required property. The error message will always be
   prefixed with "&lt;setting-name&gt;.&lt;property-name&gt;: ", where "&lt;setting-name&gt;" is
   the name of the setting with the missing property, and "&lt;property-name&gt;" is
@@ -429,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on <a class="link" href="N
 <tr>
 <td class="enum_member_name"><p><a name="NM-CONNECTION-ERROR-INVALID-PROPERTY:CAPS"></a>NM_CONNECTION_ERROR_INVALID_PROPERTY</p></td>
 <td class="enum_member_description">
-<p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> object is invalid
+<p>the <a class="link" href="NMConnection.html" title="NMConnection"><span class="type">NMConnection</span></a> object is invalid
   because a property has an invalid value. The error message will always be
   prefixed with "&lt;setting-name&gt;.&lt;property-name&gt;: ", where "&lt;setting-name&gt;" is
   the name of the setting with the invalid property, and "&lt;property-name&gt;" is
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 1ae50f34..65300023 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -551,7 +551,7 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-utils.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">╰──</span> NMUtilsSecurityType
 </pre>
 </div>
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index 299f1d09..d5be4bee 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -293,7 +293,7 @@
 </div>
 <div class="refsect1">
 <a name="libnm-nm-vpn-dbus-interface.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+<pre class="screen">    GEnum
     <span class="lineart">├──</span> NMVpnConnectionState
     <span class="lineart">├──</span> NMVpnConnectionStateReason
     <span class="lineart">├──</span> NMVpnPluginFailure
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 6dd470c9..e4b37f3c 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -10,7 +10,7 @@
       <sub name="nm-dbus-interface" link="libnm-nm-dbus-interface.html"/>
     </sub>
     <sub name="Connection and Setting API Reference" link="ch03.html">
-      <sub name="NMConnection" link="libnm-NMConnection.html"/>
+      <sub name="NMConnection" link="NMConnection.html"/>
       <sub name="NMSimpleConnection" link="NMSimpleConnection.html"/>
       <sub name="NMSetting" link="NMSetting.html"/>
       <sub name="NMSettingConnection" link="NMSettingConnection.html"/>
@@ -172,6 +172,7 @@
     <keyword type="enum" name="enum NMClientPermissionResult" link="NMClient.html#NMClientPermissionResult"/>
     <keyword type="enum" name="enum NMClientError" link="NMClient.html#NMClientError"/>
     <keyword type="macro" name="NM_CLIENT_ERROR" link="NMClient.html#NM-CLIENT-ERROR:CAPS"/>
+    <keyword type="struct" name="NMClient" link="NMClient.html#NMClient-struct"/>
     <keyword type="property" name="The “activating-connection†property" link="NMClient.html#NMClient--activating-connection"/>
     <keyword type="property" name="The “active-connections†property" link="NMClient.html#NMClient--active-connections"/>
     <keyword type="property" name="The “all-devices†property" link="NMClient.html#NMClient--all-devices"/>
@@ -217,6 +218,7 @@
     <keyword type="macro" name="NM_SECRET_AGENT_OLD_AUTO_REGISTER" link="NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-AUTO-REGISTER:CAPS"/>
     <keyword type="macro" name="NM_SECRET_AGENT_OLD_REGISTERED" link="NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-REGISTERED:CAPS"/>
     <keyword type="macro" name="NM_SECRET_AGENT_OLD_CAPABILITIES" link="NMSecretAgentOld.html#NM-SECRET-AGENT-OLD-CAPABILITIES:CAPS"/>
+    <keyword type="struct" name="NMSecretAgentOld" link="NMSecretAgentOld.html#NMSecretAgentOld-struct"/>
     <keyword type="property" name="The “auto-register†property" link="NMSecretAgentOld.html#NMSecretAgentOld--auto-register"/>
     <keyword type="property" name="The “capabilities†property" link="NMSecretAgentOld.html#NMSecretAgentOld--capabilities"/>
     <keyword type="property" name="The “identifier†property" link="NMSecretAgentOld.html#NMSecretAgentOld--identifier"/>
@@ -224,6 +226,7 @@
     <keyword type="function" name="nm_object_get_path ()" link="NMObject.html#nm-object-get-path"/>
     <keyword type="macro" name="NM_OBJECT_PATH" link="NMObject.html#NM-OBJECT-PATH:CAPS"/>
     <keyword type="macro" name="NM_OBJECT_DBUS_CONNECTION" link="NMObject.html#NM-OBJECT-DBUS-CONNECTION:CAPS"/>
+    <keyword type="struct" name="NMObject" link="NMObject.html#NMObject-struct"/>
     <keyword type="property" name="The “dbus-connection†property" link="NMObject.html#NMObject--dbus-connection"/>
     <keyword type="property" name="The “nm-running-internal†property" link="NMObject.html#NMObject--nm-running-internal"/>
     <keyword type="property" name="The “path†property" link="NMObject.html#NMObject--path"/>
@@ -328,74 +331,75 @@
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_NON_TPMR_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-NON-TPMR-BRIDGE:CAPS"/>
     <keyword type="macro" name="NM_LLDP_DEST_NEAREST_CUSTOMER_BRIDGE" link="libnm-nm-dbus-interface.html#NM-LLDP-DEST-NEAREST-CUSTOMER-BRIDGE:CAPS"/>
     <keyword type="enum" name="enum NMIPTunnelMode" link="libnm-nm-dbus-interface.html#NMIPTunnelMode" since="1.2"/>
-    <keyword type="function" name="nm_connection_add_setting ()" link="libnm-NMConnection.html#nm-connection-add-setting"/>
-    <keyword type="function" name="nm_connection_remove_setting ()" link="libnm-NMConnection.html#nm-connection-remove-setting"/>
-    <keyword type="function" name="nm_connection_get_setting ()" link="libnm-NMConnection.html#nm-connection-get-setting"/>
-    <keyword type="function" name="nm_connection_get_setting_by_name ()" link="libnm-NMConnection.html#nm-connection-get-setting-by-name"/>
-    <keyword type="function" name="nm_connection_to_dbus ()" link="libnm-NMConnection.html#nm-connection-to-dbus"/>
-    <keyword type="function" name="nm_connection_replace_settings ()" link="libnm-NMConnection.html#nm-connection-replace-settings"/>
-    <keyword type="function" name="nm_connection_replace_settings_from_connection ()" link="libnm-NMConnection.html#nm-connection-replace-settings-from-connection"/>
-    <keyword type="function" name="nm_connection_clear_settings ()" link="libnm-NMConnection.html#nm-connection-clear-settings"/>
-    <keyword type="function" name="nm_connection_compare ()" link="libnm-NMConnection.html#nm-connection-compare"/>
-    <keyword type="function" name="nm_connection_diff ()" link="libnm-NMConnection.html#nm-connection-diff"/>
-    <keyword type="function" name="nm_connection_verify ()" link="libnm-NMConnection.html#nm-connection-verify"/>
-    <keyword type="function" name="nm_connection_verify_secrets ()" link="libnm-NMConnection.html#nm-connection-verify-secrets" since="1.2"/>
-    <keyword type="function" name="nm_connection_normalize ()" link="libnm-NMConnection.html#nm-connection-normalize"/>
-    <keyword type="function" name="nm_connection_need_secrets ()" link="libnm-NMConnection.html#nm-connection-need-secrets"/>
-    <keyword type="function" name="nm_connection_clear_secrets ()" link="libnm-NMConnection.html#nm-connection-clear-secrets"/>
-    <keyword type="function" name="nm_connection_clear_secrets_with_flags ()" link="libnm-NMConnection.html#nm-connection-clear-secrets-with-flags"/>
-    <keyword type="function" name="nm_connection_update_secrets ()" link="libnm-NMConnection.html#nm-connection-update-secrets"/>
-    <keyword type="function" name="nm_connection_set_path ()" link="libnm-NMConnection.html#nm-connection-set-path"/>
-    <keyword type="function" name="nm_connection_get_path ()" link="libnm-NMConnection.html#nm-connection-get-path"/>
-    <keyword type="function" name="nm_connection_get_interface_name ()" link="libnm-NMConnection.html#nm-connection-get-interface-name"/>
-    <keyword type="function" name="nm_connection_is_type ()" link="libnm-NMConnection.html#nm-connection-is-type"/>
-    <keyword type="function" name="nm_connection_for_each_setting_value ()" link="libnm-NMConnection.html#nm-connection-for-each-setting-value"/>
-    <keyword type="function" name="nm_connection_dump ()" link="libnm-NMConnection.html#nm-connection-dump"/>
-    <keyword type="function" name="nm_connection_get_uuid ()" link="libnm-NMConnection.html#nm-connection-get-uuid"/>
-    <keyword type="function" name="nm_connection_get_id ()" link="libnm-NMConnection.html#nm-connection-get-id"/>
-    <keyword type="function" name="nm_connection_get_connection_type ()" link="libnm-NMConnection.html#nm-connection-get-connection-type"/>
-    <keyword type="function" name="nm_connection_is_virtual ()" link="libnm-NMConnection.html#nm-connection-is-virtual"/>
-    <keyword type="function" name="nm_connection_get_virtual_device_description ()" link="libnm-NMConnection.html#nm-connection-get-virtual-device-description"/>
-    <keyword type="function" name="nm_connection_get_setting_802_1x ()" link="libnm-NMConnection.html#nm-connection-get-setting-802-1x"/>
-    <keyword type="function" name="nm_connection_get_setting_bluetooth ()" link="libnm-NMConnection.html#nm-connection-get-setting-bluetooth"/>
-    <keyword type="function" name="nm_connection_get_setting_bond ()" link="libnm-NMConnection.html#nm-connection-get-setting-bond"/>
-    <keyword type="function" name="nm_connection_get_setting_team ()" link="libnm-NMConnection.html#nm-connection-get-setting-team"/>
-    <keyword type="function" name="nm_connection_get_setting_team_port ()" link="libnm-NMConnection.html#nm-connection-get-setting-team-port"/>
-    <keyword type="function" name="nm_connection_get_setting_bridge ()" link="libnm-NMConnection.html#nm-connection-get-setting-bridge"/>
-    <keyword type="function" name="nm_connection_get_setting_bridge_port ()" link="libnm-NMConnection.html#nm-connection-get-setting-bridge-port"/>
-    <keyword type="function" name="nm_connection_get_setting_cdma ()" link="libnm-NMConnection.html#nm-connection-get-setting-cdma"/>
-    <keyword type="function" name="nm_connection_get_setting_connection ()" link="libnm-NMConnection.html#nm-connection-get-setting-connection"/>
-    <keyword type="function" name="nm_connection_get_setting_dcb ()" link="libnm-NMConnection.html#nm-connection-get-setting-dcb"/>
-    <keyword type="function" name="nm_connection_get_setting_generic ()" link="libnm-NMConnection.html#nm-connection-get-setting-generic"/>
-    <keyword type="function" name="nm_connection_get_setting_gsm ()" link="libnm-NMConnection.html#nm-connection-get-setting-gsm"/>
-    <keyword type="function" name="nm_connection_get_setting_infiniband ()" link="libnm-NMConnection.html#nm-connection-get-setting-infiniband"/>
-    <keyword type="function" name="nm_connection_get_setting_ip_tunnel ()" link="libnm-NMConnection.html#nm-connection-get-setting-ip-tunnel" since="1.2"/>
-    <keyword type="function" name="nm_connection_get_setting_ip4_config ()" link="libnm-NMConnection.html#nm-connection-get-setting-ip4-config"/>
-    <keyword type="function" name="nm_connection_get_setting_ip6_config ()" link="libnm-NMConnection.html#nm-connection-get-setting-ip6-config"/>
-    <keyword type="function" name="nm_connection_get_setting_macvlan ()" link="libnm-NMConnection.html#nm-connection-get-setting-macvlan" since="1.2"/>
-    <keyword type="function" name="nm_connection_get_setting_olpc_mesh ()" link="libnm-NMConnection.html#nm-connection-get-setting-olpc-mesh"/>
-    <keyword type="function" name="nm_connection_get_setting_ppp ()" link="libnm-NMConnection.html#nm-connection-get-setting-ppp"/>
-    <keyword type="function" name="nm_connection_get_setting_pppoe ()" link="libnm-NMConnection.html#nm-connection-get-setting-pppoe"/>
-    <keyword type="function" name="nm_connection_get_setting_serial ()" link="libnm-NMConnection.html#nm-connection-get-setting-serial"/>
-    <keyword type="function" name="nm_connection_get_setting_tun ()" link="libnm-NMConnection.html#nm-connection-get-setting-tun" since="1.2"/>
-    <keyword type="function" name="nm_connection_get_setting_vpn ()" link="libnm-NMConnection.html#nm-connection-get-setting-vpn"/>
-    <keyword type="function" name="nm_connection_get_setting_wimax ()" link="libnm-NMConnection.html#nm-connection-get-setting-wimax"/>
-    <keyword type="function" name="nm_connection_get_setting_adsl ()" link="libnm-NMConnection.html#nm-connection-get-setting-adsl"/>
-    <keyword type="function" name="nm_connection_get_setting_wired ()" link="libnm-NMConnection.html#nm-connection-get-setting-wired"/>
-    <keyword type="function" name="nm_connection_get_setting_wireless ()" link="libnm-NMConnection.html#nm-connection-get-setting-wireless"/>
-    <keyword type="function" name="nm_connection_get_setting_wireless_security ()" link="libnm-NMConnection.html#nm-connection-get-setting-wireless-security"/>
-    <keyword type="function" name="nm_connection_get_setting_vlan ()" link="libnm-NMConnection.html#nm-connection-get-setting-vlan"/>
-    <keyword type="function" name="nm_connection_get_setting_vxlan ()" link="libnm-NMConnection.html#nm-connection-get-setting-vxlan" since="1.2"/>
-    <keyword type="macro" name="NM_CONNECTION_SECRETS_UPDATED" link="libnm-NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_SECRETS_CLEARED" link="libnm-NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_CHANGED" link="libnm-NMConnection.html#NM-CONNECTION-CHANGED:CAPS"/>
-    <keyword type="macro" name="NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD" link="libnm-NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS"/>
-    <keyword type="struct" name="NMConnectionInterface" link="libnm-NMConnection.html#NMConnectionInterface"/>
-    <keyword type="macro" name="NM_VARIANT_TYPE_SETTING" link="libnm-NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS"/>
-    <keyword type="enum" name="enum NMConnectionSerializationFlags" link="libnm-NMConnection.html#NMConnectionSerializationFlags"/>
+    <keyword type="function" name="nm_connection_add_setting ()" link="NMConnection.html#nm-connection-add-setting"/>
+    <keyword type="function" name="nm_connection_remove_setting ()" link="NMConnection.html#nm-connection-remove-setting"/>
+    <keyword type="function" name="nm_connection_get_setting ()" link="NMConnection.html#nm-connection-get-setting"/>
+    <keyword type="function" name="nm_connection_get_setting_by_name ()" link="NMConnection.html#nm-connection-get-setting-by-name"/>
+    <keyword type="function" name="nm_connection_to_dbus ()" link="NMConnection.html#nm-connection-to-dbus"/>
+    <keyword type="function" name="nm_connection_replace_settings ()" link="NMConnection.html#nm-connection-replace-settings"/>
+    <keyword type="function" name="nm_connection_replace_settings_from_connection ()" link="NMConnection.html#nm-connection-replace-settings-from-connection"/>
+    <keyword type="function" name="nm_connection_clear_settings ()" link="NMConnection.html#nm-connection-clear-settings"/>
+    <keyword type="function" name="nm_connection_compare ()" link="NMConnection.html#nm-connection-compare"/>
+    <keyword type="function" name="nm_connection_diff ()" link="NMConnection.html#nm-connection-diff"/>
+    <keyword type="function" name="nm_connection_verify ()" link="NMConnection.html#nm-connection-verify"/>
+    <keyword type="function" name="nm_connection_verify_secrets ()" link="NMConnection.html#nm-connection-verify-secrets" since="1.2"/>
+    <keyword type="function" name="nm_connection_normalize ()" link="NMConnection.html#nm-connection-normalize"/>
+    <keyword type="function" name="nm_connection_need_secrets ()" link="NMConnection.html#nm-connection-need-secrets"/>
+    <keyword type="function" name="nm_connection_clear_secrets ()" link="NMConnection.html#nm-connection-clear-secrets"/>
+    <keyword type="function" name="nm_connection_clear_secrets_with_flags ()" link="NMConnection.html#nm-connection-clear-secrets-with-flags"/>
+    <keyword type="function" name="nm_connection_update_secrets ()" link="NMConnection.html#nm-connection-update-secrets"/>
+    <keyword type="function" name="nm_connection_set_path ()" link="NMConnection.html#nm-connection-set-path"/>
+    <keyword type="function" name="nm_connection_get_path ()" link="NMConnection.html#nm-connection-get-path"/>
+    <keyword type="function" name="nm_connection_get_interface_name ()" link="NMConnection.html#nm-connection-get-interface-name"/>
+    <keyword type="function" name="nm_connection_is_type ()" link="NMConnection.html#nm-connection-is-type"/>
+    <keyword type="function" name="nm_connection_for_each_setting_value ()" link="NMConnection.html#nm-connection-for-each-setting-value"/>
+    <keyword type="function" name="nm_connection_dump ()" link="NMConnection.html#nm-connection-dump"/>
+    <keyword type="function" name="nm_connection_get_uuid ()" link="NMConnection.html#nm-connection-get-uuid"/>
+    <keyword type="function" name="nm_connection_get_id ()" link="NMConnection.html#nm-connection-get-id"/>
+    <keyword type="function" name="nm_connection_get_connection_type ()" link="NMConnection.html#nm-connection-get-connection-type"/>
+    <keyword type="function" name="nm_connection_is_virtual ()" link="NMConnection.html#nm-connection-is-virtual"/>
+    <keyword type="function" name="nm_connection_get_virtual_device_description ()" link="NMConnection.html#nm-connection-get-virtual-device-description"/>
+    <keyword type="function" name="nm_connection_get_setting_802_1x ()" link="NMConnection.html#nm-connection-get-setting-802-1x"/>
+    <keyword type="function" name="nm_connection_get_setting_bluetooth ()" link="NMConnection.html#nm-connection-get-setting-bluetooth"/>
+    <keyword type="function" name="nm_connection_get_setting_bond ()" link="NMConnection.html#nm-connection-get-setting-bond"/>
+    <keyword type="function" name="nm_connection_get_setting_team ()" link="NMConnection.html#nm-connection-get-setting-team"/>
+    <keyword type="function" name="nm_connection_get_setting_team_port ()" link="NMConnection.html#nm-connection-get-setting-team-port"/>
+    <keyword type="function" name="nm_connection_get_setting_bridge ()" link="NMConnection.html#nm-connection-get-setting-bridge"/>
+    <keyword type="function" name="nm_connection_get_setting_bridge_port ()" link="NMConnection.html#nm-connection-get-setting-bridge-port"/>
+    <keyword type="function" name="nm_connection_get_setting_cdma ()" link="NMConnection.html#nm-connection-get-setting-cdma"/>
+    <keyword type="function" name="nm_connection_get_setting_connection ()" link="NMConnection.html#nm-connection-get-setting-connection"/>
+    <keyword type="function" name="nm_connection_get_setting_dcb ()" link="NMConnection.html#nm-connection-get-setting-dcb"/>
+    <keyword type="function" name="nm_connection_get_setting_generic ()" link="NMConnection.html#nm-connection-get-setting-generic"/>
+    <keyword type="function" name="nm_connection_get_setting_gsm ()" link="NMConnection.html#nm-connection-get-setting-gsm"/>
+    <keyword type="function" name="nm_connection_get_setting_infiniband ()" link="NMConnection.html#nm-connection-get-setting-infiniband"/>
+    <keyword type="function" name="nm_connection_get_setting_ip_tunnel ()" link="NMConnection.html#nm-connection-get-setting-ip-tunnel" since="1.2"/>
+    <keyword type="function" name="nm_connection_get_setting_ip4_config ()" link="NMConnection.html#nm-connection-get-setting-ip4-config"/>
+    <keyword type="function" name="nm_connection_get_setting_ip6_config ()" link="NMConnection.html#nm-connection-get-setting-ip6-config"/>
+    <keyword type="function" name="nm_connection_get_setting_macvlan ()" link="NMConnection.html#nm-connection-get-setting-macvlan" since="1.2"/>
+    <keyword type="function" name="nm_connection_get_setting_olpc_mesh ()" link="NMConnection.html#nm-connection-get-setting-olpc-mesh"/>
+    <keyword type="function" name="nm_connection_get_setting_ppp ()" link="NMConnection.html#nm-connection-get-setting-ppp"/>
+    <keyword type="function" name="nm_connection_get_setting_pppoe ()" link="NMConnection.html#nm-connection-get-setting-pppoe"/>
+    <keyword type="function" name="nm_connection_get_setting_serial ()" link="NMConnection.html#nm-connection-get-setting-serial"/>
+    <keyword type="function" name="nm_connection_get_setting_tun ()" link="NMConnection.html#nm-connection-get-setting-tun" since="1.2"/>
+    <keyword type="function" name="nm_connection_get_setting_vpn ()" link="NMConnection.html#nm-connection-get-setting-vpn"/>
+    <keyword type="function" name="nm_connection_get_setting_wimax ()" link="NMConnection.html#nm-connection-get-setting-wimax"/>
+    <keyword type="function" name="nm_connection_get_setting_adsl ()" link="NMConnection.html#nm-connection-get-setting-adsl"/>
+    <keyword type="function" name="nm_connection_get_setting_wired ()" link="NMConnection.html#nm-connection-get-setting-wired"/>
+    <keyword type="function" name="nm_connection_get_setting_wireless ()" link="NMConnection.html#nm-connection-get-setting-wireless"/>
+    <keyword type="function" name="nm_connection_get_setting_wireless_security ()" link="NMConnection.html#nm-connection-get-setting-wireless-security"/>
+    <keyword type="function" name="nm_connection_get_setting_vlan ()" link="NMConnection.html#nm-connection-get-setting-vlan"/>
+    <keyword type="function" name="nm_connection_get_setting_vxlan ()" link="NMConnection.html#nm-connection-get-setting-vxlan" since="1.2"/>
+    <keyword type="macro" name="NM_CONNECTION_SECRETS_UPDATED" link="NMConnection.html#NM-CONNECTION-SECRETS-UPDATED:CAPS"/>
+    <keyword type="macro" name="NM_CONNECTION_SECRETS_CLEARED" link="NMConnection.html#NM-CONNECTION-SECRETS-CLEARED:CAPS"/>
+    <keyword type="macro" name="NM_CONNECTION_CHANGED" link="NMConnection.html#NM-CONNECTION-CHANGED:CAPS"/>
+    <keyword type="macro" name="NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD" link="NMConnection.html#NM-CONNECTION-NORMALIZE-PARAM-IP6-CONFIG-METHOD:CAPS"/>
+    <keyword type="struct" name="NMConnectionInterface" link="NMConnection.html#NMConnectionInterface"/>
+    <keyword type="macro" name="NM_VARIANT_TYPE_SETTING" link="NMConnection.html#NM-VARIANT-TYPE-SETTING:CAPS"/>
+    <keyword type="enum" name="enum NMConnectionSerializationFlags" link="NMConnection.html#NMConnectionSerializationFlags"/>
     <keyword type="function" name="nm_simple_connection_new ()" link="NMSimpleConnection.html#nm-simple-connection-new"/>
     <keyword type="function" name="nm_simple_connection_new_from_dbus ()" link="NMSimpleConnection.html#nm-simple-connection-new-from-dbus"/>
     <keyword type="function" name="nm_simple_connection_new_clone ()" link="NMSimpleConnection.html#nm-simple-connection-new-clone"/>
+    <keyword type="struct" name="NMSimpleConnection" link="NMSimpleConnection.html#NMSimpleConnection-struct"/>
     <keyword type="macro" name="NM_SETTING_PARAM_REQUIRED" link="NMSetting.html#NM-SETTING-PARAM-REQUIRED:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PARAM_SECRET" link="NMSetting.html#NM-SETTING-PARAM-SECRET:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PARAM_FUZZY_IGNORE" link="NMSetting.html#NM-SETTING-PARAM-FUZZY-IGNORE:CAPS"/>
@@ -417,7 +421,7 @@
     <keyword type="enum" name="enum NMSettingSecretFlags" link="NMSetting.html#NMSettingSecretFlags"/>
     <keyword type="enum" name="enum NMSettingCompareFlags" link="NMSetting.html#NMSettingCompareFlags"/>
     <keyword type="enum" name="enum NMSettingMacRandomization" link="NMSetting.html#NMSettingMacRandomization"/>
-    <keyword type="struct" name="struct NMSetting" link="NMSetting.html#NMSetting-struct"/>
+    <keyword type="struct" name="NMSetting" link="NMSetting.html#NMSetting-struct"/>
     <keyword type="enum" name="enum NMSettingDiffResult" link="NMSetting.html#NMSettingDiffResult"/>
     <keyword type="property" name="The “name†property" link="NMSetting.html#NMSetting--name"/>
     <keyword type="function" name="nm_setting_connection_new ()" link="NMSettingConnection.html#nm-setting-connection-new"/>
@@ -471,7 +475,7 @@
     <keyword type="macro" name="NM_SETTING_CONNECTION_LLDP" link="NMSettingConnection.html#NM-SETTING-CONNECTION-LLDP:CAPS"/>
     <keyword type="enum" name="enum NMSettingConnectionAutoconnectSlaves" link="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves"/>
     <keyword type="enum" name="enum NMSettingConnectionLldp" link="NMSettingConnection.html#NMSettingConnectionLldp"/>
-    <keyword type="struct" name="struct NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
+    <keyword type="struct" name="NMSettingConnection" link="NMSettingConnection.html#NMSettingConnection-struct"/>
     <keyword type="property" name="The “autoconnect†property" link="NMSettingConnection.html#NMSettingConnection--autoconnect"/>
     <keyword type="property" name="The “autoconnect-priority†property" link="NMSettingConnection.html#NMSettingConnection--autoconnect-priority"/>
     <keyword type="property" name="The “autoconnect-slaves†property" link="NMSettingConnection.html#NMSettingConnection--autoconnect-slaves"/>
@@ -598,6 +602,7 @@
     <keyword type="macro" name="NM_SETTING_802_1X_PIN" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_PIN_FLAGS" link="NMSetting8021x.html#NM-SETTING-802-1X-PIN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_802_1X_SYSTEM_CA_CERTS" link="NMSetting8021x.html#NM-SETTING-802-1X-SYSTEM-CA-CERTS:CAPS"/>
+    <keyword type="struct" name="NMSetting8021x" link="NMSetting8021x.html#NMSetting8021x-struct"/>
     <keyword type="property" name="The “altsubject-matches†property" link="NMSetting8021x.html#NMSetting8021x--altsubject-matches"/>
     <keyword type="property" name="The “anonymous-identity†property" link="NMSetting8021x.html#NMSetting8021x--anonymous-identity"/>
     <keyword type="property" name="The “ca-cert†property" link="NMSetting8021x.html#NMSetting8021x--ca-cert"/>
@@ -653,6 +658,7 @@
     <keyword type="macro" name="NM_SETTING_ADSL_PROTOCOL_IPOATM" link="NMSettingAdsl.html#NM-SETTING-ADSL-PROTOCOL-IPOATM:CAPS"/>
     <keyword type="macro" name="NM_SETTING_ADSL_ENCAPSULATION_VCMUX" link="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-VCMUX:CAPS"/>
     <keyword type="macro" name="NM_SETTING_ADSL_ENCAPSULATION_LLC" link="NMSettingAdsl.html#NM-SETTING-ADSL-ENCAPSULATION-LLC:CAPS"/>
+    <keyword type="struct" name="NMSettingAdsl" link="NMSettingAdsl.html#NMSettingAdsl-struct"/>
     <keyword type="property" name="The “encapsulation†property" link="NMSettingAdsl.html#NMSettingAdsl--encapsulation"/>
     <keyword type="property" name="The “password†property" link="NMSettingAdsl.html#NMSettingAdsl--password"/>
     <keyword type="property" name="The “password-flags†property" link="NMSettingAdsl.html#NMSettingAdsl--password-flags"/>
@@ -668,6 +674,7 @@
     <keyword type="macro" name="NM_SETTING_BLUETOOTH_TYPE" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BLUETOOTH_TYPE_DUN" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-DUN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BLUETOOTH_TYPE_PANU" link="NMSettingBluetooth.html#NM-SETTING-BLUETOOTH-TYPE-PANU:CAPS"/>
+    <keyword type="struct" name="NMSettingBluetooth" link="NMSettingBluetooth.html#NMSettingBluetooth-struct"/>
     <keyword type="property" name="The “bdaddr†property" link="NMSettingBluetooth.html#NMSettingBluetooth--bdaddr"/>
     <keyword type="property" name="The “type†property" link="NMSettingBluetooth.html#NMSettingBluetooth--type"/>
     <keyword type="function" name="nm_setting_bond_new ()" link="NMSettingBond.html#nm-setting-bond-new"/>
@@ -708,6 +715,7 @@
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-PACKETS-PER-SLAVE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-TLB-DYNAMIC-LB:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BOND_OPTION_LP_INTERVAL" link="NMSettingBond.html#NM-SETTING-BOND-OPTION-LP-INTERVAL:CAPS"/>
+    <keyword type="struct" name="NMSettingBond" link="NMSettingBond.html#NMSettingBond-struct"/>
     <keyword type="property" name="The “options†property" link="NMSettingBond.html#NMSettingBond--options"/>
     <keyword type="function" name="nm_setting_bridge_new ()" link="NMSettingBridge.html#nm-setting-bridge-new"/>
     <keyword type="function" name="nm_setting_bridge_get_mac_address ()" link="NMSettingBridge.html#nm-setting-bridge-get-mac-address"/>
@@ -727,6 +735,7 @@
     <keyword type="macro" name="NM_SETTING_BRIDGE_MAX_AGE" link="NMSettingBridge.html#NM-SETTING-BRIDGE-MAX-AGE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_AGEING_TIME" link="NMSettingBridge.html#NM-SETTING-BRIDGE-AGEING-TIME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_MULTICAST_SNOOPING" link="NMSettingBridge.html#NM-SETTING-BRIDGE-MULTICAST-SNOOPING:CAPS"/>
+    <keyword type="struct" name="NMSettingBridge" link="NMSettingBridge.html#NMSettingBridge-struct"/>
     <keyword type="property" name="The “ageing-time†property" link="NMSettingBridge.html#NMSettingBridge--ageing-time"/>
     <keyword type="property" name="The “forward-delay†property" link="NMSettingBridge.html#NMSettingBridge--forward-delay"/>
     <keyword type="property" name="The “hello-time†property" link="NMSettingBridge.html#NMSettingBridge--hello-time"/>
@@ -743,6 +752,7 @@
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PRIORITY" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PRIORITY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_PATH_COST" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-PATH-COST:CAPS"/>
     <keyword type="macro" name="NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE" link="NMSettingBridgePort.html#NM-SETTING-BRIDGE-PORT-HAIRPIN-MODE:CAPS"/>
+    <keyword type="struct" name="NMSettingBridgePort" link="NMSettingBridgePort.html#NMSettingBridgePort-struct"/>
     <keyword type="property" name="The “hairpin-mode†property" link="NMSettingBridgePort.html#NMSettingBridgePort--hairpin-mode"/>
     <keyword type="property" name="The “path-cost†property" link="NMSettingBridgePort.html#NMSettingBridgePort--path-cost"/>
     <keyword type="property" name="The “priority†property" link="NMSettingBridgePort.html#NMSettingBridgePort--priority"/>
@@ -756,6 +766,7 @@
     <keyword type="macro" name="NM_SETTING_CDMA_USERNAME" link="NMSettingCdma.html#NM-SETTING-CDMA-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CDMA_PASSWORD" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD:CAPS"/>
     <keyword type="macro" name="NM_SETTING_CDMA_PASSWORD_FLAGS" link="NMSettingCdma.html#NM-SETTING-CDMA-PASSWORD-FLAGS:CAPS"/>
+    <keyword type="struct" name="NMSettingCdma" link="NMSettingCdma.html#NMSettingCdma-struct"/>
     <keyword type="property" name="The “number†property" link="NMSettingCdma.html#NMSettingCdma--number"/>
     <keyword type="property" name="The “password†property" link="NMSettingCdma.html#NMSettingCdma--password"/>
     <keyword type="property" name="The “password-flags†property" link="NMSettingCdma.html#NMSettingCdma--password-flags"/>
@@ -801,6 +812,7 @@
     <keyword type="macro" name="NM_SETTING_DCB_PRIORITY_BANDWIDTH" link="NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-BANDWIDTH:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH" link="NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-STRICT-BANDWIDTH:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS" link="NMSettingDcb.html#NM-SETTING-DCB-PRIORITY-TRAFFIC-CLASS:CAPS"/>
+    <keyword type="struct" name="NMSettingDcb" link="NMSettingDcb.html#NMSettingDcb-struct"/>
     <keyword type="property" name="The “app-fcoe-flags†property" link="NMSettingDcb.html#NMSettingDcb--app-fcoe-flags"/>
     <keyword type="property" name="The “app-fcoe-mode†property" link="NMSettingDcb.html#NMSettingDcb--app-fcoe-mode"/>
     <keyword type="property" name="The “app-fcoe-priority†property" link="NMSettingDcb.html#NMSettingDcb--app-fcoe-priority"/>
@@ -818,6 +830,7 @@
     <keyword type="property" name="The “priority-traffic-class†property" link="NMSettingDcb.html#NMSettingDcb--priority-traffic-class"/>
     <keyword type="function" name="nm_setting_generic_new ()" link="NMSettingGeneric.html#nm-setting-generic-new"/>
     <keyword type="macro" name="NM_SETTING_GENERIC_SETTING_NAME" link="NMSettingGeneric.html#NM-SETTING-GENERIC-SETTING-NAME:CAPS"/>
+    <keyword type="struct" name="NMSettingGeneric" link="NMSettingGeneric.html#NMSettingGeneric-struct"/>
     <keyword type="function" name="nm_setting_gsm_new ()" link="NMSettingGsm.html#nm-setting-gsm-new"/>
     <keyword type="function" name="nm_setting_gsm_get_number ()" link="NMSettingGsm.html#nm-setting-gsm-get-number"/>
     <keyword type="function" name="nm_setting_gsm_get_username ()" link="NMSettingGsm.html#nm-setting-gsm-get-username"/>
@@ -844,6 +857,7 @@
     <keyword type="macro" name="NM_SETTING_GSM_DEVICE_ID" link="NMSettingGsm.html#NM-SETTING-GSM-DEVICE-ID:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_SIM_ID" link="NMSettingGsm.html#NM-SETTING-GSM-SIM-ID:CAPS"/>
     <keyword type="macro" name="NM_SETTING_GSM_SIM_OPERATOR_ID" link="NMSettingGsm.html#NM-SETTING-GSM-SIM-OPERATOR-ID:CAPS"/>
+    <keyword type="struct" name="NMSettingGsm" link="NMSettingGsm.html#NMSettingGsm-struct"/>
     <keyword type="property" name="The “apn†property" link="NMSettingGsm.html#NMSettingGsm--apn"/>
     <keyword type="property" name="The “device-id†property" link="NMSettingGsm.html#NMSettingGsm--device-id"/>
     <keyword type="property" name="The “home-only†property" link="NMSettingGsm.html#NMSettingGsm--home-only"/>
@@ -869,6 +883,7 @@
     <keyword type="macro" name="NM_SETTING_INFINIBAND_TRANSPORT_MODE" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-TRANSPORT-MODE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_INFINIBAND_P_KEY" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-P-KEY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_INFINIBAND_PARENT" link="NMSettingInfiniband.html#NM-SETTING-INFINIBAND-PARENT:CAPS"/>
+    <keyword type="struct" name="NMSettingInfiniband" link="NMSettingInfiniband.html#NMSettingInfiniband-struct"/>
     <keyword type="property" name="The “mac-address†property" link="NMSettingInfiniband.html#NMSettingInfiniband--mac-address"/>
     <keyword type="property" name="The “mtu†property" link="NMSettingInfiniband.html#NMSettingInfiniband--mtu"/>
     <keyword type="property" name="The “p-key†property" link="NMSettingInfiniband.html#NMSettingInfiniband--p-key"/>
@@ -885,6 +900,7 @@
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_MANUAL" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-MANUAL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_SHARED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-SHARED:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP4_CONFIG_METHOD_DISABLED" link="NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-DISABLED:CAPS"/>
+    <keyword type="struct" name="NMSettingIP4Config" link="NMSettingIP4Config.html#NMSettingIP4Config-struct"/>
     <keyword type="property" name="The “dhcp-client-id†property" link="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-client-id"/>
     <keyword type="property" name="The “dhcp-fqdn†property" link="NMSettingIP4Config.html#NMSettingIP4Config--dhcp-fqdn"/>
     <keyword type="function" name="nm_setting_ip6_config_new ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-new"/>
@@ -901,6 +917,7 @@
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_SHARED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"/>
     <keyword type="enum" name="enum NMSettingIP6ConfigPrivacy" link="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy"/>
     <keyword type="enum" name="enum NMSettingIP6ConfigAddrGenMode" link="NMSettingIP6Config.html#NMSettingIP6ConfigAddrGenMode" since="1.2"/>
+    <keyword type="struct" name="NMSettingIP6Config" link="NMSettingIP6Config.html#NMSettingIP6Config-struct"/>
     <keyword type="property" name="The “addr-gen-mode†property" link="NMSettingIP6Config.html#NMSettingIP6Config--addr-gen-mode"/>
     <keyword type="property" name="The “ip6-privacy†property" link="NMSettingIP6Config.html#NMSettingIP6Config--ip6-privacy"/>
     <keyword type="function" name="nm_ip_address_new ()" link="NMSettingIPConfig.html#nm-ip-address-new"/>
@@ -1016,6 +1033,7 @@
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-SINGLE-REQUEST-REOPEN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_NO_TLD_QUERY" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-NO-TLD-QUERY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_DNS_OPTION_USE_VC" link="NMSettingIPConfig.html#NM-SETTING-DNS-OPTION-USE-VC:CAPS"/>
+    <keyword type="struct" name="NMSettingIPConfig" link="NMSettingIPConfig.html#NMSettingIPConfig-struct"/>
     <keyword type="property" name="The “addresses†property" link="NMSettingIPConfig.html#NMSettingIPConfig--addresses"/>
     <keyword type="property" name="The “dad-timeout†property" link="NMSettingIPConfig.html#NMSettingIPConfig--dad-timeout"/>
     <keyword type="property" name="The “dhcp-hostname†property" link="NMSettingIPConfig.html#NMSettingIPConfig--dhcp-hostname"/>
@@ -1058,6 +1076,7 @@
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_FLOW_LABEL" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-FLOW-LABEL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP_TUNNEL_MTU" link="NMSettingIPTunnel.html#NM-SETTING-IP-TUNNEL-MTU:CAPS"/>
+    <keyword type="struct" name="NMSettingIPTunnel" link="NMSettingIPTunnel.html#NMSettingIPTunnel-struct"/>
     <keyword type="property" name="The “encapsulation-limit†property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--encapsulation-limit"/>
     <keyword type="property" name="The “flow-label†property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--flow-label"/>
     <keyword type="property" name="The “input-key†property" link="NMSettingIPTunnel.html#NMSettingIPTunnel--input-key"/>
@@ -1080,6 +1099,7 @@
     <keyword type="macro" name="NM_SETTING_MACVLAN_MODE" link="NMSettingMacvlan.html#NM-SETTING-MACVLAN-MODE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_MACVLAN_PROMISCUOUS" link="NMSettingMacvlan.html#NM-SETTING-MACVLAN-PROMISCUOUS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_MACVLAN_TAP" link="NMSettingMacvlan.html#NM-SETTING-MACVLAN-TAP:CAPS"/>
+    <keyword type="struct" name="NMSettingMacvlan" link="NMSettingMacvlan.html#NMSettingMacvlan-struct"/>
     <keyword type="enum" name="enum NMSettingMacvlanMode" link="NMSettingMacvlan.html#NMSettingMacvlanMode"/>
     <keyword type="property" name="The “mode†property" link="NMSettingMacvlan.html#NMSettingMacvlan--mode"/>
     <keyword type="property" name="The “parent†property" link="NMSettingMacvlan.html#NMSettingMacvlan--parent"/>
@@ -1093,6 +1113,7 @@
     <keyword type="macro" name="NM_SETTING_OLPC_MESH_SSID" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-SSID:CAPS"/>
     <keyword type="macro" name="NM_SETTING_OLPC_MESH_CHANNEL" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-CHANNEL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS" link="NMSettingOlpcMesh.html#NM-SETTING-OLPC-MESH-DHCP-ANYCAST-ADDRESS:CAPS"/>
+    <keyword type="struct" name="NMSettingOlpcMesh" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh-struct"/>
     <keyword type="property" name="The “channel†property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--channel"/>
     <keyword type="property" name="The “dhcp-anycast-address†property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--dhcp-anycast-address"/>
     <keyword type="property" name="The “ssid†property" link="NMSettingOlpcMesh.html#NMSettingOlpcMesh--ssid"/>
@@ -1134,6 +1155,7 @@
     <keyword type="macro" name="NM_SETTING_PPP_MTU" link="NMSettingPpp.html#NM-SETTING-PPP-MTU:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PPP_LCP_ECHO_FAILURE" link="NMSettingPpp.html#NM-SETTING-PPP-LCP-ECHO-FAILURE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PPP_LCP_ECHO_INTERVAL" link="NMSettingPpp.html#NM-SETTING-PPP-LCP-ECHO-INTERVAL:CAPS"/>
+    <keyword type="struct" name="NMSettingPpp" link="NMSettingPpp.html#NMSettingPpp-struct"/>
     <keyword type="property" name="The “baud†property" link="NMSettingPpp.html#NMSettingPpp--baud"/>
     <keyword type="property" name="The “crtscts†property" link="NMSettingPpp.html#NMSettingPpp--crtscts"/>
     <keyword type="property" name="The “lcp-echo-failure†property" link="NMSettingPpp.html#NMSettingPpp--lcp-echo-failure"/>
@@ -1162,6 +1184,7 @@
     <keyword type="macro" name="NM_SETTING_PPPOE_USERNAME" link="NMSettingPppoe.html#NM-SETTING-PPPOE-USERNAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD:CAPS"/>
     <keyword type="macro" name="NM_SETTING_PPPOE_PASSWORD_FLAGS" link="NMSettingPppoe.html#NM-SETTING-PPPOE-PASSWORD-FLAGS:CAPS"/>
+    <keyword type="struct" name="NMSettingPppoe" link="NMSettingPppoe.html#NMSettingPppoe-struct"/>
     <keyword type="property" name="The “password†property" link="NMSettingPppoe.html#NMSettingPppoe--password"/>
     <keyword type="property" name="The “password-flags†property" link="NMSettingPppoe.html#NMSettingPppoe--password-flags"/>
     <keyword type="property" name="The “service†property" link="NMSettingPppoe.html#NMSettingPppoe--service"/>
@@ -1179,6 +1202,7 @@
     <keyword type="macro" name="NM_SETTING_SERIAL_PARITY" link="NMSettingSerial.html#NM-SETTING-SERIAL-PARITY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_SERIAL_STOPBITS" link="NMSettingSerial.html#NM-SETTING-SERIAL-STOPBITS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_SERIAL_SEND_DELAY" link="NMSettingSerial.html#NM-SETTING-SERIAL-SEND-DELAY:CAPS"/>
+    <keyword type="struct" name="NMSettingSerial" link="NMSettingSerial.html#NMSettingSerial-struct"/>
     <keyword type="property" name="The “baud†property" link="NMSettingSerial.html#NMSettingSerial--baud"/>
     <keyword type="property" name="The “bits†property" link="NMSettingSerial.html#NMSettingSerial--bits"/>
     <keyword type="property" name="The “parity†property" link="NMSettingSerial.html#NMSettingSerial--parity"/>
@@ -1188,11 +1212,13 @@
     <keyword type="function" name="nm_setting_team_get_config ()" link="NMSettingTeam.html#nm-setting-team-get-config"/>
     <keyword type="macro" name="NM_SETTING_TEAM_SETTING_NAME" link="NMSettingTeam.html#NM-SETTING-TEAM-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_TEAM_CONFIG" link="NMSettingTeam.html#NM-SETTING-TEAM-CONFIG:CAPS"/>
+    <keyword type="struct" name="NMSettingTeam" link="NMSettingTeam.html#NMSettingTeam-struct"/>
     <keyword type="property" name="The “config†property" link="NMSettingTeam.html#NMSettingTeam--config"/>
     <keyword type="function" name="nm_setting_team_port_new ()" link="NMSettingTeamPort.html#nm-setting-team-port-new"/>
     <keyword type="function" name="nm_setting_team_port_get_config ()" link="NMSettingTeamPort.html#nm-setting-team-port-get-config"/>
     <keyword type="macro" name="NM_SETTING_TEAM_PORT_SETTING_NAME" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_TEAM_PORT_CONFIG" link="NMSettingTeamPort.html#NM-SETTING-TEAM-PORT-CONFIG:CAPS"/>
+    <keyword type="struct" name="NMSettingTeamPort" link="NMSettingTeamPort.html#NMSettingTeamPort-struct"/>
     <keyword type="property" name="The “config†property" link="NMSettingTeamPort.html#NMSettingTeamPort--config"/>
     <keyword type="function" name="nm_setting_tun_new ()" link="NMSettingTun.html#nm-setting-tun-new" since="1.2"/>
     <keyword type="function" name="nm_setting_tun_get_mode ()" link="NMSettingTun.html#nm-setting-tun-get-mode" since="1.2"/>
@@ -1209,6 +1235,7 @@
     <keyword type="macro" name="NM_SETTING_TUN_VNET_HDR" link="NMSettingTun.html#NM-SETTING-TUN-VNET-HDR:CAPS"/>
     <keyword type="macro" name="NM_SETTING_TUN_MULTI_QUEUE" link="NMSettingTun.html#NM-SETTING-TUN-MULTI-QUEUE:CAPS"/>
     <keyword type="enum" name="enum NMSettingTunMode" link="NMSettingTun.html#NMSettingTunMode"/>
+    <keyword type="struct" name="NMSettingTun" link="NMSettingTun.html#NMSettingTun-struct"/>
     <keyword type="property" name="The “group†property" link="NMSettingTun.html#NMSettingTun--group"/>
     <keyword type="property" name="The “mode†property" link="NMSettingTun.html#NMSettingTun--mode"/>
     <keyword type="property" name="The “multi-queue†property" link="NMSettingTun.html#NMSettingTun--multi-queue"/>
@@ -1234,6 +1261,7 @@
     <keyword type="macro" name="NM_SETTING_VLAN_FLAGS" link="NMSettingVlan.html#NM-SETTING-VLAN-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VLAN_INGRESS_PRIORITY_MAP" link="NMSettingVlan.html#NM-SETTING-VLAN-INGRESS-PRIORITY-MAP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VLAN_EGRESS_PRIORITY_MAP" link="NMSettingVlan.html#NM-SETTING-VLAN-EGRESS-PRIORITY-MAP:CAPS"/>
+    <keyword type="struct" name="NMSettingVlan" link="NMSettingVlan.html#NMSettingVlan-struct"/>
     <keyword type="enum" name="enum NMVlanPriorityMap" link="NMSettingVlan.html#NMVlanPriorityMap"/>
     <keyword type="enum" name="enum NMVlanFlags" link="NMSettingVlan.html#NMVlanFlags"/>
     <keyword type="property" name="The “egress-priority-map†property" link="NMSettingVlan.html#NMSettingVlan--egress-priority-map"/>
@@ -1264,6 +1292,7 @@
     <keyword type="macro" name="NM_SETTING_VPN_DATA" link="NMSettingVpn.html#NM-SETTING-VPN-DATA:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VPN_SECRETS" link="NMSettingVpn.html#NM-SETTING-VPN-SECRETS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VPN_TIMEOUT" link="NMSettingVpn.html#NM-SETTING-VPN-TIMEOUT:CAPS"/>
+    <keyword type="struct" name="NMSettingVpn" link="NMSettingVpn.html#NMSettingVpn-struct"/>
     <keyword type="property" name="The “data†property" link="NMSettingVpn.html#NMSettingVpn--data"/>
     <keyword type="property" name="The “persistent†property" link="NMSettingVpn.html#NMSettingVpn--persistent"/>
     <keyword type="property" name="The “secrets†property" link="NMSettingVpn.html#NMSettingVpn--secrets"/>
@@ -1304,6 +1333,7 @@
     <keyword type="macro" name="NM_SETTING_VXLAN_RSC" link="NMSettingVxlan.html#NM-SETTING-VXLAN-RSC:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VXLAN_L2_MISS" link="NMSettingVxlan.html#NM-SETTING-VXLAN-L2-MISS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_VXLAN_L3_MISS" link="NMSettingVxlan.html#NM-SETTING-VXLAN-L3-MISS:CAPS"/>
+    <keyword type="struct" name="NMSettingVxlan" link="NMSettingVxlan.html#NMSettingVxlan-struct"/>
     <keyword type="property" name="The “ageing†property" link="NMSettingVxlan.html#NMSettingVxlan--ageing"/>
     <keyword type="property" name="The “destination-port†property" link="NMSettingVxlan.html#NMSettingVxlan--destination-port"/>
     <keyword type="property" name="The “id†property" link="NMSettingVxlan.html#NMSettingVxlan--id"/>
@@ -1326,6 +1356,7 @@
     <keyword type="macro" name="NM_SETTING_WIMAX_SETTING_NAME" link="NMSettingWimax.html#NM-SETTING-WIMAX-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIMAX_NETWORK_NAME" link="NMSettingWimax.html#NM-SETTING-WIMAX-NETWORK-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIMAX_MAC_ADDRESS" link="NMSettingWimax.html#NM-SETTING-WIMAX-MAC-ADDRESS:CAPS"/>
+    <keyword type="struct" name="NMSettingWimax" link="NMSettingWimax.html#NMSettingWimax-struct"/>
     <keyword type="property" name="The “mac-address†property" link="NMSettingWimax.html#NMSettingWimax--mac-address"/>
     <keyword type="property" name="The “network-name†property" link="NMSettingWimax.html#NMSettingWimax--network-name"/>
     <keyword type="function" name="nm_setting_wired_new ()" link="NMSettingWired.html#nm-setting-wired-new"/>
@@ -1368,6 +1399,7 @@
     <keyword type="macro" name="NM_SETTING_WIRED_S390_OPTIONS" link="NMSettingWired.html#NM-SETTING-WIRED-S390-OPTIONS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRED_WAKE_ON_LAN" link="NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD" link="NMSettingWired.html#NM-SETTING-WIRED-WAKE-ON-LAN-PASSWORD:CAPS"/>
+    <keyword type="struct" name="NMSettingWired" link="NMSettingWired.html#NMSettingWired-struct"/>
     <keyword type="property" name="The “auto-negotiate†property" link="NMSettingWired.html#NMSettingWired--auto-negotiate"/>
     <keyword type="property" name="The “cloned-mac-address†property" link="NMSettingWired.html#NMSettingWired--cloned-mac-address"/>
     <keyword type="property" name="The “duplex†property" link="NMSettingWired.html#NMSettingWired--duplex"/>
@@ -1426,6 +1458,7 @@
     <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_AP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
     <keyword type="enum" name="enum NMSettingWirelessPowersave" link="NMSettingWireless.html#NMSettingWirelessPowersave"/>
+    <keyword type="struct" name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
     <keyword type="property" name="The “band†property" link="NMSettingWireless.html#NMSettingWireless--band"/>
     <keyword type="property" name="The “bssid†property" link="NMSettingWireless.html#NMSettingWireless--bssid"/>
     <keyword type="property" name="The “channel†property" link="NMSettingWireless.html#NMSettingWireless--channel"/>
@@ -1491,6 +1524,7 @@
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-PSK-FLAGS:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS" link="NMSettingWirelessSecurity.html#NM-SETTING-WIRELESS-SECURITY-LEAP-PASSWORD-FLAGS:CAPS"/>
+    <keyword type="struct" name="NMSettingWirelessSecurity" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct"/>
     <keyword type="property" name="The “auth-alg†property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--auth-alg"/>
     <keyword type="property" name="The “group†property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--group"/>
     <keyword type="property" name="The “key-mgmt†property" link="NMSettingWirelessSecurity.html#NMSettingWirelessSecurity--key-mgmt"/>
@@ -1592,6 +1626,7 @@
     <keyword type="macro" name="NM_DEVICE_MTU" link="NMDevice.html#NM-DEVICE-MTU:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_METERED" link="NMDevice.html#NM-DEVICE-METERED:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_LLDP_NEIGHBORS" link="NMDevice.html#NM-DEVICE-LLDP-NEIGHBORS:CAPS"/>
+    <keyword type="struct" name="NMDevice" link="NMDevice.html#NMDevice-struct"/>
     <keyword type="property" name="The “active-connection†property" link="NMDevice.html#NMDevice--active-connection"/>
     <keyword type="property" name="The “autoconnect†property" link="NMDevice.html#NMDevice--autoconnect"/>
     <keyword type="property" name="The “available-connections†property" link="NMDevice.html#NMDevice--available-connections"/>
@@ -1622,6 +1657,7 @@
     <keyword type="signal" name="The “state-changed†signal" link="NMDevice.html#NMDevice-state-changed"/>
     <keyword type="function" name="nm_device_adsl_get_carrier ()" link="NMDeviceAdsl.html#nm-device-adsl-get-carrier"/>
     <keyword type="macro" name="NM_DEVICE_ADSL_CARRIER" link="NMDeviceAdsl.html#NM-DEVICE-ADSL-CARRIER:CAPS"/>
+    <keyword type="struct" name="NMDeviceAdsl" link="NMDeviceAdsl.html#NMDeviceAdsl-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceAdsl.html#NMDeviceAdsl--carrier"/>
     <keyword type="function" name="nm_device_bond_get_hw_address ()" link="NMDeviceBond.html#nm-device-bond-get-hw-address"/>
     <keyword type="function" name="nm_device_bond_get_carrier ()" link="NMDeviceBond.html#nm-device-bond-get-carrier"/>
@@ -1629,6 +1665,7 @@
     <keyword type="macro" name="NM_DEVICE_BOND_HW_ADDRESS" link="NMDeviceBond.html#NM-DEVICE-BOND-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BOND_CARRIER" link="NMDeviceBond.html#NM-DEVICE-BOND-CARRIER:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BOND_SLAVES" link="NMDeviceBond.html#NM-DEVICE-BOND-SLAVES:CAPS"/>
+    <keyword type="struct" name="NMDeviceBond" link="NMDeviceBond.html#NMDeviceBond-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceBond.html#NMDeviceBond--carrier"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceBond.html#NMDeviceBond--hw-address"/>
     <keyword type="property" name="The “slaves†property" link="NMDeviceBond.html#NMDeviceBond--slaves"/>
@@ -1638,6 +1675,7 @@
     <keyword type="macro" name="NM_DEVICE_BRIDGE_HW_ADDRESS" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BRIDGE_CARRIER" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-CARRIER:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BRIDGE_SLAVES" link="NMDeviceBridge.html#NM-DEVICE-BRIDGE-SLAVES:CAPS"/>
+    <keyword type="struct" name="NMDeviceBridge" link="NMDeviceBridge.html#NMDeviceBridge-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceBridge.html#NMDeviceBridge--carrier"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceBridge.html#NMDeviceBridge--hw-address"/>
     <keyword type="property" name="The “slaves†property" link="NMDeviceBridge.html#NMDeviceBridge--slaves"/>
@@ -1647,6 +1685,7 @@
     <keyword type="macro" name="NM_DEVICE_BT_HW_ADDRESS" link="NMDeviceBt.html#NM-DEVICE-BT-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BT_NAME" link="NMDeviceBt.html#NM-DEVICE-BT-NAME:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_BT_CAPABILITIES" link="NMDeviceBt.html#NM-DEVICE-BT-CAPABILITIES:CAPS"/>
+    <keyword type="struct" name="NMDeviceBt" link="NMDeviceBt.html#NMDeviceBt-struct"/>
     <keyword type="property" name="The “bt-capabilities†property" link="NMDeviceBt.html#NMDeviceBt--bt-capabilities"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceBt.html#NMDeviceBt--hw-address"/>
     <keyword type="property" name="The “name†property" link="NMDeviceBt.html#NMDeviceBt--name"/>
@@ -1660,6 +1699,7 @@
     <keyword type="macro" name="NM_DEVICE_ETHERNET_SPEED" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-SPEED:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_ETHERNET_CARRIER" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-CARRIER:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_ETHERNET_S390_SUBCHANNELS" link="NMDeviceEthernet.html#NM-DEVICE-ETHERNET-S390-SUBCHANNELS:CAPS"/>
+    <keyword type="struct" name="NMDeviceEthernet" link="NMDeviceEthernet.html#NMDeviceEthernet-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceEthernet.html#NMDeviceEthernet--carrier"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceEthernet.html#NMDeviceEthernet--hw-address"/>
     <keyword type="property" name="The “perm-hw-address†property" link="NMDeviceEthernet.html#NMDeviceEthernet--perm-hw-address"/>
@@ -1668,12 +1708,14 @@
     <keyword type="function" name="nm_device_generic_get_hw_address ()" link="NMDeviceGeneric.html#nm-device-generic-get-hw-address"/>
     <keyword type="macro" name="NM_DEVICE_GENERIC_HW_ADDRESS" link="NMDeviceGeneric.html#NM-DEVICE-GENERIC-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_GENERIC_TYPE_DESCRIPTION" link="NMDeviceGeneric.html#NM-DEVICE-GENERIC-TYPE-DESCRIPTION:CAPS"/>
+    <keyword type="struct" name="NMDeviceGeneric" link="NMDeviceGeneric.html#NMDeviceGeneric-struct"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceGeneric.html#NMDeviceGeneric--hw-address"/>
     <keyword type="property" name="The “type-description†property" link="NMDeviceGeneric.html#NMDeviceGeneric--type-description"/>
     <keyword type="function" name="nm_device_infiniband_get_hw_address ()" link="NMDeviceInfiniband.html#nm-device-infiniband-get-hw-address"/>
     <keyword type="function" name="nm_device_infiniband_get_carrier ()" link="NMDeviceInfiniband.html#nm-device-infiniband-get-carrier"/>
     <keyword type="macro" name="NM_DEVICE_INFINIBAND_HW_ADDRESS" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_INFINIBAND_CARRIER" link="NMDeviceInfiniband.html#NM-DEVICE-INFINIBAND-CARRIER:CAPS"/>
+    <keyword type="struct" name="NMDeviceInfiniband" link="NMDeviceInfiniband.html#NMDeviceInfiniband-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceInfiniband.html#NMDeviceInfiniband--carrier"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceInfiniband.html#NMDeviceInfiniband--hw-address"/>
     <keyword type="function" name="nm_device_ip_tunnel_get_parent ()" link="NMDeviceIPTunnel.html#nm-device-ip-tunnel-get-parent" since="1.2"/>
@@ -1698,6 +1740,7 @@
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_OUTPUT_KEY" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-OUTPUT-KEY:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-ENCAPSULATION-LIMIT:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_IP_TUNNEL_FLOW_LABEL" link="NMDeviceIPTunnel.html#NM-DEVICE-IP-TUNNEL-FLOW-LABEL:CAPS"/>
+    <keyword type="struct" name="NMDeviceIPTunnel" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct"/>
     <keyword type="property" name="The “encapsulation-limit†property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--encapsulation-limit"/>
     <keyword type="property" name="The “flow-label†property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label"/>
     <keyword type="property" name="The “input-key†property" link="NMDeviceIPTunnel.html#NMDeviceIPTunnel--input-key"/>
@@ -1719,6 +1762,7 @@
     <keyword type="macro" name="NM_DEVICE_MACVLAN_NO_PROMISC" link="NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-NO-PROMISC:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_MACVLAN_TAP" link="NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-TAP:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_MACVLAN_HW_ADDRESS" link="NMDeviceMacvlan.html#NM-DEVICE-MACVLAN-HW-ADDRESS:CAPS"/>
+    <keyword type="struct" name="NMDeviceMacvlan" link="NMDeviceMacvlan.html#NMDeviceMacvlan-struct"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceMacvlan.html#NMDeviceMacvlan--hw-address"/>
     <keyword type="property" name="The “mode†property" link="NMDeviceMacvlan.html#NMDeviceMacvlan--mode"/>
     <keyword type="property" name="The “no-promisc†property" link="NMDeviceMacvlan.html#NMDeviceMacvlan--no-promisc"/>
@@ -1728,6 +1772,7 @@
     <keyword type="function" name="nm_device_modem_get_current_capabilities ()" link="NMDeviceModem.html#nm-device-modem-get-current-capabilities"/>
     <keyword type="macro" name="NM_DEVICE_MODEM_MODEM_CAPABILITIES" link="NMDeviceModem.html#NM-DEVICE-MODEM-MODEM-CAPABILITIES:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_MODEM_CURRENT_CAPABILITIES" link="NMDeviceModem.html#NM-DEVICE-MODEM-CURRENT-CAPABILITIES:CAPS"/>
+    <keyword type="struct" name="NMDeviceModem" link="NMDeviceModem.html#NMDeviceModem-struct"/>
     <keyword type="property" name="The “current-capabilities†property" link="NMDeviceModem.html#NMDeviceModem--current-capabilities"/>
     <keyword type="property" name="The “modem-capabilities†property" link="NMDeviceModem.html#NMDeviceModem--modem-capabilities"/>
     <keyword type="function" name="nm_device_olpc_mesh_get_hw_address ()" link="NMDeviceOlpcMesh.html#nm-device-olpc-mesh-get-hw-address"/>
@@ -1736,6 +1781,7 @@
     <keyword type="macro" name="NM_DEVICE_OLPC_MESH_HW_ADDRESS" link="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_OLPC_MESH_COMPANION" link="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-COMPANION:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL" link="NMDeviceOlpcMesh.html#NM-DEVICE-OLPC-MESH-ACTIVE-CHANNEL:CAPS"/>
+    <keyword type="struct" name="NMDeviceOlpcMesh" link="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh-struct"/>
     <keyword type="property" name="The “active-channel†property" link="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--active-channel"/>
     <keyword type="property" name="The “companion†property" link="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--companion"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--hw-address"/>
@@ -1745,6 +1791,7 @@
     <keyword type="macro" name="NM_DEVICE_TEAM_HW_ADDRESS" link="NMDeviceTeam.html#NM-DEVICE-TEAM-HW-ADDRESS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_TEAM_CARRIER" link="NMDeviceTeam.html#NM-DEVICE-TEAM-CARRIER:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_TEAM_SLAVES" link="NMDeviceTeam.html#NM-DEVICE-TEAM-SLAVES:CAPS"/>
+    <keyword type="struct" name="NMDeviceTeam" link="NMDeviceTeam.html#NMDeviceTeam-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceTeam.html#NMDeviceTeam--carrier"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceTeam.html#NMDeviceTeam--hw-address"/>
     <keyword type="property" name="The “slaves†property" link="NMDeviceTeam.html#NMDeviceTeam--slaves"/>
@@ -1762,6 +1809,7 @@
     <keyword type="macro" name="NM_DEVICE_TUN_NO_PI" link="NMDeviceTun.html#NM-DEVICE-TUN-NO-PI:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_TUN_VNET_HDR" link="NMDeviceTun.html#NM-DEVICE-TUN-VNET-HDR:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_TUN_MULTI_QUEUE" link="NMDeviceTun.html#NM-DEVICE-TUN-MULTI-QUEUE:CAPS"/>
+    <keyword type="struct" name="NMDeviceTun" link="NMDeviceTun.html#NMDeviceTun-struct"/>
     <keyword type="property" name="The “group†property" link="NMDeviceTun.html#NMDeviceTun--group"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceTun.html#NMDeviceTun--hw-address"/>
     <keyword type="property" name="The “mode†property" link="NMDeviceTun.html#NMDeviceTun--mode"/>
@@ -1777,6 +1825,7 @@
     <keyword type="macro" name="NM_DEVICE_VLAN_CARRIER" link="NMDeviceVlan.html#NM-DEVICE-VLAN-CARRIER:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_VLAN_PARENT" link="NMDeviceVlan.html#NM-DEVICE-VLAN-PARENT:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_VLAN_VLAN_ID" link="NMDeviceVlan.html#NM-DEVICE-VLAN-VLAN-ID:CAPS"/>
+    <keyword type="struct" name="NMDeviceVlan" link="NMDeviceVlan.html#NMDeviceVlan-struct"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceVlan.html#NMDeviceVlan--carrier"/>
     <keyword type="property" name="The “hw-address†property" link="NMDeviceVlan.html#NMDeviceVlan--hw-address"/>
     <keyword type="property" name="The “parent†property" link="NMDeviceVlan.html#NMDeviceVlan--parent"/>
@@ -1817,6 +1866,7 @@
     <keyword type="macro" name="NM_DEVICE_VXLAN_L2MISS" link="NMDeviceVxlan.html#NM-DEVICE-VXLAN-L2MISS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_VXLAN_L3MISS" link="NMDeviceVxlan.html#NM-DEVICE-VXLAN-L3MISS:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_VXLAN_DST_PORT" link="NMDeviceVxlan.html#NM-DEVICE-VXLAN-DST-PORT:CAPS"/>
+    <keyword type="struct" name="NMDeviceVxlan" link="NMDeviceVxlan.html#NMDeviceVxlan-struct"/>
     <keyword type="property" name="The “ageing†property" link="NMDeviceVxlan.html#NMDeviceVxlan--ageing"/>
     <keyword type="property" name="The “carrier†property" link="NMDeviceVxlan.html#NMDeviceVxlan--carrier"/>
     <keyword type="property" name="The “dst-port†property" link="NMDeviceVxlan.html#NMDeviceVxlan--dst-port"/>
@@ -1855,6 +1905,7 @@
     <keyword type="macro" name="NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ACTIVE-ACCESS-POINT:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_WIFI_CAPABILITIES" link="NMDeviceWifi.html#NM-DEVICE-WIFI-CAPABILITIES:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_WIFI_ACCESS_POINTS" link="NMDeviceWifi.html#NM-DEVICE-WIFI-ACCESS-POINTS:CAPS"/>
+    <keyword type="struct" name="NMDeviceWifi" link="NMDeviceWifi.html#NMDeviceWifi-struct"/>
     <keyword type="property" name="The “access-points†property" link="NMDeviceWifi.html#NMDeviceWifi--access-points"/>
     <keyword type="property" name="The “active-access-point†property" link="NMDeviceWifi.html#NMDeviceWifi--active-access-point"/>
     <keyword type="property" name="The “bitrate†property" link="NMDeviceWifi.html#NMDeviceWifi--bitrate"/>
@@ -1881,6 +1932,7 @@
     <keyword type="macro" name="NM_DEVICE_WIMAX_TX_POWER" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-TX-POWER:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_WIMAX_BSID" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-BSID:CAPS"/>
     <keyword type="macro" name="NM_DEVICE_WIMAX_NSPS" link="NMDeviceWimax.html#NM-DEVICE-WIMAX-NSPS:CAPS"/>
+    <keyword type="struct" name="NMDeviceWimax" link="NMDeviceWimax.html#NMDeviceWimax-struct"/>
     <keyword type="property" name="The “active-nsp†property" link="NMDeviceWimax.html#NMDeviceWimax--active-nsp"/>
     <keyword type="property" name="The “bsid†property" link="NMDeviceWimax.html#NMDeviceWimax--bsid"/>
     <keyword type="property" name="The “center-frequency†property" link="NMDeviceWimax.html#NMDeviceWimax--center-frequency"/>
@@ -1921,6 +1973,7 @@
     <keyword type="macro" name="NM_ACTIVE_CONNECTION_DHCP6_CONFIG" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-DHCP6-CONFIG:CAPS"/>
     <keyword type="macro" name="NM_ACTIVE_CONNECTION_VPN" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-VPN:CAPS"/>
     <keyword type="macro" name="NM_ACTIVE_CONNECTION_MASTER" link="NMActiveConnection.html#NM-ACTIVE-CONNECTION-MASTER:CAPS"/>
+    <keyword type="struct" name="NMActiveConnection" link="NMActiveConnection.html#NMActiveConnection-struct"/>
     <keyword type="property" name="The “connection†property" link="NMActiveConnection.html#NMActiveConnection--connection"/>
     <keyword type="property" name="The “default†property" link="NMActiveConnection.html#NMActiveConnection--default"/>
     <keyword type="property" name="The “default6†property" link="NMActiveConnection.html#NMActiveConnection--default6"/>
@@ -1940,6 +1993,7 @@
     <keyword type="function" name="nm_vpn_connection_get_banner ()" link="NMVpnConnection.html#nm-vpn-connection-get-banner"/>
     <keyword type="macro" name="NM_VPN_CONNECTION_VPN_STATE" link="NMVpnConnection.html#NM-VPN-CONNECTION-VPN-STATE:CAPS"/>
     <keyword type="macro" name="NM_VPN_CONNECTION_BANNER" link="NMVpnConnection.html#NM-VPN-CONNECTION-BANNER:CAPS"/>
+    <keyword type="struct" name="NMVpnConnection" link="NMVpnConnection.html#NMVpnConnection-struct"/>
     <keyword type="property" name="The “banner†property" link="NMVpnConnection.html#NMVpnConnection--banner"/>
     <keyword type="property" name="The “vpn-state†property" link="NMVpnConnection.html#NMVpnConnection--vpn-state"/>
     <keyword type="signal" name="The “vpn-state-changed†signal" link="NMVpnConnection.html#NMVpnConnection-vpn-state-changed"/>
@@ -1961,6 +2015,7 @@
     <keyword type="macro" name="NM_REMOTE_CONNECTION_PATH" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-PATH:CAPS"/>
     <keyword type="macro" name="NM_REMOTE_CONNECTION_UNSAVED" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-UNSAVED:CAPS"/>
     <keyword type="macro" name="NM_REMOTE_CONNECTION_VISIBLE" link="NMRemoteConnection.html#NM-REMOTE-CONNECTION-VISIBLE:CAPS"/>
+    <keyword type="struct" name="NMRemoteConnection" link="NMRemoteConnection.html#NMRemoteConnection-struct"/>
     <keyword type="property" name="The “unsaved†property" link="NMRemoteConnection.html#NMRemoteConnection--unsaved"/>
     <keyword type="property" name="The “visible†property" link="NMRemoteConnection.html#NMRemoteConnection--visible"/>
     <keyword type="function" name="nm_access_point_get_flags ()" link="NMAccessPoint.html#nm-access-point-get-flags"/>
@@ -1986,6 +2041,7 @@
     <keyword type="macro" name="NM_ACCESS_POINT_STRENGTH" link="NMAccessPoint.html#NM-ACCESS-POINT-STRENGTH:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_LAST_SEEN" link="NMAccessPoint.html#NM-ACCESS-POINT-LAST-SEEN:CAPS"/>
     <keyword type="macro" name="NM_ACCESS_POINT_HW_ADDRESS" link="NMAccessPoint.html#NM-ACCESS-POINT-HW-ADDRESS:CAPS"/>
+    <keyword type="struct" name="NMAccessPoint" link="NMAccessPoint.html#NMAccessPoint-struct"/>
     <keyword type="property" name="The “bssid†property" link="NMAccessPoint.html#NMAccessPoint--bssid"/>
     <keyword type="property" name="The “flags†property" link="NMAccessPoint.html#NMAccessPoint--flags"/>
     <keyword type="property" name="The “frequency†property" link="NMAccessPoint.html#NMAccessPoint--frequency"/>
@@ -2005,6 +2061,7 @@
     <keyword type="macro" name="NM_WIMAX_NSP_NAME" link="NMWimaxNsp.html#NM-WIMAX-NSP-NAME:CAPS"/>
     <keyword type="macro" name="NM_WIMAX_NSP_SIGNAL_QUALITY" link="NMWimaxNsp.html#NM-WIMAX-NSP-SIGNAL-QUALITY:CAPS"/>
     <keyword type="macro" name="NM_WIMAX_NSP_NETWORK_TYPE" link="NMWimaxNsp.html#NM-WIMAX-NSP-NETWORK-TYPE:CAPS"/>
+    <keyword type="struct" name="NMWimaxNsp" link="NMWimaxNsp.html#NMWimaxNsp-struct"/>
     <keyword type="property" name="The “name†property" link="NMWimaxNsp.html#NMWimaxNsp--name"/>
     <keyword type="property" name="The “network-type†property" link="NMWimaxNsp.html#NMWimaxNsp--network-type"/>
     <keyword type="property" name="The “signal-quality†property" link="NMWimaxNsp.html#NMWimaxNsp--signal-quality"/>
@@ -2016,6 +2073,7 @@
     <keyword type="function" name="nm_ip_config_get_domains ()" link="NMIPConfig.html#nm-ip-config-get-domains"/>
     <keyword type="function" name="nm_ip_config_get_searches ()" link="NMIPConfig.html#nm-ip-config-get-searches"/>
     <keyword type="function" name="nm_ip_config_get_wins_servers ()" link="NMIPConfig.html#nm-ip-config-get-wins-servers"/>
+    <keyword type="struct" name="NMIPConfig" link="NMIPConfig.html#NMIPConfig-struct"/>
     <keyword type="macro" name="NM_IP_CONFIG_FAMILY" link="NMIPConfig.html#NM-IP-CONFIG-FAMILY:CAPS"/>
     <keyword type="macro" name="NM_IP_CONFIG_GATEWAY" link="NMIPConfig.html#NM-IP-CONFIG-GATEWAY:CAPS"/>
     <keyword type="macro" name="NM_IP_CONFIG_ADDRESSES" link="NMIPConfig.html#NM-IP-CONFIG-ADDRESSES:CAPS"/>
@@ -2035,6 +2093,7 @@
     <keyword type="function" name="nm_dhcp_config_get_family ()" link="NMDhcpConfig.html#nm-dhcp-config-get-family"/>
     <keyword type="function" name="nm_dhcp_config_get_options ()" link="NMDhcpConfig.html#nm-dhcp-config-get-options"/>
     <keyword type="function" name="nm_dhcp_config_get_one_option ()" link="NMDhcpConfig.html#nm-dhcp-config-get-one-option"/>
+    <keyword type="struct" name="NMDhcpConfig" link="NMDhcpConfig.html#NMDhcpConfig-struct"/>
     <keyword type="macro" name="NM_DHCP_CONFIG_FAMILY" link="NMDhcpConfig.html#NM-DHCP-CONFIG-FAMILY:CAPS"/>
     <keyword type="macro" name="NM_DHCP_CONFIG_OPTIONS" link="NMDhcpConfig.html#NM-DHCP-CONFIG-OPTIONS:CAPS"/>
     <keyword type="property" name="The “family†property" link="NMDhcpConfig.html#NMDhcpConfig--family"/>
@@ -2466,9 +2525,9 @@
     <keyword type="constant" name="NM_IP_TUNNEL_MODE_IPIP6" link="libnm-nm-dbus-interface.html#NM-IP-TUNNEL-MODE-IPIP6:CAPS"/>
     <keyword type="constant" name="NM_IP_TUNNEL_MODE_IP6GRE" link="libnm-nm-dbus-interface.html#NM-IP-TUNNEL-MODE-IP6GRE:CAPS"/>
     <keyword type="constant" name="NM_IP_TUNNEL_MODE_VTI6" link="libnm-nm-dbus-interface.html#NM-IP-TUNNEL-MODE-VTI6:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_ALL" link="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_NO_SECRETS" link="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS"/>
-    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_ONLY_SECRETS" link="libnm-NMConnection.html#NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_ALL" link="NMConnection.html#NM-CONNECTION-SERIALIZE-ALL:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_NO_SECRETS" link="NMConnection.html#NM-CONNECTION-SERIALIZE-NO-SECRETS:CAPS"/>
+    <keyword type="constant" name="NM_CONNECTION_SERIALIZE_ONLY_SECRETS" link="NMConnection.html#NM-CONNECTION-SERIALIZE-ONLY-SECRETS:CAPS"/>
     <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NONE" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NONE:CAPS"/>
     <keyword type="constant" name="NM_SETTING_SECRET_FLAG_AGENT_OWNED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-AGENT-OWNED:CAPS"/>
     <keyword type="constant" name="NM_SETTING_SECRET_FLAG_NOT_SAVED" link="NMSetting.html#NM-SETTING-SECRET-FLAG-NOT-SAVED:CAPS"/>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 66f19502..ea853287 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -85,14 +85,15 @@
     <span class="lineart">├──</span> <a class="link" href="NMClient.html" title="NMClient">NMClient</a>
     <span class="lineart">├──</span> <a class="link" href="NMSecretAgentOld.html" title="NMSecretAgentOld">NMSecretAgentOld</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSimpleConnection.html" title="NMSimpleConnection">NMSimpleConnection</a>
-    <a href="/usr/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
+    GInterface
+    <span class="lineart">├──</span> <a class="link" href="NMConnection.html" title="NMConnection">NMConnection</a>
     <span class="lineart">├──</span> <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditor">NMVpnEditor</a>
     <span class="lineart">╰──</span> <a class="link" href="NMVpnEditorPlugin.html" title="NMVpnEditorPlugin">NMVpnEditorPlugin</a>
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GFlags</a>
+    GFlags
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApFlags" title="enum NM80211ApFlags">NM80211ApFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NM80211ApSecurityFlags" title="enum NM80211ApSecurityFlags">NM80211ApSecurityFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMBluetoothCapabilities" title="enum NMBluetoothCapabilities">NMBluetoothCapabilities</a>
-    <span class="lineart">├──</span> <a class="link" href="libnm-NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a>
+    <span class="lineart">├──</span> <a class="link" href="NMConnection.html#NMConnectionSerializationFlags" title="enum NMConnectionSerializationFlags">NMConnectionSerializationFlags</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceCapabilities" title="enum NMDeviceCapabilities">NMDeviceCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceModemCapabilities" title="enum NMDeviceModemCapabilities">NMDeviceModemCapabilities</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities" title="enum NMDeviceWifiCapabilities">NMDeviceWifiCapabilities</a>
@@ -103,7 +104,7 @@
     <span class="lineart">├──</span> <a class="link" href="NMSettingWired.html#NMSettingWiredWakeOnLan" title="enum NMSettingWiredWakeOnLan">NMSettingWiredWakeOnLan</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanFlags" title="enum NMVlanFlags">NMVlanFlags</a>
     <span class="lineart">╰──</span> <a class="link" href="NMVpnEditorPlugin.html#NMVpnEditorPluginCapability" title="enum NMVpnEditorPluginCapability">NMVpnEditorPluginCapability</a>
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a>
+    GEnum
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-errors.html#NMAgentManagerError" title="enum NMAgentManagerError">NMAgentManagerError</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-errors.html#NMConnectionError" title="enum NMConnectionError">NMConnectionError</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-errors.html#NMDeviceError" title="enum NMDeviceError">NMDeviceError</a>
@@ -145,7 +146,7 @@
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-vpn-dbus-interface.html#NMVpnServiceState" title="enum NMVpnServiceState">NMVpnServiceState</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
     <span class="lineart">╰──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>
-    <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
+    GBoxed
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPAddress">NMIPAddress</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingIPConfig.html#NMIPRoute">NMIPRoute</a>
     <span class="lineart">╰──</span> <a class="link" href="NMDevice.html#NMLldpNeighbor">NMLldpNeighbor</a>
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index fe4240b5..4d7b5f25 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -12,6 +12,7 @@ NM_ACCESS_POINT_MAX_BITRATE
 NM_ACCESS_POINT_STRENGTH
 NM_ACCESS_POINT_LAST_SEEN
 NM_ACCESS_POINT_HW_ADDRESS
+NMAccessPoint
 nm_access_point_get_flags
 nm_access_point_get_wpa_flags
 nm_access_point_get_rsn_flags
@@ -25,7 +26,6 @@ nm_access_point_get_last_seen
 nm_access_point_filter_connections
 nm_access_point_connection_valid
 <SUBSECTION Standard>
-NMAccessPoint
 NMAccessPointClass
 NM_ACCESS_POINT
 NM_ACCESS_POINT_CLASS
@@ -54,6 +54,7 @@ NM_ACTIVE_CONNECTION_IP6_CONFIG
 NM_ACTIVE_CONNECTION_DHCP6_CONFIG
 NM_ACTIVE_CONNECTION_VPN
 NM_ACTIVE_CONNECTION_MASTER
+NMActiveConnection
 nm_active_connection_get_connection
 nm_active_connection_get_id
 nm_active_connection_get_uuid
@@ -70,7 +71,6 @@ nm_active_connection_get_ip6_config
 nm_active_connection_get_dhcp6_config
 nm_active_connection_get_vpn
 <SUBSECTION Standard>
-NMActiveConnection
 NMActiveConnectionClass
 NM_ACTIVE_CONNECTION
 NM_ACTIVE_CONNECTION_CLASS
@@ -117,6 +117,7 @@ NMClientPermissionResult
 NMClientError
 NM_CLIENT_ERROR
 nm_client_error_quark
+NMClient
 nm_client_new
 nm_client_new_async
 nm_client_new_finish
@@ -172,7 +173,6 @@ nm_client_reload_connections
 nm_client_reload_connections_async
 nm_client_reload_connections_finish
 <SUBSECTION Standard>
-NMClient
 NMClientClass
 NM_CLIENT
 NM_CLIENT_CLASS
@@ -370,6 +370,44 @@ nm_wimax_nsp_network_type_get_type
 </SECTION>
 
 <SECTION>
+<FILE>nm-core-types</FILE>
+NMConnection
+NMSetting
+NMSetting8021x
+NMSettingAdsl
+NMSettingBluetooth
+NMSettingBond
+NMSettingBridge
+NMSettingBridgePort
+NMSettingCdma
+NMSettingConnection
+NMSettingDcb
+NMSettingGeneric
+NMSettingGsm
+NMSettingIP4Config
+NMSettingIP6Config
+NMSettingIPConfig
+NMSettingIPTunnel
+NMSettingInfiniband
+NMSettingMacvlan
+NMSettingOlpcMesh
+NMSettingPpp
+NMSettingPppoe
+NMSettingSerial
+NMSettingTeam
+NMSettingTeamPort
+NMSettingTun
+NMSettingVlan
+NMSettingVpn
+NMSettingVxlan
+NMSettingWimax
+NMSettingWired
+NMSettingWireless
+NMSettingWirelessSecurity
+NMSimpleConnection
+</SECTION>
+
+<SECTION>
 <FILE>nm-dbus-interface</FILE>
 NM_AVAILABLE_IN_1_2
 NM_DBUS_SERVICE
@@ -480,6 +518,7 @@ NM_DEVICE_PHYSICAL_PORT_ID
 NM_DEVICE_MTU
 NM_DEVICE_METERED
 NM_DEVICE_LLDP_NEIGHBORS
+NMDevice
 nm_device_get_iface
 nm_device_get_ip_iface
 nm_device_get_device_type
@@ -538,7 +577,6 @@ nm_lldp_neighbor_get_attr_string_value
 nm_lldp_neighbor_get_attr_uint_value
 nm_lldp_neighbor_get_attr_type
 <SUBSECTION Standard>
-NMDevice
 NMDeviceClass
 NMLldpNeighbor
 NM_DEVICE
@@ -555,9 +593,9 @@ nm_lldp_neighbor_get_type
 <FILE>nm-device-adsl</FILE>
 <TITLE>NMDeviceAdsl</TITLE>
 NM_DEVICE_ADSL_CARRIER
+NMDeviceAdsl
 nm_device_adsl_get_carrier
 <SUBSECTION Standard>
-NMDeviceAdsl
 NMDeviceAdslClass
 NM_DEVICE_ADSL
 NM_DEVICE_ADSL_CLASS
@@ -574,11 +612,11 @@ nm_device_adsl_get_type
 NM_DEVICE_BOND_HW_ADDRESS
 NM_DEVICE_BOND_CARRIER
 NM_DEVICE_BOND_SLAVES
+NMDeviceBond
 nm_device_bond_get_hw_address
 nm_device_bond_get_carrier
 nm_device_bond_get_slaves
 <SUBSECTION Standard>
-NMDeviceBond
 NMDeviceBondClass
 NM_DEVICE_BOND
 NM_DEVICE_BOND_CLASS
@@ -595,11 +633,11 @@ nm_device_bond_get_type
 NM_DEVICE_BRIDGE_HW_ADDRESS
 NM_DEVICE_BRIDGE_CARRIER
 NM_DEVICE_BRIDGE_SLAVES
+NMDeviceBridge
 nm_device_bridge_get_hw_address
 nm_device_bridge_get_carrier
 nm_device_bridge_get_slaves
 <SUBSECTION Standard>
-NMDeviceBridge
 NMDeviceBridgeClass
 NM_DEVICE_BRIDGE
 NM_DEVICE_BRIDGE_CLASS
@@ -616,11 +654,11 @@ nm_device_bridge_get_type
 NM_DEVICE_BT_HW_ADDRESS
 NM_DEVICE_BT_NAME
 NM_DEVICE_BT_CAPABILITIES
+NMDeviceBt
 nm_device_bt_get_hw_address
 nm_device_bt_get_name
 nm_device_bt_get_capabilities
 <SUBSECTION Standard>
-NMDeviceBt
 NMDeviceBtClass
 NM_DEVICE_BT
 NM_DEVICE_BT_CLASS
@@ -639,13 +677,13 @@ NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 NM_DEVICE_ETHERNET_SPEED
 NM_DEVICE_ETHERNET_CARRIER
 NM_DEVICE_ETHERNET_S390_SUBCHANNELS
+NMDeviceEthernet
 nm_device_ethernet_get_hw_address
 nm_device_ethernet_get_permanent_hw_address
 nm_device_ethernet_get_speed
 nm_device_ethernet_get_carrier
 nm_device_ethernet_get_s390_subchannels
 <SUBSECTION Standard>
-NMDeviceEthernet
 NMDeviceEthernetClass
 NM_DEVICE_ETHERNET
 NM_DEVICE_ETHERNET_CLASS
@@ -661,9 +699,9 @@ nm_device_ethernet_get_type
 <TITLE>NMDeviceGeneric</TITLE>
 NM_DEVICE_GENERIC_HW_ADDRESS
 NM_DEVICE_GENERIC_TYPE_DESCRIPTION
+NMDeviceGeneric
 nm_device_generic_get_hw_address
 <SUBSECTION Standard>
-NMDeviceGeneric
 NMDeviceGenericClass
 NM_DEVICE_GENERIC
 NM_DEVICE_GENERIC_CLASS
@@ -679,10 +717,10 @@ nm_device_generic_get_type
 <TITLE>NMDeviceInfiniband</TITLE>
 NM_DEVICE_INFINIBAND_HW_ADDRESS
 NM_DEVICE_INFINIBAND_CARRIER
+NMDeviceInfiniband
 nm_device_infiniband_get_hw_address
 nm_device_infiniband_get_carrier
 <SUBSECTION Standard>
-NMDeviceInfiniband
 NMDeviceInfinibandClass
 NM_DEVICE_INFINIBAND
 NM_DEVICE_INFINIBAND_CLASS
@@ -707,6 +745,7 @@ NM_DEVICE_IP_TUNNEL_INPUT_KEY
 NM_DEVICE_IP_TUNNEL_OUTPUT_KEY
 NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT
 NM_DEVICE_IP_TUNNEL_FLOW_LABEL
+NMDeviceIPTunnel
 nm_device_ip_tunnel_get_parent
 nm_device_ip_tunnel_get_mode
 nm_device_ip_tunnel_get_local
@@ -719,7 +758,6 @@ nm_device_ip_tunnel_get_output_key
 nm_device_ip_tunnel_get_encapsulation_limit
 nm_device_ip_tunnel_get_flow_label
 <SUBSECTION Standard>
-NMDeviceIPTunnel
 NMDeviceIPTunnelClass
 NM_DEVICE_IP_TUNNEL
 NM_DEVICE_IP_TUNNEL_CLASS
@@ -738,13 +776,13 @@ NM_DEVICE_MACVLAN_MODE
 NM_DEVICE_MACVLAN_NO_PROMISC
 NM_DEVICE_MACVLAN_TAP
 NM_DEVICE_MACVLAN_HW_ADDRESS
+NMDeviceMacvlan
 nm_device_macvlan_get_parent
 nm_device_macvlan_get_mode
 nm_device_macvlan_get_no_promisc
 nm_device_macvlan_get_tap
 nm_device_macvlan_get_hw_address
 <SUBSECTION Standard>
-NMDeviceMacvlan
 NMDeviceMacvlanClass
 NM_DEVICE_MACVLAN
 NM_DEVICE_MACVLAN_CLASS
@@ -760,10 +798,10 @@ nm_device_macvlan_get_type
 <TITLE>NMDeviceModem</TITLE>
 NM_DEVICE_MODEM_MODEM_CAPABILITIES
 NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+NMDeviceModem
 nm_device_modem_get_modem_capabilities
 nm_device_modem_get_current_capabilities
 <SUBSECTION Standard>
-NMDeviceModem
 NMDeviceModemClass
 NM_DEVICE_MODEM
 NM_DEVICE_MODEM_CLASS
@@ -780,11 +818,11 @@ nm_device_modem_get_type
 NM_DEVICE_OLPC_MESH_HW_ADDRESS
 NM_DEVICE_OLPC_MESH_COMPANION
 NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
+NMDeviceOlpcMesh
 nm_device_olpc_mesh_get_hw_address
 nm_device_olpc_mesh_get_companion
 nm_device_olpc_mesh_get_active_channel
 <SUBSECTION Standard>
-NMDeviceOlpcMesh
 NMDeviceOlpcMeshClass
 NM_DEVICE_OLPC_MESH
 NM_DEVICE_OLPC_MESH_CLASS
@@ -801,11 +839,11 @@ nm_device_olpc_mesh_get_type
 NM_DEVICE_TEAM_HW_ADDRESS
 NM_DEVICE_TEAM_CARRIER
 NM_DEVICE_TEAM_SLAVES
+NMDeviceTeam
 nm_device_team_get_hw_address
 nm_device_team_get_carrier
 nm_device_team_get_slaves
 <SUBSECTION Standard>
-NMDeviceTeam
 NMDeviceTeamClass
 NM_DEVICE_TEAM
 NM_DEVICE_TEAM_CLASS
@@ -826,6 +864,7 @@ NM_DEVICE_TUN_MODE
 NM_DEVICE_TUN_NO_PI
 NM_DEVICE_TUN_VNET_HDR
 NM_DEVICE_TUN_MULTI_QUEUE
+NMDeviceTun
 nm_device_tun_get_hw_address
 nm_device_tun_get_mode
 nm_device_tun_get_owner
@@ -834,7 +873,6 @@ nm_device_tun_get_no_pi
 nm_device_tun_get_vnet_hdr
 nm_device_tun_get_multi_queue
 <SUBSECTION Standard>
-NMDeviceTun
 NMDeviceTunClass
 NM_DEVICE_TUN
 NM_DEVICE_TUN_CLASS
@@ -852,12 +890,12 @@ NM_DEVICE_VLAN_HW_ADDRESS
 NM_DEVICE_VLAN_CARRIER
 NM_DEVICE_VLAN_PARENT
 NM_DEVICE_VLAN_VLAN_ID
+NMDeviceVlan
 nm_device_vlan_get_hw_address
 nm_device_vlan_get_carrier
 nm_device_vlan_get_parent
 nm_device_vlan_get_vlan_id
 <SUBSECTION Standard>
-NMDeviceVlan
 NMDeviceVlanClass
 NM_DEVICE_VLAN
 NM_DEVICE_VLAN_CLASS
@@ -889,6 +927,7 @@ NM_DEVICE_VXLAN_RSC
 NM_DEVICE_VXLAN_L2MISS
 NM_DEVICE_VXLAN_L3MISS
 NM_DEVICE_VXLAN_DST_PORT
+NMDeviceVxlan
 nm_device_vxlan_get_hw_address
 nm_device_vxlan_get_carrier
 nm_device_vxlan_get_parent
@@ -908,7 +947,6 @@ nm_device_vxlan_get_rsc
 nm_device_vxlan_get_l2miss
 nm_device_vxlan_get_l3miss
 <SUBSECTION Standard>
-NMDeviceVxlan
 NMDeviceVxlanClass
 NM_DEVICE_VXLAN
 NM_DEVICE_VXLAN_CLASS
@@ -929,6 +967,7 @@ NM_DEVICE_WIFI_BITRATE
 NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
 NM_DEVICE_WIFI_CAPABILITIES
 NM_DEVICE_WIFI_ACCESS_POINTS
+NMDeviceWifi
 nm_device_wifi_get_hw_address
 nm_device_wifi_get_permanent_hw_address
 nm_device_wifi_get_mode
@@ -943,7 +982,6 @@ nm_device_wifi_request_scan_async
 nm_device_wifi_request_scan_options_async
 nm_device_wifi_request_scan_finish
 <SUBSECTION Standard>
-NMDeviceWifi
 NMDeviceWifiClass
 NM_DEVICE_WIFI
 NM_DEVICE_WIFI_CLASS
@@ -965,6 +1003,7 @@ NM_DEVICE_WIMAX_CINR
 NM_DEVICE_WIMAX_TX_POWER
 NM_DEVICE_WIMAX_BSID
 NM_DEVICE_WIMAX_NSPS
+NMDeviceWimax
 nm_device_wimax_get_hw_address
 nm_device_wimax_get_active_nsp
 nm_device_wimax_get_nsp_by_path
@@ -975,7 +1014,6 @@ nm_device_wimax_get_cinr
 nm_device_wimax_get_tx_power
 nm_device_wimax_get_bsid
 <SUBSECTION Standard>
-NMDeviceWimax
 NMDeviceWimaxClass
 NM_DEVICE_WIMAX
 NM_DEVICE_WIMAX_CLASS
@@ -989,13 +1027,13 @@ nm_device_wimax_get_type
 <SECTION>
 <FILE>nm-dhcp-config</FILE>
 <TITLE>NMDhcpConfig</TITLE>
+NMDhcpConfig
 NM_DHCP_CONFIG_FAMILY
 NM_DHCP_CONFIG_OPTIONS
 nm_dhcp_config_get_family
 nm_dhcp_config_get_options
 nm_dhcp_config_get_one_option
 <SUBSECTION Standard>
-NMDhcpConfig
 NMDhcpConfigClass
 NM_DHCP_CONFIG
 NM_DHCP_CONFIG_CLASS
@@ -1047,6 +1085,7 @@ nm_vpn_plugin_error_quark
 <SECTION>
 <FILE>nm-ip-config</FILE>
 <TITLE>NMIPConfig</TITLE>
+NMIPConfig
 NM_IP_CONFIG_FAMILY
 NM_IP_CONFIG_GATEWAY
 NM_IP_CONFIG_ADDRESSES
@@ -1064,7 +1103,6 @@ nm_ip_config_get_domains
 nm_ip_config_get_searches
 nm_ip_config_get_wins_servers
 <SUBSECTION Standard>
-NMIPConfig
 NMIPConfigClass
 NM_IP_CONFIG
 NM_IP_CONFIG_CLASS
@@ -1080,9 +1118,9 @@ nm_ip_config_get_type
 <TITLE>NMObject</TITLE>
 NM_OBJECT_PATH
 NM_OBJECT_DBUS_CONNECTION
+NMObject
 nm_object_get_path
 <SUBSECTION Standard>
-NMObject
 NMObjectClass
 NM_IS_OBJECT
 NM_IS_OBJECT_CLASS
@@ -1100,6 +1138,7 @@ NM_REMOTE_CONNECTION_DBUS_CONNECTION
 NM_REMOTE_CONNECTION_PATH
 NM_REMOTE_CONNECTION_UNSAVED
 NM_REMOTE_CONNECTION_VISIBLE
+NMRemoteConnection
 nm_remote_connection_commit_changes
 nm_remote_connection_commit_changes_async
 nm_remote_connection_commit_changes_finish
@@ -1115,7 +1154,6 @@ nm_remote_connection_get_secrets_finish
 nm_remote_connection_get_unsaved
 nm_remote_connection_get_visible
 <SUBSECTION Standard>
-NMRemoteConnection
 NMRemoteConnectionClass
 NM_IS_REMOTE_CONNECTION
 NM_IS_REMOTE_CONNECTION_CLASS
@@ -1133,6 +1171,7 @@ NM_SECRET_AGENT_OLD_IDENTIFIER
 NM_SECRET_AGENT_OLD_AUTO_REGISTER
 NM_SECRET_AGENT_OLD_REGISTERED
 NM_SECRET_AGENT_OLD_CAPABILITIES
+NMSecretAgentOld
 NMSecretAgentOldGetSecretsFunc
 NMSecretAgentOldSaveSecretsFunc
 NMSecretAgentOldDeleteSecretsFunc
@@ -1147,7 +1186,6 @@ nm_secret_agent_old_get_secrets
 nm_secret_agent_old_save_secrets
 nm_secret_agent_old_delete_secrets
 <SUBSECTION Standard>
-NMSecretAgentOld
 NMSecretAgentOldClass
 NM_IS_SECRET_AGENT_OLD
 NM_IS_SECRET_AGENT_OLD_CLASS
@@ -1236,6 +1274,7 @@ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PIN
 NM_SETTING_802_1X_PIN_FLAGS
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
+NMSetting8021x
 nm_setting_802_1x_new
 nm_setting_802_1x_check_cert_scheme
 nm_setting_802_1x_get_num_eap_methods
@@ -1308,7 +1347,6 @@ nm_setting_802_1x_get_phase2_private_key_password
 nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
 <SUBSECTION Standard>
-NMSetting8021x
 NMSetting8021xClass
 NM_IS_SETTING_802_1X
 NM_IS_SETTING_802_1X_CLASS
@@ -1335,6 +1373,7 @@ NM_SETTING_ADSL_PROTOCOL_PPPOE
 NM_SETTING_ADSL_PROTOCOL_IPOATM
 NM_SETTING_ADSL_ENCAPSULATION_VCMUX
 NM_SETTING_ADSL_ENCAPSULATION_LLC
+NMSettingAdsl
 nm_setting_adsl_new
 nm_setting_adsl_get_username
 nm_setting_adsl_get_password
@@ -1344,7 +1383,6 @@ nm_setting_adsl_get_vpi
 nm_setting_adsl_get_vci
 nm_setting_adsl_get_password_flags
 <SUBSECTION Standard>
-NMSettingAdsl
 NMSettingAdslClass
 NM_IS_SETTING_ADSL
 NM_IS_SETTING_ADSL_CLASS
@@ -1363,11 +1401,11 @@ NM_SETTING_BLUETOOTH_BDADDR
 NM_SETTING_BLUETOOTH_TYPE
 NM_SETTING_BLUETOOTH_TYPE_DUN
 NM_SETTING_BLUETOOTH_TYPE_PANU
+NMSettingBluetooth
 nm_setting_bluetooth_new
 nm_setting_bluetooth_get_bdaddr
 nm_setting_bluetooth_get_connection_type
 <SUBSECTION Standard>
-NMSettingBluetooth
 NMSettingBluetoothClass
 NM_IS_SETTING_BLUETOOTH
 NM_IS_SETTING_BLUETOOTH_CLASS
@@ -1410,6 +1448,7 @@ NM_SETTING_BOND_OPTION_NUM_UNSOL_NA
 NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE
 NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB
 NM_SETTING_BOND_OPTION_LP_INTERVAL
+NMSettingBond
 nm_setting_bond_new
 nm_setting_bond_get_num_options
 nm_setting_bond_get_option
@@ -1420,7 +1459,6 @@ nm_setting_bond_validate_option
 nm_setting_bond_get_valid_options
 nm_setting_bond_get_option_default
 <SUBSECTION Standard>
-NMSettingBond
 NMSettingBondClass
 NM_IS_SETTING_BOND
 NM_IS_SETTING_BOND_CLASS
@@ -1443,6 +1481,7 @@ NM_SETTING_BRIDGE_HELLO_TIME
 NM_SETTING_BRIDGE_MAX_AGE
 NM_SETTING_BRIDGE_AGEING_TIME
 NM_SETTING_BRIDGE_MULTICAST_SNOOPING
+NMSettingBridge
 nm_setting_bridge_new
 nm_setting_bridge_get_mac_address
 nm_setting_bridge_get_stp
@@ -1453,7 +1492,6 @@ nm_setting_bridge_get_max_age
 nm_setting_bridge_get_ageing_time
 nm_setting_bridge_get_multicast_snooping
 <SUBSECTION Standard>
-NMSettingBridge
 NMSettingBridgeClass
 NM_IS_SETTING_BRIDGE
 NM_IS_SETTING_BRIDGE_CLASS
@@ -1471,12 +1509,12 @@ NM_SETTING_BRIDGE_PORT_SETTING_NAME
 NM_SETTING_BRIDGE_PORT_PRIORITY
 NM_SETTING_BRIDGE_PORT_PATH_COST
 NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+NMSettingBridgePort
 nm_setting_bridge_port_new
 nm_setting_bridge_port_get_priority
 nm_setting_bridge_port_get_path_cost
 nm_setting_bridge_port_get_hairpin_mode
 <SUBSECTION Standard>
-NMSettingBridgePort
 NMSettingBridgePortClass
 NM_IS_SETTING_BRIDGE_PORT
 NM_IS_SETTING_BRIDGE_PORT_CLASS
@@ -1495,13 +1533,13 @@ NM_SETTING_CDMA_NUMBER
 NM_SETTING_CDMA_USERNAME
 NM_SETTING_CDMA_PASSWORD
 NM_SETTING_CDMA_PASSWORD_FLAGS
+NMSettingCdma
 nm_setting_cdma_new
 nm_setting_cdma_get_number
 nm_setting_cdma_get_username
 nm_setting_cdma_get_password
 nm_setting_cdma_get_password_flags
 <SUBSECTION Standard>
-NMSettingCdma
 NMSettingCdmaClass
 NM_IS_SETTING_CDMA
 NM_IS_SETTING_CDMA_CLASS
@@ -1600,6 +1638,7 @@ NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH
 NM_SETTING_DCB_PRIORITY_BANDWIDTH
 NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH
 NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS
+NMSettingDcb
 nm_setting_dcb_new
 nm_setting_dcb_get_app_fcoe_flags
 nm_setting_dcb_get_app_fcoe_priority
@@ -1623,7 +1662,6 @@ nm_setting_dcb_set_priority_strict_bandwidth
 nm_setting_dcb_get_priority_traffic_class
 nm_setting_dcb_set_priority_traffic_class
 <SUBSECTION Standard>
-NMSettingDcb
 NMSettingDcbClass
 NM_IS_SETTING_DCB
 NM_IS_SETTING_DCB_CLASS
@@ -1638,9 +1676,9 @@ nm_setting_dcb_get_type
 <FILE>nm-setting-generic</FILE>
 <TITLE>NMSettingGeneric</TITLE>
 NM_SETTING_GENERIC_SETTING_NAME
+NMSettingGeneric
 nm_setting_generic_new
 <SUBSECTION Standard>
-NMSettingGeneric
 NMSettingGenericClass
 NM_IS_SETTING_GENERIC
 NM_IS_SETTING_GENERIC_CLASS
@@ -1667,6 +1705,7 @@ NM_SETTING_GSM_HOME_ONLY
 NM_SETTING_GSM_DEVICE_ID
 NM_SETTING_GSM_SIM_ID
 NM_SETTING_GSM_SIM_OPERATOR_ID
+NMSettingGsm
 nm_setting_gsm_new
 nm_setting_gsm_get_number
 nm_setting_gsm_get_username
@@ -1681,7 +1720,6 @@ nm_setting_gsm_get_sim_operator_id
 nm_setting_gsm_get_pin_flags
 nm_setting_gsm_get_password_flags
 <SUBSECTION Standard>
-NMSettingGsm
 NMSettingGsmClass
 NM_IS_SETTING_GSM
 NM_IS_SETTING_GSM_CLASS
@@ -1701,6 +1739,7 @@ NM_SETTING_INFINIBAND_MTU
 NM_SETTING_INFINIBAND_TRANSPORT_MODE
 NM_SETTING_INFINIBAND_P_KEY
 NM_SETTING_INFINIBAND_PARENT
+NMSettingInfiniband
 nm_setting_infiniband_new
 nm_setting_infiniband_get_mac_address
 nm_setting_infiniband_get_mtu
@@ -1709,7 +1748,6 @@ nm_setting_infiniband_get_p_key
 nm_setting_infiniband_get_parent
 nm_setting_infiniband_get_virtual_interface_name
 <SUBSECTION Standard>
-NMSettingInfiniband
 NMSettingInfinibandClass
 NM_IS_SETTING_INFINIBAND
 NM_IS_SETTING_INFINIBAND_CLASS
@@ -1793,6 +1831,7 @@ NM_SETTING_DNS_OPTION_SINGLE_REQUEST
 NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN
 NM_SETTING_DNS_OPTION_NO_TLD_QUERY
 NM_SETTING_DNS_OPTION_USE_VC
+NMSettingIPConfig
 nm_setting_ip_config_get_method
 nm_setting_ip_config_get_num_dns
 nm_setting_ip_config_get_dns
@@ -1839,7 +1878,6 @@ nm_setting_ip_config_get_dhcp_timeout
 <SUBSECTION Standard>
 NMIPAddress
 NMIPRoute
-NMSettingIPConfig
 NMSettingIPConfigClass
 NM_IS_SETTING_IP_CONFIG
 NM_IS_SETTING_IP_CONFIG_CLASS
@@ -1868,6 +1906,7 @@ NM_SETTING_IP_TUNNEL_OUTPUT_KEY
 NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT
 NM_SETTING_IP_TUNNEL_FLOW_LABEL
 NM_SETTING_IP_TUNNEL_MTU
+NMSettingIPTunnel
 nm_setting_ip_tunnel_new
 nm_setting_ip_tunnel_get_parent
 nm_setting_ip_tunnel_get_mode
@@ -1882,7 +1921,6 @@ nm_setting_ip_tunnel_get_encapsulation_limit
 nm_setting_ip_tunnel_get_flow_label
 nm_setting_ip_tunnel_get_mtu
 <SUBSECTION Standard>
-NMSettingIPTunnel
 NMSettingIPTunnelClass
 NM_IS_SETTING_IP_TUNNEL
 NM_IS_SETTING_IP_TUNNEL_CLASS
@@ -1904,11 +1942,11 @@ NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 NM_SETTING_IP4_CONFIG_METHOD_SHARED
 NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+NMSettingIP4Config
 nm_setting_ip4_config_new
 nm_setting_ip4_config_get_dhcp_client_id
 nm_setting_ip4_config_get_dhcp_fqdn
 <SUBSECTION Standard>
-NMSettingIP4Config
 NMSettingIP4ConfigClass
 NM_IS_SETTING_IP4_CONFIG
 NM_IS_SETTING_IP4_CONFIG_CLASS
@@ -1933,11 +1971,11 @@ NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 NM_SETTING_IP6_CONFIG_METHOD_SHARED
 NMSettingIP6ConfigPrivacy
 NMSettingIP6ConfigAddrGenMode
+NMSettingIP6Config
 nm_setting_ip6_config_new
 nm_setting_ip6_config_get_ip6_privacy
 nm_setting_ip6_config_get_addr_gen_mode
 <SUBSECTION Standard>
-NMSettingIP6Config
 NMSettingIP6ConfigClass
 NM_IS_SETTING_IP6_CONFIG
 NM_IS_SETTING_IP6_CONFIG_CLASS
@@ -1956,6 +1994,7 @@ NM_SETTING_MACVLAN_PARENT
 NM_SETTING_MACVLAN_MODE
 NM_SETTING_MACVLAN_PROMISCUOUS
 NM_SETTING_MACVLAN_TAP
+NMSettingMacvlan
 NMSettingMacvlanMode
 nm_setting_macvlan_new
 nm_setting_macvlan_get_parent
@@ -1963,7 +2002,6 @@ nm_setting_macvlan_get_mode
 nm_setting_macvlan_get_promiscuous
 nm_setting_macvlan_get_tap
 <SUBSECTION Standard>
-NMSettingMacvlan
 NMSettingMacvlanClass
 NM_IS_SETTING_MACVLAN
 NM_IS_SETTING_MACVLAN_CLASS
@@ -1981,12 +2019,12 @@ NM_SETTING_OLPC_MESH_SETTING_NAME
 NM_SETTING_OLPC_MESH_SSID
 NM_SETTING_OLPC_MESH_CHANNEL
 NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+NMSettingOlpcMesh
 nm_setting_olpc_mesh_new
 nm_setting_olpc_mesh_get_ssid
 nm_setting_olpc_mesh_get_channel
 nm_setting_olpc_mesh_get_dhcp_anycast_address
 <SUBSECTION Standard>
-NMSettingOlpcMesh
 NMSettingOlpcMeshClass
 NM_IS_SETTING_OLPC_MESH
 NM_IS_SETTING_OLPC_MESH_CLASS
@@ -2019,6 +2057,7 @@ NM_SETTING_PPP_MRU
 NM_SETTING_PPP_MTU
 NM_SETTING_PPP_LCP_ECHO_FAILURE
 NM_SETTING_PPP_LCP_ECHO_INTERVAL
+NMSettingPpp
 nm_setting_ppp_new
 nm_setting_ppp_get_noauth
 nm_setting_ppp_get_refuse_eap
@@ -2039,7 +2078,6 @@ nm_setting_ppp_get_mtu
 nm_setting_ppp_get_lcp_echo_failure
 nm_setting_ppp_get_lcp_echo_interval
 <SUBSECTION Standard>
-NMSettingPpp
 NMSettingPppClass
 NM_IS_SETTING_PPP
 NM_IS_SETTING_PPP_CLASS
@@ -2058,13 +2096,13 @@ NM_SETTING_PPPOE_SERVICE
 NM_SETTING_PPPOE_USERNAME
 NM_SETTING_PPPOE_PASSWORD
 NM_SETTING_PPPOE_PASSWORD_FLAGS
+NMSettingPppoe
 nm_setting_pppoe_new
 nm_setting_pppoe_get_service
 nm_setting_pppoe_get_username
 nm_setting_pppoe_get_password
 nm_setting_pppoe_get_password_flags
 <SUBSECTION Standard>
-NMSettingPppoe
 NMSettingPppoeClass
 NM_IS_SETTING_PPPOE
 NM_IS_SETTING_PPPOE_CLASS
@@ -2085,6 +2123,7 @@ NM_SETTING_SERIAL_BITS
 NM_SETTING_SERIAL_PARITY
 NM_SETTING_SERIAL_STOPBITS
 NM_SETTING_SERIAL_SEND_DELAY
+NMSettingSerial
 nm_setting_serial_new
 nm_setting_serial_get_baud
 nm_setting_serial_get_bits
@@ -2092,7 +2131,6 @@ nm_setting_serial_get_parity
 nm_setting_serial_get_stopbits
 nm_setting_serial_get_send_delay
 <SUBSECTION Standard>
-NMSettingSerial
 NMSettingSerialClass
 NM_IS_SETTING_SERIAL
 NM_IS_SETTING_SERIAL_CLASS
@@ -2108,10 +2146,10 @@ nm_setting_serial_get_type
 <TITLE>NMSettingTeam</TITLE>
 NM_SETTING_TEAM_SETTING_NAME
 NM_SETTING_TEAM_CONFIG
+NMSettingTeam
 nm_setting_team_new
 nm_setting_team_get_config
 <SUBSECTION Standard>
-NMSettingTeam
 NMSettingTeamClass
 NM_IS_SETTING_TEAM
 NM_IS_SETTING_TEAM_CLASS
@@ -2127,10 +2165,10 @@ nm_setting_team_get_type
 <TITLE>NMSettingTeamPort</TITLE>
 NM_SETTING_TEAM_PORT_SETTING_NAME
 NM_SETTING_TEAM_PORT_CONFIG
+NMSettingTeamPort
 nm_setting_team_port_new
 nm_setting_team_port_get_config
 <SUBSECTION Standard>
-NMSettingTeamPort
 NMSettingTeamPortClass
 NM_IS_SETTING_TEAM_PORT
 NM_IS_SETTING_TEAM_PORT_CLASS
@@ -2152,6 +2190,7 @@ NM_SETTING_TUN_PI
 NM_SETTING_TUN_VNET_HDR
 NM_SETTING_TUN_MULTI_QUEUE
 NMSettingTunMode
+NMSettingTun
 nm_setting_tun_new
 nm_setting_tun_get_mode
 nm_setting_tun_get_owner
@@ -2160,7 +2199,6 @@ nm_setting_tun_get_pi
 nm_setting_tun_get_vnet_hdr
 nm_setting_tun_get_multi_queue
 <SUBSECTION Standard>
-NMSettingTun
 NMSettingTunClass
 NM_IS_SETTING_TUN
 NM_IS_SETTING_TUN_CLASS
@@ -2180,6 +2218,7 @@ NM_SETTING_VLAN_ID
 NM_SETTING_VLAN_FLAGS
 NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
 NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
+NMSettingVlan
 NMVlanPriorityMap
 NMVlanFlags
 NM_VLAN_FLAGS_ALL
@@ -2196,7 +2235,6 @@ nm_setting_vlan_remove_priority_str_by_value
 nm_setting_vlan_clear_priorities
 nm_setting_vlan_add_priority_str
 <SUBSECTION Standard>
-NMSettingVlan
 NMSettingVlanClass
 NM_IS_SETTING_VLAN
 NM_IS_SETTING_VLAN_CLASS
@@ -2217,6 +2255,7 @@ NM_SETTING_VPN_PERSISTENT
 NM_SETTING_VPN_DATA
 NM_SETTING_VPN_SECRETS
 NM_SETTING_VPN_TIMEOUT
+NMSettingVpn
 NMVpnIterFunc
 nm_setting_vpn_new
 nm_setting_vpn_get_service_type
@@ -2234,7 +2273,6 @@ nm_setting_vpn_remove_secret
 nm_setting_vpn_foreach_secret
 nm_setting_vpn_get_timeout
 <SUBSECTION Standard>
-NMSettingVpn
 NMSettingVpnClass
 NM_IS_SETTING_VPN
 NM_IS_SETTING_VPN_CLASS
@@ -2265,6 +2303,7 @@ NM_SETTING_VXLAN_LEARNING
 NM_SETTING_VXLAN_RSC
 NM_SETTING_VXLAN_L2_MISS
 NM_SETTING_VXLAN_L3_MISS
+NMSettingVxlan
 nm_setting_vxlan_new
 nm_setting_vxlan_get_parent
 nm_setting_vxlan_get_id
@@ -2283,7 +2322,6 @@ nm_setting_vxlan_get_rsc
 nm_setting_vxlan_get_l2_miss
 nm_setting_vxlan_get_l3_miss
 <SUBSECTION Standard>
-NMSettingVxlan
 NMSettingVxlanClass
 NM_IS_SETTING_VXLAN
 NM_IS_SETTING_VXLAN_CLASS
@@ -2300,11 +2338,11 @@ nm_setting_vxlan_get_type
 NM_SETTING_WIMAX_SETTING_NAME
 NM_SETTING_WIMAX_NETWORK_NAME
 NM_SETTING_WIMAX_MAC_ADDRESS
+NMSettingWimax
 nm_setting_wimax_new
 nm_setting_wimax_get_network_name
 nm_setting_wimax_get_mac_address
 <SUBSECTION Standard>
-NMSettingWimax
 NMSettingWimaxClass
 NM_IS_SETTING_WIMAX
 NM_IS_SETTING_WIMAX_CLASS
@@ -2333,6 +2371,7 @@ NM_SETTING_WIRED_S390_NETTYPE
 NM_SETTING_WIRED_S390_OPTIONS
 NM_SETTING_WIRED_WAKE_ON_LAN
 NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD
+NMSettingWired
 nm_setting_wired_new
 nm_setting_wired_get_port
 nm_setting_wired_get_speed
@@ -2359,7 +2398,6 @@ nm_setting_wired_get_valid_s390_options
 nm_setting_wired_get_wake_on_lan
 nm_setting_wired_get_wake_on_lan_password
 <SUBSECTION Standard>
-NMSettingWired
 NMSettingWiredClass
 NM_IS_SETTING_WIRED
 NM_IS_SETTING_WIRED_CLASS
@@ -2393,6 +2431,7 @@ NM_SETTING_WIRELESS_MODE_ADHOC
 NM_SETTING_WIRELESS_MODE_AP
 NM_SETTING_WIRELESS_MODE_INFRA
 NMSettingWirelessPowersave
+NMSettingWireless
 nm_setting_wireless_new
 nm_setting_wireless_get_ssid
 nm_setting_wireless_get_mode
@@ -2419,7 +2458,6 @@ nm_setting_wireless_get_num_seen_bssids
 nm_setting_wireless_get_seen_bssid
 nm_setting_wireless_ap_security_compatible
 <SUBSECTION Standard>
-NMSettingWireless
 NMSettingWirelessClass
 NM_IS_SETTING_WIRELESS
 NM_IS_SETTING_WIRELESS_CLASS
@@ -2452,6 +2490,7 @@ NM_SETTING_WIRELESS_SECURITY_PSK
 NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
+NMSettingWirelessSecurity
 nm_setting_wireless_security_new
 nm_setting_wireless_security_get_key_mgmt
 nm_setting_wireless_security_get_num_protos
@@ -2484,7 +2523,6 @@ nm_setting_wireless_security_get_auth_alg
 nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
 <SUBSECTION Standard>
-NMSettingWirelessSecurity
 NMSettingWirelessSecurityClass
 NM_IS_SETTING_WIRELESS_SECURITY
 NM_IS_SETTING_WIRELESS_SECURITY_CLASS
@@ -2498,11 +2536,11 @@ nm_setting_wireless_security_get_type
 <SECTION>
 <FILE>nm-simple-connection</FILE>
 <TITLE>NMSimpleConnection</TITLE>
+NMSimpleConnection
 nm_simple_connection_new
 nm_simple_connection_new_from_dbus
 nm_simple_connection_new_clone
 <SUBSECTION Standard>
-NMSimpleConnection
 NMSimpleConnectionClass
 NM_IS_SIMPLE_CONNECTION
 NM_IS_SIMPLE_CONNECTION_CLASS
@@ -2514,6 +2552,37 @@ nm_simple_connection_get_type
 </SECTION>
 
 <SECTION>
+<FILE>nm-types</FILE>
+NMAccessPoint
+NMActiveConnection
+NMClient
+NMDevice
+NMDeviceAdsl
+NMDeviceBond
+NMDeviceBridge
+NMDeviceBt
+NMDeviceEthernet
+NMDeviceGeneric
+NMDeviceIPTunnel
+NMDeviceInfiniband
+NMDeviceMacvlan
+NMDeviceModem
+NMDeviceOlpcMesh
+NMDeviceTeam
+NMDeviceTun
+NMDeviceVlan
+NMDeviceVxlan
+NMDeviceWifi
+NMDeviceWimax
+NMDhcpConfig
+NMIPConfig
+NMObject
+NMRemoteConnection
+NMVpnConnection
+NMWimaxNsp
+</SECTION>
+
+<SECTION>
 <FILE>nm-utils</FILE>
 nm_utils_is_empty_ssid
 nm_utils_escape_ssid
@@ -2605,10 +2674,10 @@ NM_AVAILABLE_IN_1_4
 <TITLE>NMVpnConnection</TITLE>
 NM_VPN_CONNECTION_VPN_STATE
 NM_VPN_CONNECTION_BANNER
+NMVpnConnection
 nm_vpn_connection_get_vpn_state
 nm_vpn_connection_get_banner
 <SUBSECTION Standard>
-NMVpnConnection
 NMVpnConnectionClass
 NM_IS_VPN_CONNECTION
 NM_IS_VPN_CONNECTION_CLASS
@@ -2733,8 +2802,8 @@ NM_VPN_PLUGIN_INFO_KEYFILE
 NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION
 NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM
 NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME
-<SUBSECTION Standard>
 NMVpnPluginInfo
+<SUBSECTION Standard>
 NM_IS_VPN_PLUGIN_INFO
 NM_IS_VPN_PLUGIN_INFO_CLASS
 NM_TYPE_VPN_PLUGIN_INFO
@@ -2776,13 +2845,13 @@ NM_VPN_SERVICE_PLUGIN_GET_CLASS
 NM_WIMAX_NSP_NAME
 NM_WIMAX_NSP_SIGNAL_QUALITY
 NM_WIMAX_NSP_NETWORK_TYPE
+NMWimaxNsp
 nm_wimax_nsp_get_name
 nm_wimax_nsp_get_signal_quality
 nm_wimax_nsp_get_network_type
 nm_wimax_nsp_filter_connections
 nm_wimax_nsp_connection_valid
 <SUBSECTION Standard>
-NMWimaxNsp
 NMWimaxNspClass
 NM_IS_WIMAX_NSP
 NM_IS_WIMAX_NSP_CLASS
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 26aaba0e..23aa8390 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.2.0
+1.2.2
diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am
index 58dc204b..3335720a 100644
--- a/libnm-core/Makefile.am
+++ b/libnm-core/Makefile.am
@@ -53,5 +53,11 @@ libnm_core_la_SOURCES += crypto_nss.c
 libnm_core_la_LIBADD += $(NSS_LIBS)
 endif
 
-BUILT_SOURCES = $(GLIB_GENERATED)
+nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl
+	$(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@
+
+nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl
+	$(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@
+
+BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in
index bd66c069..2bedf38b 100644
--- a/libnm-core/Makefile.in
+++ b/libnm-core/Makefile.in
@@ -721,7 +721,7 @@ libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) $(am__append_3) \
 libnm_core_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS)
 
-BUILT_SOURCES = $(GLIB_GENERATED)
+BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml
 CLEANFILES = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1490,6 +1490,12 @@ include $(GLIB_MAKEFILE)
 
 @GNOME_CODE_COVERAGE_RULES@
 
+nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl
+	$(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@
+
+nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl
+	$(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@
+
 # 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/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index c03e6265..7a0e1f6b 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -2240,13 +2240,19 @@ nm_connection_private_free (NMConnectionPrivate *priv)
 static NMConnectionPrivate *
 nm_connection_get_private (NMConnection *connection)
 {
+	static GQuark key = 0;
 	NMConnectionPrivate *priv;
 
-	priv = g_object_get_data (G_OBJECT (connection), "NMConnectionPrivate");
+	nm_assert (NM_IS_CONNECTION (connection));
+
+	if (G_UNLIKELY (key == 0))
+		key = g_quark_from_static_string ("NMConnectionPrivate");
+
+	priv = g_object_get_qdata ((GObject *) connection, key);
 	if (!priv) {
 		priv = g_slice_new0 (NMConnectionPrivate);
-		g_object_set_data_full (G_OBJECT (connection), "NMConnectionPrivate",
-		                        priv, (GDestroyNotify) nm_connection_private_free);
+		g_object_set_qdata_full ((GObject *) connection, key,
+		                         priv, (GDestroyNotify) nm_connection_private_free);
 
 		priv->self = connection;
 		priv->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 84e080af..1e0fbe68 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -150,8 +150,8 @@ typedef enum {
  * @NM_DEVICE_TYPE_VXLAN: a VXLAN interface
  * @NM_DEVICE_TYPE_VETH: a VETH interface
  *
- * #NMDeviceType values indicate the type of hardware represented by
- * an #NMDevice.
+ * #NMDeviceType values indicate the type of hardware represented by a
+ * device object.
  **/
 typedef enum {
 	NM_DEVICE_TYPE_UNKNOWN    = 0,
diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml
new file mode 100644
index 00000000..6d5d01bb
--- /dev/null
+++ b/libnm-core/nm-dbus-types.xml
@@ -0,0 +1,1291 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="nm-dbus-types">
+  <refmeta>
+    <refentrytitle role="top_of_page" id="nm-dbus-types.top_of_page">NetworkManager D-Bus API Types</refentrytitle>
+    <manvolnum>3</manvolnum>
+    <refmiscinfo>NetworkManager D-Bus API Types</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>NetworkManager D-Bus API Types</refname>
+    <refpurpose></refpurpose>
+  </refnamediv>
+
+  <refsect2 id="NMState" role="enum">
+    <title>enum NMState</title>
+    <indexterm zone="NMState">
+      <primary>NMState</primary>
+    </indexterm>
+    <para><para><link linkend="NMState">NMState</link> values indicate the current overall networking state.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>networking state is unknown</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_ASLEEP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>10</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>networking is not enabled</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_DISCONNECTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>20</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>there is no active network connection</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_DISCONNECTING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>30</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>network connections are being cleaned up</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_CONNECTING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>40</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a network connection is being started</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_CONNECTED_LOCAL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>50</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>there is only local IPv4 and/or IPv6 connectivity</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_CONNECTED_SITE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>60</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>there is only site-wide IPv4 and/or IPv6 connectivity</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_STATE_CONNECTED_GLOBAL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>70</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>there is global IPv4 and/or IPv6 Internet connectivity</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMConnectivityState" role="enum">
+    <title>enum NMConnectivityState</title>
+    <indexterm zone="NMConnectivityState">
+      <primary>NMConnectivityState</primary>
+    </indexterm>
+    <para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_CONNECTIVITY_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Network connectivity is unknown.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_CONNECTIVITY_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The host is not connected to any network.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_CONNECTIVITY_PORTAL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The host is behind a captive portal and cannot reach the full Internet.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_CONNECTIVITY_LIMITED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The host is connected to a network, but does not appear to be able to reach the full Internet.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_CONNECTIVITY_FULL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The host is connected to a network, and appears to be able to reach the full Internet.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMDeviceType" role="enum">
+    <title>enum NMDeviceType</title>
+    <indexterm zone="NMDeviceType">
+      <primary>NMDeviceType</primary>
+    </indexterm>
+    <para><para><link linkend="NMDeviceType">NMDeviceType</link> values indicate the type of hardware represented by a device object.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>unknown device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_GENERIC</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>14</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>generic support for unrecognized device types</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_ETHERNET</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a wired ethernet device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_WIFI</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>an 802.11 WiFi device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_UNUSED1</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>not used</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_UNUSED2</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>not used</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_BT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a Bluetooth device supporting PAN or DUN access protocols</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_OLPC_MESH</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>6</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>an OLPC XO mesh networking device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_WIMAX</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>7</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>an 802.16e Mobile WiMAX broadband device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_MODEM</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>8</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a modem supporting analog telephone, CDMA/EVDO, GSM/UMTS, or LTE network access protocols</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_INFINIBAND</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>9</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>an IP-over-InfiniBand device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_BOND</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>10</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a bond master interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_VLAN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>11</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>an 802.1Q VLAN interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_ADSL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>12</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>ADSL modem</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_BRIDGE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>13</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a bridge master interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_TEAM</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>15</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a team master interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_TUN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>16</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a TUN or TAP interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_IP_TUNNEL</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>17</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a IP tunnel interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_MACVLAN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>18</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a MACVLAN interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_VXLAN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>19</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a VXLAN interface</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_TYPE_VETH</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>20</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a VETH interface</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMDeviceCapabilities" role="enum">
+    <title>enum NMDeviceCapabilities</title>
+    <indexterm zone="NMDeviceCapabilities">
+      <primary>NMDeviceCapabilities</primary>
+    </indexterm>
+    <para><para>General device capability flags.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_CAP_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device has no special capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_CAP_NM_SUPPORTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000001</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>NetworkManager supports this device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_CAP_CARRIER_DETECT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000002</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>this device can indicate carrier status</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_CAP_IS_SOFTWARE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000004</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>this device is a software device</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMDeviceWifiCapabilities" role="enum">
+    <title>enum NMDeviceWifiCapabilities</title>
+    <indexterm zone="NMDeviceWifiCapabilities">
+      <primary>NMDeviceWifiCapabilities</primary>
+    </indexterm>
+    <para><para>802.11 specific device encryption and authentication capabilities.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device has no encryption/authentication capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_CIPHER_WEP40</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000001</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports 40/64-bit WEP encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_CIPHER_WEP104</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000002</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports 104/128-bit WEP encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_CIPHER_TKIP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000004</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports TKIP encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_CIPHER_CCMP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000008</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports AES/CCMP encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_WPA</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000010</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports WPA1 authentication</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_RSN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000020</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports WPA2/RSN authentication</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_AP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000040</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports Access Point mode</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_ADHOC</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000080</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports Ad-Hoc mode</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_FREQ_VALID</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000100</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device reports frequency capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_FREQ_2GHZ</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000200</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports 2.4GHz frequencies</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIFI_DEVICE_CAP_FREQ_5GHZ</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000400</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device supports 5GHz frequencies</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NM80211ApFlags" role="enum">
+    <title>enum NM80211ApFlags</title>
+    <indexterm zone="NM80211ApFlags">
+      <primary>NM80211ApFlags</primary>
+    </indexterm>
+    <para><para>802.11 access point flags.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_FLAGS_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>access point has no special capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_FLAGS_PRIVACY</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000001</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>access point requires authentication and encryption (usually means WEP)</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NM80211ApSecurityFlags" role="enum">
+    <title>enum NM80211ApSecurityFlags</title>
+    <indexterm zone="NM80211ApSecurityFlags">
+      <primary>NM80211ApSecurityFlags</primary>
+    </indexterm>
+    <para><para>802.11 access point security and authentication flags.  These flags describe the current security requirements of an access point as determined from the access point's beacon.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the access point has no special security requirements</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_PAIR_WEP40</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000001</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>40/64-bit WEP is supported for pairwise/unicast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_PAIR_WEP104</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000002</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>104/128-bit WEP is supported for pairwise/unicast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_PAIR_TKIP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000004</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>TKIP is supported for pairwise/unicast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_PAIR_CCMP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000008</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>AES/CCMP is supported for pairwise/unicast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_GROUP_WEP40</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000010</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>40/64-bit WEP is supported for group/broadcast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_GROUP_WEP104</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000020</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>104/128-bit WEP is supported for group/broadcast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_GROUP_TKIP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000040</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>TKIP is supported for group/broadcast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_GROUP_CCMP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000080</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>AES/CCMP is supported for group/broadcast encryption</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_KEY_MGMT_PSK</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000100</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>WPA/RSN Pre-Shared Key encryption is supported</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_AP_SEC_KEY_MGMT_802_1X</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000200</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>802.1x authentication and key management is supported</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NM80211Mode" role="enum">
+    <title>enum NM80211Mode</title>
+    <indexterm zone="NM80211Mode">
+      <primary>NM80211Mode</primary>
+    </indexterm>
+    <para><para>Indicates the 802.11 mode an access point or device is currently in.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_MODE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device or access point mode is unknown</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_MODE_ADHOC</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>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.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_MODE_INFRA</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>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.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_802_11_MODE_AP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is an access point/hotspot.  Not valid for access point objects; used only for hotspot mode on the local machine.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMBluetoothCapabilities" role="enum">
+    <title>enum NMBluetoothCapabilities</title>
+    <indexterm zone="NMBluetoothCapabilities">
+      <primary>NMBluetoothCapabilities</primary>
+    </indexterm>
+    <para><para><link linkend="NMBluetoothCapabilities">NMBluetoothCapabilities</link> values indicate the usable capabilities of a Bluetooth device.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_BT_CAPABILITY_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device has no usable capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_BT_CAPABILITY_DUN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000001</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device provides Dial-Up Networking capability</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_BT_CAPABILITY_NAP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000002</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>device provides Network Access Point capability</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMDeviceModemCapabilities" role="enum">
+    <title>enum NMDeviceModemCapabilities</title>
+    <indexterm zone="NMDeviceModemCapabilities">
+      <primary>NMDeviceModemCapabilities</primary>
+    </indexterm>
+    <para><para><link linkend="NMDeviceModemCapabilities">NMDeviceModemCapabilities</link> values indicate the generic radio access technology families a modem device supports.  For more information on the specific access technologies the device supports use the ModemManager D-Bus API.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_MODEM_CAPABILITY_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>modem has no usable capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_MODEM_CAPABILITY_POTS</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000001</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>modem uses the analog wired telephone network and is not a wireless/cellular device</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000002</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO revision A, or EVDO revision B</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000004</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_MODEM_CAPABILITY_LTE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x00000008</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>modem has LTE data capability</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMWimaxNspNetworkType" role="enum">
+    <title>enum NMWimaxNspNetworkType</title>
+    <indexterm zone="NMWimaxNspNetworkType">
+      <primary>NMWimaxNspNetworkType</primary>
+    </indexterm>
+    <para><para>WiMAX network type.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>unknown network type</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIMAX_NSP_NETWORK_TYPE_HOME</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>home network</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIMAX_NSP_NETWORK_TYPE_PARTNER</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>partner network</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>roaming partner network</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMDeviceState" role="enum">
+    <title>enum NMDeviceState</title>
+    <indexterm zone="NMDeviceState">
+      <primary>NMDeviceState</primary>
+    </indexterm>
+    <para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device's state is unknown</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_UNMANAGED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>10</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is recognized, but not managed by NetworkManager</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_UNAVAILABLE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>20</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is managed by NetworkManager, but is not available for use.  Reasons may include the wireless switched off, missing firmware, no ethernet carrier, missing supplicant or modem manager, etc.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_DISCONNECTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>30</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device can be activated, but is currently idle and not connected to a network.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_PREPARE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>40</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is preparing the connection to the network.  This may include operations like changing the MAC address, setting physical link properties, and anything else required to connect to the requested network.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_CONFIG</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>50</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is connecting to the requested network. This may include operations like associating with the WiFi AP, dialing the modem, connecting to the remote Bluetooth device, etc.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_NEED_AUTH</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>60</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device requires more information to continue connecting to the requested network.  This includes secrets like WiFi passphrases, login passwords, PIN codes, etc.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_IP_CONFIG</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>70</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is requesting IPv4 and/or IPv6 addresses and routing information from the network.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_IP_CHECK</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>80</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is checking whether further action is required for the requested network connection.  This may include checking whether only local network access is available, whether a captive portal is blocking access to the Internet, etc.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_SECONDARIES</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>90</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device is waiting for a secondary connection (like a VPN) which must activated before the device can be activated</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_ACTIVATED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>100</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device has a network connection, either local or global.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_DEACTIVATING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>110</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a disconnection from the current network connection was requested, and the device is cleaning up resources used for that connection.  The network connection may still be valid.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>120</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device failed to connect to the requested network and is cleaning up the connection request</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMDeviceStateReason" role="enum">
+    <title>enum NMDeviceStateReason</title>
+    <indexterm zone="NMDeviceStateReason">
+      <primary>NMDeviceStateReason</primary>
+    </indexterm>
+    <para><para>Device state change reason codes</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>No reason given</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Unknown error</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_NOW_MANAGED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Device is now managed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_NOW_UNMANAGED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Device is now unmanaged</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_CONFIG_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The device could not be readied for configuration</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>IP configuration could not be reserved (no available address, timeout, etc)</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>6</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The IP config is no longer valid</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_NO_SECRETS</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>7</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Secrets were required, but not provided</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>8</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>802.1x supplicant disconnected</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>9</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>802.1x supplicant configuration failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>10</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>802.1x supplicant failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>11</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>802.1x supplicant took too long to authenticate</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_PPP_START_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>12</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>PPP service failed to start</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_PPP_DISCONNECT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>13</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>PPP service disconnected</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_PPP_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>14</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>PPP failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_DHCP_START_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>15</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>DHCP client failed to start</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_DHCP_ERROR</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>16</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>DHCP client error</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_DHCP_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>17</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>DHCP client failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SHARED_START_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>18</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Shared connection service failed to start</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SHARED_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>19</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Shared connection service failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>20</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>AutoIP service failed to start</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_AUTOIP_ERROR</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>21</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>AutoIP service error</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_AUTOIP_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>22</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>AutoIP service failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_BUSY</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>23</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The line is busy</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>24</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>No dial tone</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>25</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>No carrier could be established</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>26</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The dialing request timed out</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>27</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The dialing attempt failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>28</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Modem initialization failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_APN_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>29</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Failed to select the specified APN</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>30</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Not searching for networks</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>31</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Network registration denied</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>32</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Network registration timed out</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>33</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Failed to register with the requested network</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>34</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>PIN check failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_FIRMWARE_MISSING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>35</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Necessary firmware for the device may be missing</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_REMOVED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>36</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The device was removed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SLEEPING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>37</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>NetworkManager went to sleep</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_CONNECTION_REMOVED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>38</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The device's active connection disappeared</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_USER_REQUESTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>39</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Device disconnected by user or client</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_CARRIER</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>40</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Carrier/link changed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>41</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The device's existing connection was assumed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>42</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The supplicant is now available</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>43</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The modem could not be found</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_BT_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>44</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The Bluetooth connection failed or timed out</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>45</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>GSM Modem's SIM Card not inserted</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>46</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>GSM Modem's SIM Pin required</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>47</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>GSM Modem's SIM Puk required</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_GSM_SIM_WRONG</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>48</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>GSM Modem's SIM wrong</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_INFINIBAND_MODE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>49</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>InfiniBand device does not support connected mode</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>50</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>A dependency of the connection failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_BR2684_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>51</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Problem with the RFC 2684 Ethernet over ADSL bridge</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>52</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>ModemManager not running</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SSID_NOT_FOUND</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>53</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The WiFi network could not be found</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>54</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>A secondary connection of the base connection failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>55</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>DCB or FCoE setup failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>56</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>teamd control failed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>57</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Modem failed or no longer available</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_MODEM_AVAILABLE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>58</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Modem now ready and available</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>59</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>SIM PIN was incorrect</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_NEW_ACTIVATION</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>60</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>New connection activation was enqueued</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_PARENT_CHANGED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>61</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device's parent changed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>62</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the device parent's management changed</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMMetered" role="enum">
+    <title>enum NMMetered</title>
+    <indexterm zone="NMMetered">
+      <primary>NMMetered</primary>
+    </indexterm>
+    <para><para>Since: 1.2</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_METERED_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The metered status is unknown</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_METERED_YES</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Metered, the value was statically set</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_METERED_NO</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Not metered, the value was statically set</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_METERED_GUESS_YES</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Metered, the value was guessed</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_METERED_GUESS_NO</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Not metered, the value was guessed</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMActiveConnectionState" role="enum">
+    <title>enum NMActiveConnectionState</title>
+    <indexterm zone="NMActiveConnectionState">
+      <primary>NMActiveConnectionState</primary>
+    </indexterm>
+    <para><para><link linkend="NMActiveConnectionState">NMActiveConnectionState</link> values indicate the state of a connection to a specific network while it is starting, connected, or disconnecting from that network.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_ACTIVE_CONNECTION_STATE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the state of the connection is unknown</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_ACTIVE_CONNECTION_STATE_ACTIVATING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>a network connection is being prepared</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_ACTIVE_CONNECTION_STATE_ACTIVATED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>there is a connection to the network</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_ACTIVE_CONNECTION_STATE_DEACTIVATING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the network connection is being torn down and cleaned up</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_ACTIVE_CONNECTION_STATE_DEACTIVATED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the network connection is disconnected and will be removed</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMSecretAgentGetSecretsFlags" role="enum">
+    <title>enum NMSecretAgentGetSecretsFlags</title>
+    <indexterm zone="NMSecretAgentGetSecretsFlags">
+      <primary>NMSecretAgentGetSecretsFlags</primary>
+    </indexterm>
+    <para><para><link linkend="NMSecretAgentGetSecretsFlags">NMSecretAgentGetSecretsFlags</link> values modify the behavior of a GetSecrets request.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>no special behavior; by default no user interaction is allowed and requests for secrets are fulfilled from persistent storage, or if no secrets are available an error is returned.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>allows the request to interact with the user, possibly prompting via UI for secrets if any are required, or if none are found in persistent storage.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>explicitly prompt for new secrets from the user.  This flag signals that NetworkManager thinks any existing secrets are invalid or wrong.  This flag implies that interaction is allowed.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>set if the request was initiated by user-requested action via the D-Bus interface, as opposed to automatically initiated by NetworkManager in response to (for example) scan results or carrier changes.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x80000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Internal flag, not part of the D-Bus API.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x40000000</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Internal flag, not part of the D-Bus API.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMSecretAgentCapabilities" role="enum">
+    <title>enum NMSecretAgentCapabilities</title>
+    <indexterm zone="NMSecretAgentCapabilities">
+      <primary>NMSecretAgentCapabilities</primary>
+    </indexterm>
+    <para><para><link linkend="NMSecretAgentCapabilities">NMSecretAgentCapabilities</link> indicate various capabilities of the agent.</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_CAPABILITY_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the agent supports no special capabilities</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_SECRET_AGENT_CAPABILITY_VPN_HINTS</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0x1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>the agent supports passing hints to VPN plugin authentication dialogs.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMIPTunnelMode" role="enum">
+    <title>enum NMIPTunnelMode</title>
+    <indexterm zone="NMIPTunnelMode">
+      <primary>NMIPTunnelMode</primary>
+    </indexterm>
+    <para><para>The tunneling mode.</para><para>Since: 1.2</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Unknown/unset tunnel mode</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_IPIP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>IP in IP tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_GRE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>GRE tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_SIT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>SIT tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_ISATAP</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>ISATAP tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_VTI</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>VTI tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_IP6IP6</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>6</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>IPv6 in IPv6 tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_IPIP6</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>7</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>IPv4 in IPv6 tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_IP6GRE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>8</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>IPv6 GRE tunnel</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_IP_TUNNEL_MODE_VTI6</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>9</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>IPv6 VTI tunnel</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+</refentry>
diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index d8867b92..5cdcb3d5 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/libnm-core/nm-setting-8021x.h
@@ -136,6 +136,9 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
  * properties to the paths to their respective objects.
  */
 
+/**
+ * NMSetting8021x:
+ */
 struct _NMSetting8021x {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h
index 2b44d686..5afbe5bf 100644
--- a/libnm-core/nm-setting-adsl.h
+++ b/libnm-core/nm-setting-adsl.h
@@ -54,6 +54,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 #define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 
+/**
+ * NMSettingAdsl:
+ */
 struct _NMSettingAdsl {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h
index 6bb5ce80..6746782e 100644
--- a/libnm-core/nm-setting-bluetooth.h
+++ b/libnm-core/nm-setting-bluetooth.h
@@ -59,6 +59,9 @@ G_BEGIN_DECLS
  */
 #define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 
+/**
+ * NMSettingBluetooth:
+ */
 struct _NMSettingBluetooth {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h
index 98fcc6d0..8ee31888 100644
--- a/libnm-core/nm-setting-bond.h
+++ b/libnm-core/nm-setting-bond.h
@@ -70,6 +70,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB    "tlb_dynamic_lb"
 #define NM_SETTING_BOND_OPTION_LP_INTERVAL       "lp_interval"
 
+/**
+ * NMSettingBond:
+ */
 struct _NMSettingBond {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h
index 49ca38b3..b43f6366 100644
--- a/libnm-core/nm-setting-bridge-port.h
+++ b/libnm-core/nm-setting-bridge-port.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 #define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 
+/**
+ * NMSettingBridgePort:
+ */
 struct _NMSettingBridgePort {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 020d6db6..844c06ad 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -48,6 +48,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 #define NM_SETTING_BRIDGE_MULTICAST_SNOOPING "multicast-snooping"
 
+/**
+ * NMSettingBridge:
+ */
 struct _NMSettingBridge {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h
index 6e333dcc..091c530e 100644
--- a/libnm-core/nm-setting-cdma.h
+++ b/libnm-core/nm-setting-cdma.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_CDMA_PASSWORD       "password"
 #define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 
+/**
+ * NMSettingCdma:
+ */
 struct _NMSettingCdma {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h
index e5bc4bcf..6cc2ce41 100644
--- a/libnm-core/nm-setting-dcb.h
+++ b/libnm-core/nm-setting-dcb.h
@@ -92,7 +92,9 @@ typedef enum { /*< flags >*/
 #define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 
-
+/**
+ * NMSettingDcb:
+ */
 struct _NMSettingDcb {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h
index 7a209da2..0ce3b160 100644
--- a/libnm-core/nm-setting-generic.h
+++ b/libnm-core/nm-setting-generic.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_GENERIC_SETTING_NAME "generic"
 
+/**
+ * NMSettingGeneric:
+ */
 struct _NMSettingGeneric {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h
index 2dfe73fa..7f97d386 100644
--- a/libnm-core/nm-setting-gsm.h
+++ b/libnm-core/nm-setting-gsm.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_GSM_SIM_ID          "sim-id"
 #define NM_SETTING_GSM_SIM_OPERATOR_ID "sim-operator-id"
 
+/**
+ * NMSettingGsm:
+ */
 struct _NMSettingGsm {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h
index c5ad418b..f19983b4 100644
--- a/libnm-core/nm-setting-infiniband.h
+++ b/libnm-core/nm-setting-infiniband.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_INFINIBAND_P_KEY          "p-key"
 #define NM_SETTING_INFINIBAND_PARENT         "parent"
 
+/**
+ * NMSettingInfiniband:
+ */
 struct _NMSettingInfiniband {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index 39e4c9f0..79c7e639 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -165,6 +165,9 @@ void         nm_ip_route_set_attribute       (NMIPRoute   *route,
 #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY              "no-tld-query"
 #define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
 
+/**
+ * NMSettingIPConfig:
+ */
 struct _NMSettingIPConfig {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ip-tunnel.h b/libnm-core/nm-setting-ip-tunnel.h
index 09814f35..3ee4aafe 100644
--- a/libnm-core/nm-setting-ip-tunnel.h
+++ b/libnm-core/nm-setting-ip-tunnel.h
@@ -51,6 +51,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_IP_TUNNEL_FLOW_LABEL          "flow-label"
 #define NM_SETTING_IP_TUNNEL_MTU                 "mtu"
 
+/**
+ * NMSettingIPTunnel:
+ */
 struct _NMSettingIPTunnel {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h
index 8e6524cb..adef3754 100644
--- a/libnm-core/nm-setting-ip4-config.h
+++ b/libnm-core/nm-setting-ip4-config.h
@@ -87,6 +87,9 @@ G_BEGIN_DECLS
  */
 #define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 
+/**
+ * NMSettingIP4Config:
+ */
 struct _NMSettingIP4Config {
 	NMSettingIPConfig parent;
 };
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index bab8c535..1f0b11fc 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -601,7 +601,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
 	 *
 	 * Configure method for creating the address for use with RFC4862 IPv6
 	 * Stateless Address Autoconfiguration. The permitted values are: "eui64",
-	 * "stable-privacy" or unset.
+	 * or "stable-privacy".
 	 *
 	 * If the property is set to "eui64", the addresses will be generated
 	 * using the interface tokens derived from  hardware address. This makes
@@ -616,8 +616,10 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
 	 * and makes the address stable when the network interface hardware is
 	 * replaced.
 	 *
-	 * Leaving this unset causes a default that could be subject to change
-	 * in future versions to be used.
+	 * On D-Bus, the absence of an addr-gen-mode setting equals enabling
+	 * "stable-privacy". For keyfile plugin, the absence of the setting
+	 * on disk means "eui64" so that the property doesn't change on upgrade
+	 * from older versions.
 	 *
 	 * Note that this setting is distinct from the Privacy Extensions as
 	 * configured by "ip6-privacy" property and it does not affect the
diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h
index f8923d19..2966e558 100644
--- a/libnm-core/nm-setting-ip6-config.h
+++ b/libnm-core/nm-setting-ip6-config.h
@@ -135,6 +135,9 @@ typedef enum {
 	NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY = 1,
 } NMSettingIP6ConfigAddrGenMode;
 
+/**
+ * NMSettingIP6Config:
+ */
 struct _NMSettingIP6Config {
 	NMSettingIPConfig parent;
 };
diff --git a/libnm-core/nm-setting-macvlan.h b/libnm-core/nm-setting-macvlan.h
index 3922cd93..33860aac 100644
--- a/libnm-core/nm-setting-macvlan.h
+++ b/libnm-core/nm-setting-macvlan.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_MACVLAN_PROMISCUOUS          "promiscuous"
 #define NM_SETTING_MACVLAN_TAP                  "tap"
 
+/**
+ * NMSettingMacvlan:
+ */
 struct _NMSettingMacvlan {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h
index 6a165651..2506cec9 100644
--- a/libnm-core/nm-setting-olpc-mesh.h
+++ b/libnm-core/nm-setting-olpc-mesh.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 #define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 
+/**
+ * NMSettingOlpcMesh:
+ */
 struct _NMSettingOlpcMesh {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h
index 2e0162cc..a835ef8a 100644
--- a/libnm-core/nm-setting-ppp.h
+++ b/libnm-core/nm-setting-ppp.h
@@ -59,6 +59,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 #define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 
+/**
+ * NMSettingPpp:
+ */
 struct _NMSettingPpp {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h
index b1e0d92f..1f5b6ed9 100644
--- a/libnm-core/nm-setting-pppoe.h
+++ b/libnm-core/nm-setting-pppoe.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_PPPOE_PASSWORD       "password"
 #define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 
+/**
+ * NMSettingPppoe:
+ */
 struct _NMSettingPppoe {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h
index 58289227..182efc61 100644
--- a/libnm-core/nm-setting-serial.h
+++ b/libnm-core/nm-setting-serial.h
@@ -60,6 +60,9 @@ typedef enum {
 #define NM_SETTING_SERIAL_STOPBITS "stopbits"
 #define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 
+/**
+ * NMSettingSerial:
+ */
 struct _NMSettingSerial {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h
index 86efb97c..546cc69a 100644
--- a/libnm-core/nm-setting-team-port.h
+++ b/libnm-core/nm-setting-team-port.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_TEAM_PORT_CONFIG     "config"
 
+/**
+ * NMSettingTeamPort:
+ */
 struct _NMSettingTeamPort {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h
index d66eb685..726f8420 100644
--- a/libnm-core/nm-setting-team.h
+++ b/libnm-core/nm-setting-team.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_TEAM_CONFIG "config"
 
+/**
+ * NMSettingTeam:
+ */
 struct _NMSettingTeam {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-tun.h b/libnm-core/nm-setting-tun.h
index 2b368a69..63c0cbd8 100644
--- a/libnm-core/nm-setting-tun.h
+++ b/libnm-core/nm-setting-tun.h
@@ -60,6 +60,9 @@ typedef enum {
 	NM_SETTING_TUN_MODE_TAP        = 2,
 } NMSettingTunMode;
 
+/**
+ * NMSettingTun:
+ */
 struct _NMSettingTun {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h
index cf41ba17..b147a185 100644
--- a/libnm-core/nm-setting-vlan.h
+++ b/libnm-core/nm-setting-vlan.h
@@ -46,6 +46,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 #define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 
+/**
+ * NMSettingVlan:
+ */
 struct _NMSettingVlan {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h
index 31f3c7b8..539656f8 100644
--- a/libnm-core/nm-setting-vpn.h
+++ b/libnm-core/nm-setting-vpn.h
@@ -47,6 +47,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_VPN_SECRETS      "secrets"
 #define NM_SETTING_VPN_TIMEOUT      "timeout"
 
+/**
+ * NMSettingVpn:
+ */
 struct _NMSettingVpn {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-vxlan.h b/libnm-core/nm-setting-vxlan.h
index c410338e..fab2d820 100644
--- a/libnm-core/nm-setting-vxlan.h
+++ b/libnm-core/nm-setting-vxlan.h
@@ -56,6 +56,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_VXLAN_L2_MISS            "l2-miss"
 #define NM_SETTING_VXLAN_L3_MISS            "l3-miss"
 
+/**
+ * NMSettingVxlan:
+ */
 struct _NMSettingVxlan {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h
index 0a98fbb5..3f0767e9 100644
--- a/libnm-core/nm-setting-wimax.h
+++ b/libnm-core/nm-setting-wimax.h
@@ -42,6 +42,9 @@ G_BEGIN_DECLS
 #define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 #define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 
+/**
+ * NMSettingWimax:
+ */
 struct _NMSettingWimax {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h
index 7eb53d30..6bc66782 100644
--- a/libnm-core/nm-setting-wired.h
+++ b/libnm-core/nm-setting-wired.h
@@ -93,6 +93,9 @@ typedef enum { /*< flags >*/
 #define NM_SETTING_WIRED_WAKE_ON_LAN "wake-on-lan"
 #define NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD "wake-on-lan-password"
 
+/**
+ * NMSettingWired:
+ */
 struct _NMSettingWired {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h
index 8c4e1f03..093cb386 100644
--- a/libnm-core/nm-setting-wireless-security.h
+++ b/libnm-core/nm-setting-wireless-security.h
@@ -89,6 +89,9 @@ typedef enum {
 #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 #define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 
+/**
+ * NMSettingWirelessSecurity:
+ */
 struct _NMSettingWirelessSecurity {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index 606733fa..574cee54 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/libnm-core/nm-setting-wireless.h
@@ -98,7 +98,9 @@ typedef enum {
 	NM_SETTING_WIRELESS_POWERSAVE_LAST          =  _NM_SETTING_WIRELESS_POWERSAVE_NUM - 1, /*< skip >*/
 } NMSettingWirelessPowersave;
 
-
+/**
+ * NMSettingWireless:
+ */
 struct _NMSettingWireless {
 	NMSetting parent;
 };
diff --git a/libnm-core/nm-simple-connection.h b/libnm-core/nm-simple-connection.h
index da6030a8..d6a60447 100644
--- a/libnm-core/nm-simple-connection.h
+++ b/libnm-core/nm-simple-connection.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
 #define NM_IS_SIMPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SIMPLE_CONNECTION))
 #define NM_SIMPLE_CONNECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SIMPLE_CONNECTION, NMSimpleConnectionClass))
 
+/**
+ * NMSimpleConnection:
+ */
 struct _NMSimpleConnection {
 	GObject parent;
 };
diff --git a/libnm-core/nm-vpn-dbus-types.xml b/libnm-core/nm-vpn-dbus-types.xml
new file mode 100644
index 00000000..6e10060c
--- /dev/null
+++ b/libnm-core/nm-vpn-dbus-types.xml
@@ -0,0 +1,246 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="nm-vpn-dbus-types">
+  <refmeta>
+    <refentrytitle role="top_of_page" id="nm-vpn-dbus-types.top_of_page">VPN Plugin D-Bus API Types</refentrytitle>
+    <manvolnum>3</manvolnum>
+    <refmiscinfo>VPN Plugin D-Bus API Types</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>VPN Plugin D-Bus API Types</refname>
+    <refpurpose></refpurpose>
+  </refnamediv>
+
+  <refsect2 id="NMVpnServiceState" role="enum">
+    <title>enum NMVpnServiceState</title>
+    <indexterm zone="NMVpnServiceState">
+      <primary>NMVpnServiceState</primary>
+    </indexterm>
+    <para><para>VPN daemon states</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The state of the VPN plugin is unknown.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_INIT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN plugin is initialized.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_SHUTDOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Not used.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_STARTING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The plugin is attempting to connect to a VPN server.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_STARTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The plugin has connected to a VPN server.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_STOPPING</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The plugin is disconnecting from the VPN server.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_SERVICE_STATE_STOPPED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>6</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The plugin has disconnected from the VPN server.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMVpnConnectionState" role="enum">
+    <title>enum NMVpnConnectionState</title>
+    <indexterm zone="NMVpnConnectionState">
+      <primary>NMVpnConnectionState</primary>
+    </indexterm>
+    <para><para>VPN connection states</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The state of the VPN connection is unknown.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_PREPARE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection is preparing to connect.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_NEED_AUTH</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection needs authorization credentials.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_CONNECT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection is being established.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_IP_CONFIG_GET</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection is getting an IP address.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_ACTIVATED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection is active.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>6</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection failed.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_DISCONNECTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>7</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection is disconnected.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMVpnConnectionStateReason" role="enum">
+    <title>enum NMVpnConnectionStateReason</title>
+    <indexterm zone="NMVpnConnectionStateReason">
+      <primary>NMVpnConnectionStateReason</primary>
+    </indexterm>
+    <para><para>VPN connection state reasons</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_UNKNOWN</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>0</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The reason for the VPN connection state change is unknown.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_NONE</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>No reason was given for the VPN connection state change.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection changed state because the user disconnected it.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The VPN connection changed state because the device it was using was disconnected.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>4</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The service providing the VPN connection was stopped.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>5</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The IP config of the VPN connection was invalid.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>6</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The connection attempt to the VPN service timed out.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>7</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>A timeout occurred while starting the service providing the VPN connection.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>8</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Starting the service starting the service providing the VPN connection failed.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>9</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Necessary secrets for the VPN connection were not provided.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>10</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Authentication to the VPN server failed.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>11</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>The connection was deleted from settings.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+  <refsect2 id="NMVpnPluginFailure" role="enum">
+    <title>enum NMVpnPluginFailure</title>
+    <indexterm zone="NMVpnPluginFailure">
+      <primary>NMVpnPluginFailure</primary>
+    </indexterm>
+    <para><para>VPN plugin failure reasons</para><para></para></para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>1</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Login failed.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>2</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Connect failed.</para><para></para></entry>
+            </row>
+            <row role="constant">
+              <entry role="enum_member_name"><para>NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG</para><para></para></entry>
+              <entry role="enum_member_value"><para>= <literal>3</literal></para><para></para></entry>
+              <entry role="enum_member_description"><para>Invalid IP configuration returned from the VPN plugin.</para><para></para></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+</refentry>
diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c
index a49c3957..c4db3788 100644
--- a/libnm-core/nm-vpn-editor-plugin.c
+++ b/libnm-core/nm-vpn-editor-plugin.c
@@ -24,6 +24,8 @@
 
 #include "nm-vpn-editor-plugin.h"
 
+#include <dlfcn.h>
+
 #include "nm-core-internal.h"
 
 static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface);
@@ -80,11 +82,15 @@ _nm_vpn_editor_plugin_load (const char *plugin_name,
                             gpointer user_data,
                             GError **error)
 {
-	GModule *module = NULL;
+	void *dl_module = NULL;
+	gboolean loaded_before;
 	NMVpnEditorPluginFactory factory = NULL;
-	NMVpnEditorPlugin *editor_plugin = NULL;
+	gs_unref_object NMVpnEditorPlugin *editor_plugin = NULL;
 	gs_free char *plugin_filename_free = NULL;
 	const char *plugin_filename;
+	gs_free_error GError *factory_error = NULL;
+	gs_free char *plug_name = NULL;
+	gs_free char *plug_service = NULL;
 
 	g_return_val_if_fail (plugin_name && *plugin_name, NULL);
 
@@ -105,8 +111,14 @@ _nm_vpn_editor_plugin_load (const char *plugin_name,
 			plugin_filename_free = g_module_build_path (NMPLUGINDIR, plugin_name);
 			plugin_filename = plugin_filename_free;
 		}
+	}
 
-		/* _nm_utils_check_module_file() fails with ENOENT if the plugin file
+	dl_module = dlopen (plugin_filename, RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
+	if (   !dl_module
+	    && do_file_checks) {
+		/* If the module is already loaded, we skip the file checks.
+		 *
+		 * _nm_utils_check_module_file() fails with ENOENT if the plugin file
 		 * does not exist. That is relevant, because nm-applet checks for that. */
 		if (!_nm_utils_check_module_file (plugin_filename,
 		                                  check_owner,
@@ -116,79 +128,85 @@ _nm_vpn_editor_plugin_load (const char *plugin_name,
 			return NULL;
 	}
 
-	module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-	if (!module) {
+	if (dl_module) {
+		loaded_before = TRUE;
+	} else {
+		loaded_before = FALSE;
+		dl_module = dlopen (plugin_filename, RTLD_LAZY | RTLD_LOCAL);
+	}
+
+	if (!dl_module) {
+		g_set_error (error,
+		             NM_VPN_PLUGIN_ERROR,
+		             NM_VPN_PLUGIN_ERROR_FAILED,
+		             _("cannot load plugin \"%s\": %s"),
+		             plugin_name,
+		             dlerror () ?: "unknown reason");
+		return NULL;
+	}
+
+	factory = dlsym (dl_module, "nm_vpn_editor_plugin_factory");
+	if (!factory) {
 		g_set_error (error,
 		             NM_VPN_PLUGIN_ERROR,
 		             NM_VPN_PLUGIN_ERROR_FAILED,
-		             _("cannot load plugin %s"), plugin_name);
+		             _("failed to load nm_vpn_editor_plugin_factory() from %s (%s)"),
+		             plugin_name, dlerror ());
+		dlclose (dl_module);
 		return NULL;
 	}
 
-	if (g_module_symbol (module, "nm_vpn_editor_plugin_factory", (gpointer) &factory)) {
-		gs_free_error GError *factory_error = NULL;
-		gboolean success = FALSE;
-
-		editor_plugin = factory (&factory_error);
-
-		g_assert (!editor_plugin || G_IS_OBJECT (editor_plugin));
-
-		if (editor_plugin) {
-			gs_free char *plug_name = NULL, *plug_service = NULL;
-
-			/* Validate plugin properties */
-
-			g_object_get (G_OBJECT (editor_plugin),
-			              NM_VPN_EDITOR_PLUGIN_NAME, &plug_name,
-			              NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service,
-			              NULL);
-
-			if (!plug_name || !*plug_name) {
-				g_set_error (error,
-				             NM_VPN_PLUGIN_ERROR,
-				             NM_VPN_PLUGIN_ERROR_FAILED,
-				             _("cannot load VPN plugin in '%s': missing plugin name"),
-				             g_module_name (module));
-			} else if (   check_service
-			           && g_strcmp0 (plug_service, check_service) != 0) {
-				g_set_error (error,
-				             NM_VPN_PLUGIN_ERROR,
-				             NM_VPN_PLUGIN_ERROR_FAILED,
-				             _("cannot load VPN plugin in '%s': invalid service name"),
-				             g_module_name (module));
-			} else {
-				/* Success! */
-				g_object_set_data_full (G_OBJECT (editor_plugin), "gmodule", module,
-				                        (GDestroyNotify) g_module_close);
-				success = TRUE;
-			}
+	editor_plugin = factory (&factory_error);
+
+	if (loaded_before) {
+		/* we want to leak the library, because the factory will register glib
+		 * types, which cannot be unregistered.
+		 *
+		 * However, if the library was already loaded before, we want to return
+		 * our part of the reference count. */
+		dlclose (dl_module);
+	}
+
+	if (!editor_plugin) {
+		if (factory_error) {
+			g_propagate_error (error, factory_error);
+			factory_error = NULL;
 		} else {
-			if (factory_error) {
-				g_propagate_error (error, factory_error);
-				factory_error = NULL;
-			} else {
-				g_set_error (error,
-				             NM_VPN_PLUGIN_ERROR,
-				             NM_VPN_PLUGIN_ERROR_FAILED,
-				             _("unknown error initializing plugin %s"), plugin_name);
-			}
+			g_set_error (error,
+			             NM_VPN_PLUGIN_ERROR,
+			             NM_VPN_PLUGIN_ERROR_FAILED,
+			             _("unknown error initializing plugin %s"), plugin_name);
 		}
+		return NULL;
+	}
 
-		if (!success) {
-			g_module_close (module);
-			editor_plugin = NULL;
-		}
-	} else {
+	g_return_val_if_fail (G_IS_OBJECT (editor_plugin), NULL);
+
+	/* Validate plugin properties */
+	g_object_get (G_OBJECT (editor_plugin),
+	              NM_VPN_EDITOR_PLUGIN_NAME, &plug_name,
+	              NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service,
+	              NULL);
+
+	if (!plug_name || !*plug_name) {
 		g_set_error (error,
 		             NM_VPN_PLUGIN_ERROR,
 		             NM_VPN_PLUGIN_ERROR_FAILED,
-		             _("failed to load nm_vpn_editor_plugin_factory() from %s (%s)"),
-		             g_module_name (module), g_module_error ());
-		g_module_close (module);
-		editor_plugin = NULL;
+		             _("cannot load VPN plugin in '%s': missing plugin name"),
+		             plugin_name);
+		return NULL;
+	}
+	if (   check_service
+	    && g_strcmp0 (plug_service, check_service) != 0) {
+		g_set_error (error,
+		             NM_VPN_PLUGIN_ERROR,
+		             NM_VPN_PLUGIN_ERROR_FAILED,
+		             _("cannot load VPN plugin in '%s': invalid service name"),
+		             plugin_name);
+		return NULL;
 	}
 
-	return editor_plugin;
+	return nm_unauto (&editor_plugin);
 }
 
 /**
diff --git a/libnm-core/nm-vpn-plugin-info.h b/libnm-core/nm-vpn-plugin-info.h
index 667a4fe2..c7fef857 100644
--- a/libnm-core/nm-vpn-plugin-info.h
+++ b/libnm-core/nm-vpn-plugin-info.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM        "libnm"
 #define NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME        "GNOME"
 
+/**
+ * NMVpnPluginInfo:
+ */
 typedef struct {
 	NM_AVAILABLE_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index f1e26548..142ab295 100644
--- a/libnm/nm-access-point.h
+++ b/libnm/nm-access-point.h
@@ -51,7 +51,9 @@ G_BEGIN_DECLS
 /* DEPRECATED */
 #define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 
-
+/**
+ * NMAccessPoint:
+ */
 struct _NMAccessPoint {
 	NMObject parent;
 };
diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 4bc84148..13e50a06 100644
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 #define NM_ACTIVE_CONNECTION_MASTER               "master"
 
+/**
+ * NMActiveConnection:
+ */
 struct _NMActiveConnection {
 	NMObject parent;
 };
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 54d6deee..66ec9ea5 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -157,6 +157,9 @@ typedef enum {
 #define NM_CLIENT_ERROR nm_client_error_quark ()
 GQuark nm_client_error_quark (void);
 
+/**
+ * NMClient:
+ */
 struct _NMClient {
 	GObject parent;
 };
diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h
index d0174514..113d25b1 100644
--- a/libnm/nm-device-adsl.h
+++ b/libnm/nm-device-adsl.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 
 #define NM_DEVICE_ADSL_CARRIER "carrier"
 
+/**
+ * NMDeviceAdsl:
+ */
 struct _NMDeviceAdsl {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h
index b7a0b113..67f64280 100644
--- a/libnm/nm-device-bond.h
+++ b/libnm/nm-device-bond.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BOND_CARRIER     "carrier"
 #define NM_DEVICE_BOND_SLAVES      "slaves"
 
+/**
+ * NMDeviceBond:
+ */
 struct _NMDeviceBond {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h
index 42a0b3a5..df0cb303 100644
--- a/libnm/nm-device-bridge.h
+++ b/libnm/nm-device-bridge.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 #define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 
+/**
+ * NMDeviceBridge:
+ */
 struct _NMDeviceBridge {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h
index e066cbcd..773cb148 100644
--- a/libnm/nm-device-bt.h
+++ b/libnm/nm-device-bt.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BT_NAME         "name"
 #define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 
+/**
+ * NMDeviceBt:
+ */
 struct _NMDeviceBt {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h
index 07cf4c4d..76f4fde1 100644
--- a/libnm/nm-device-ethernet.h
+++ b/libnm/nm-device-ethernet.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 #define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
 
+/**
+ * NMDeviceEthernet:
+ */
 struct _NMDeviceEthernet {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h
index 457a8840..2a4a1160 100644
--- a/libnm/nm-device-generic.h
+++ b/libnm/nm-device-generic.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 
+/**
+ * NMDeviceGeneric:
+ */
 struct _NMDeviceGeneric {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h
index c1f9be07..1f4ea217 100644
--- a/libnm/nm-device-infiniband.h
+++ b/libnm/nm-device-infiniband.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 #define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 
+/**
+ * NMDeviceInfiniband:
+ */
 struct _NMDeviceInfiniband {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-ip-tunnel.h b/libnm/nm-device-ip-tunnel.h
index 820eab16..14251849 100644
--- a/libnm/nm-device-ip-tunnel.h
+++ b/libnm/nm-device-ip-tunnel.h
@@ -48,6 +48,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT "encapsulation-limit"
 #define NM_DEVICE_IP_TUNNEL_FLOW_LABEL          "flow-label"
 
+/**
+ * NMDeviceIPTunnel:
+ */
 struct _NMDeviceIPTunnel {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
index 7ffb80c1..aec280bd 100644
--- a/libnm/nm-device-macvlan.h
+++ b/libnm/nm-device-macvlan.h
@@ -42,6 +42,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MACVLAN_TAP         "tap"
 #define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
 
+/**
+ * NMDeviceMacvlan:
+ */
 struct _NMDeviceMacvlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index 38a4ddbb..fdf5c41f 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 
+/**
+ * NMDeviceModem:
+ */
 struct _NMDeviceModem {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h
index b5899445..fc88beb9 100644
--- a/libnm/nm-device-olpc-mesh.h
+++ b/libnm/nm-device-olpc-mesh.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 
+/**
+ * NMDeviceOlpcMesh:
+ */
 struct _NMDeviceOlpcMesh {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h
index a7185795..a9b71c6a 100644
--- a/libnm/nm-device-team.h
+++ b/libnm/nm-device-team.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_TEAM_CARRIER     "carrier"
 #define NM_DEVICE_TEAM_SLAVES      "slaves"
 
+/**
+ * NMDeviceTeam:
+ */
 struct _NMDeviceTeam {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-tun.h b/libnm/nm-device-tun.h
index b83e2b3f..71649f8f 100644
--- a/libnm/nm-device-tun.h
+++ b/libnm/nm-device-tun.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_TUN_VNET_HDR     "vnet-hdr"
 #define NM_DEVICE_TUN_MULTI_QUEUE  "multi-queue"
 
+/**
+ * NMDeviceTun:
+ */
 struct _NMDeviceTun {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h
index 6ab24202..1ee03bd5 100644
--- a/libnm/nm-device-vlan.h
+++ b/libnm/nm-device-vlan.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_VLAN_PARENT      "parent"
 #define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 
+/**
+ * NMDeviceVlan:
+ */
 struct _NMDeviceVlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-vxlan.h b/libnm/nm-device-vxlan.h
index 1fb63597..70c7ed51 100644
--- a/libnm/nm-device-vxlan.h
+++ b/libnm/nm-device-vxlan.h
@@ -55,6 +55,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_VXLAN_L3MISS        "l3miss"
 #define NM_DEVICE_VXLAN_DST_PORT      "dst-port"
 
+/**
+ * NMDeviceVxlan:
+ */
 struct _NMDeviceVxlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index b5974ba2..ee0238df 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 #define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 
+/**
+ * NMDeviceWifi:
+ */
 struct _NMDeviceWifi {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h
index cdd6ba56..424779bd 100644
--- a/libnm/nm-device-wimax.h
+++ b/libnm/nm-device-wimax.h
@@ -46,6 +46,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIMAX_BSID             "bsid"
 #define NM_DEVICE_WIMAX_NSPS             "nsps"
 
+/**
+ * NMDeviceWimax:
+ */
 struct _NMDeviceWimax {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index c16ead9e..5ffeb42e 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -65,6 +65,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_METERED "metered"
 #define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors"
 
+/**
+ * NMDevice:
+ */
 struct _NMDevice {
 	NMObject parent;
 };
diff --git a/libnm/nm-dhcp-config.h b/libnm/nm-dhcp-config.h
index 85aa3bd2..be32992f 100644
--- a/libnm/nm-dhcp-config.h
+++ b/libnm/nm-dhcp-config.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CONFIG))
 #define NM_IS_DHCP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CONFIG))
 
+/**
+ * NMDhcpConfig:
+ */
 struct _NMDhcpConfig {
 	NMObject parent;
 };
diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h
index 3423740d..4978f848 100644
--- a/libnm/nm-dhcp4-config.h
+++ b/libnm/nm-dhcp4-config.h
@@ -31,6 +31,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP4_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG))
 #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG))
 
+/**
+ * NMDhcp4Config:
+ */
 typedef struct {
 	NMDhcpConfig parent;
 } NMDhcp4Config;
diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h
index abb24adf..b7c7c822 100644
--- a/libnm/nm-dhcp6-config.h
+++ b/libnm/nm-dhcp6-config.h
@@ -31,6 +31,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP6_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG))
 #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG))
 
+/**
+ * NMDhcp6Config:
+ */
 typedef struct {
 	NMDhcpConfig parent;
 } NMDhcp6Config;
diff --git a/libnm/nm-ip-config.h b/libnm/nm-ip-config.h
index 815135a0..38d5b454 100644
--- a/libnm/nm-ip-config.h
+++ b/libnm/nm-ip-config.h
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP_CONFIG))
 #define NM_IP_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP_CONFIG, NMIPConfigClass))
 
+/**
+ * NMIPConfig:
+ */
 struct _NMIPConfig {
 	NMObject parent;
 };
diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h
index e2a18e0f..196fe09a 100644
--- a/libnm/nm-ip4-config.h
+++ b/libnm/nm-ip4-config.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG))
 #define NM_IP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass))
 
+/**
+ * NMIP4Config:
+ */
 typedef struct {
 	NMIPConfig parent;
 } NMIP4Config;
diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h
index 1953476d..fa67517c 100644
--- a/libnm/nm-ip6-config.h
+++ b/libnm/nm-ip6-config.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG))
 #define NM_IP6_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass))
 
+/**
+ * NMIP6Config:
+ */
 typedef struct {
 	NMIPConfig parent;
 } NMIP6Config;
diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index f9e4cd0e..7b6dd675 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_MANAGER_METERED "metered"
 #define NM_MANAGER_ALL_DEVICES "all-devices"
 
+/**
+ * NMManager:
+ */
 typedef struct {
 	NMObject parent;
 } NMManager;
diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index b42f160d..fcfc718c 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_OBJECT_PATH "path"
 #define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 
+/**
+ * NMObject:
+ */
 struct _NMObject {
 	GObject parent;
 };
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index c4a6685e..f75e233d 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -169,7 +169,7 @@
     <property name="routes" type="array of array of uint32" default="[]" description="Array of IP routes." />
   </setting>
   <setting name="ipv6">
-    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, &quot;stable-privacy&quot; or unset. If the property is set to &quot;eui64&quot;, the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of &quot;stable-privacy&quot; enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
+    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, or &quot;stable-privacy&quot;. If the property is set to &quot;eui64&quot;, the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of &quot;stable-privacy&quot; enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling &quot;stable-privacy&quot;. For keyfile plugin, the absence of the setting on disk means &quot;eui64&quot; so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
     <property name="addresses" type="array of legacy IPv6 address struct" default="[]" description="Array of IP addresses." />
     <property name="dad-timeout" type="int32" default="-1" description="Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds." />
     <property name="dhcp-hostname" type="string" description="If the &quot;dhcp-send-hostname&quot; property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and &quot;dhcp-fqdn&quot; are mutually exclusive and cannot be set at the same time." />
diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h
index 3ea8037f..a7235755 100644
--- a/libnm/nm-remote-connection.h
+++ b/libnm/nm-remote-connection.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 #define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 
+/**
+ * NMRemoteConnection:
+ */
 struct _NMRemoteConnection {
 	NMObject parent;
 };
diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h
index 1ffc0bf2..f8eddc5b 100644
--- a/libnm/nm-remote-settings.h
+++ b/libnm/nm-remote-settings.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 typedef struct _NMRemoteSettings NMRemoteSettings;
 typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass;
 
+/**
+ * NMRemoteSettings:
+ */
 struct _NMRemoteSettings {
 	NMObject parent;
 };
diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h
index 6198e2c0..476cc2a2 100644
--- a/libnm/nm-secret-agent-old.h
+++ b/libnm/nm-secret-agent-old.h
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 #define NM_SECRET_AGENT_OLD_REGISTERED          "registered"
 #define NM_SECRET_AGENT_OLD_CAPABILITIES        "capabilities"
 
+/**
+ * NMSecretAgentOld:
+ */
 typedef struct {
 	GObject parent;
 } NMSecretAgentOld;
diff --git a/libnm/nm-setting-docs.xml b/libnm/nm-setting-docs.xml
index 323709b0..d3ede916 100644
--- a/libnm/nm-setting-docs.xml
+++ b/libnm/nm-setting-docs.xml
@@ -173,7 +173,7 @@
     <property name="routes" type="array of array of uint32" default="[]" description="Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)" />
   </setting>
   <setting name="ipv6">
-    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, &quot;stable-privacy&quot; or unset. If the property is set to &quot;eui64&quot;, the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of &quot;stable-privacy&quot; enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
+    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, or &quot;stable-privacy&quot;. If the property is set to &quot;eui64&quot;, the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of &quot;stable-privacy&quot; enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling &quot;stable-privacy&quot;. For keyfile plugin, the absence of the setting on disk means &quot;eui64&quot; so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
     <property name="address-data" type="array of vardict" description="Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses." />
     <property name="addresses" type="array of legacy IPv6 address struct (a(ayuay))" default="[]" description="Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet." />
     <property name="dad-timeout" type="int32" default="-1" description="Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds." />
diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 349de41e..79ec90a0 100644
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 #define NM_VPN_CONNECTION_BANNER "banner"
 
+/**
+ * NMVpnConnection:
+ */
 struct _NMVpnConnection {
 	NMActiveConnection parent;
 };
diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h
index 59cf4600..50e34450 100644
--- a/libnm/nm-vpn-plugin-old.h
+++ b/libnm/nm-vpn-plugin-old.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 #define NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME "service-name"
 #define NM_VPN_PLUGIN_OLD_STATE             "state"
 
+/**
+ * NMVpnPluginOld:
+ */
 typedef struct {
 	NM_DEPRECATED_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-vpn-service-plugin.h b/libnm/nm-vpn-service-plugin.h
index 29319189..0b655296 100644
--- a/libnm/nm-vpn-service-plugin.h
+++ b/libnm/nm-vpn-service-plugin.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER   "watch-peer"
 #define NM_VPN_SERVICE_PLUGIN_STATE             "state"
 
+/**
+ * NMVpnServicePlugin:
+ */
 typedef struct {
 	NM_AVAILABLE_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index 5dd982ef..e1f63400 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 #define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 
+/**
+ * NMWimaxNsp:
+ */
 struct _NMWimaxNsp {
 	NMObject parent;
 };
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 6fc58362..48d2a8c5 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.0" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.2" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index b058e562..74496d5a 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
+.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -254,7 +254,7 @@ This key is deprecated and has no effect since the hostname is now stored in /et
 .PP
 \fIpath\fR
 .RS 4
-The location where keyfiles are read and stored\&. This defaults to "${prefix}/etc/NetworkManager/conf\&.d"\&.
+The location where keyfiles are read and stored\&. This defaults to "/etc/NetworkManager/conf\&.d"\&.
 .RE
 .PP
 \fIunmanaged\-devices\fR
diff --git a/man/nm-online.1 b/man/nm-online.1
index 601433e9..77269f2f 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.2\&.2" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index fddbc118..720861a7 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.2\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 23ed0018..05eee22c 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.0</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings-ifcfg-rh"><refentryinfo><title>nm-settings-ifcfg-rh</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index 80b89d0d..15cf4d47 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
+.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.2\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 0af413a3..accde2c3 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.0</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings-keyfile"><refentryinfo><title>nm-settings-keyfile</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index 746a428c..050e373a 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.2\&.0" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.2\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1808,7 +1808,7 @@ int32
 T}:T{
 1
 T}:T{
-Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration\&. The permitted values are: "eui64", "stable\-privacy" or unset\&. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address\&. This makes the host part of the address to stay constant, making it possible to track host\*(Aqs presence when it changes networks\&. The address changes when the interface hardware is replaced\&. The value of "stable\-privacy" enables use of cryptographically secure hash of a secret host\-specific key along with the connection identification and the network address as specified by RFC7217\&. This makes it impossible to use the address track host\*(Aqs presence, and makes the address stable when the network interface hardware is replaced\&. Leaving this unset causes a default that could be subject to change in future versions to be used\&. Note that this setting is distinct from the Privacy Extensions as configured by "ip6\-privacy" property and it does not affect the temporary addresses configured with this option\&.
+Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration\&. The permitted values are: "eui64", or "stable\-privacy"\&. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address\&. This makes the host part of the address to stay constant, making it possible to track host\*(Aqs presence when it changes networks\&. The address changes when the interface hardware is replaced\&. The value of "stable\-privacy" enables use of cryptographically secure hash of a secret host\-specific key along with the connection identification and the network address as specified by RFC7217\&. This makes it impossible to use the address track host\*(Aqs presence, and makes the address stable when the network interface hardware is replaced\&. On D\-Bus, the absence of an addr\-gen\-mode setting equals enabling "stable\-privacy"\&. For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn\*(Aqt change on upgrade from older versions\&. Note that this setting is distinct from the Privacy Extensions as configured by "ip6\-privacy" property and it does not affect the temporary addresses configured with this option\&.
 T}
 T{
 address\-data
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index d97c36fc..27de363b 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id="nm-settings"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.0</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
+<refentry id="nm-settings"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.2.2</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para>
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -203,7 +203,7 @@
     <row><entry align="left">routes</entry><entry align="left">array of array of uint32</entry><entry align="left">[]</entry><entry>Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'.  Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)</entry></row>
   </tbody></tgroup></table>
   <table><title>ipv6 setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody>
-    <row><entry align="left">addr-gen-mode</entry><entry align="left">int32</entry><entry align="left">1</entry><entry>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</entry></row>
+    <row><entry align="left">addr-gen-mode</entry><entry align="left">int32</entry><entry align="left">1</entry><entry>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", or "stable-privacy". If the property is set to "eui64", the addresses will be generated using the interface tokens derived from  hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. On D-Bus, the absence of an addr-gen-mode setting equals enabling "stable-privacy". For keyfile plugin, the absence of the setting on disk means "eui64" so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</entry></row>
     <row><entry align="left">address-data</entry><entry align="left">array of vardict</entry><entry align="left"/><entry>Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.</entry></row>
     <row><entry align="left">addresses</entry><entry align="left">array of legacy IPv6 address struct (a(ayuay))</entry><entry align="left">[]</entry><entry>Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'.  Array of IPv6 address structures.  Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.</entry></row>
     <row><entry align="left">dad-timeout</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a timeout in milliseconds.</entry></row>
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index ae3c8c0b..456b201b 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.2\&.0" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.2\&.2" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index ffeb3e9a..0ffe898e 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.2\&.2" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -173,17 +173,6 @@ If omitted, default is
 yes\&.
 .RE
 .PP
-\fB\-n\fR | \fB\-\-nocheck\fR
-.RS 4
-This option can be used to force
-\fBnmcli\fR
-to skip checking
-\fBnmcli\fR
-and
-\fBNetworkManager\fR
-version compatibility\&. Use it with care, because using incompatible versions may produce incorrect results\&.
-.RE
-.PP
 \fB\-a\fR | \fB\-\-ask\fR
 .RS 4
 When using this option
@@ -1699,14 +1688,6 @@ Connection deletion failed\&.
 NetworkManager is not running\&.
 .RE
 .PP
-\fB9\fR
-.RS 4
-\fBnmcli\fR
-and
-\fBNetworkManager\fR
-versions mismatch\&.
-.RE
-.PP
 \fB10\fR
 .RS 4
 Connection, device, or access point does not exist\&.
diff --git a/man/nmcli.xml b/man/nmcli.xml
index 62e10254..ee5a4495 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -232,20 +232,6 @@
 
       <varlistentry>
         <term><group choice='plain'>
-          <arg choice='plain'><option>-n</option></arg>
-          <arg choice='plain'><option>--nocheck</option></arg>
-        </group></term>
-
-        <listitem>
-          <para>This option can be used to force <command>nmcli</command> to skip
-          checking <command>nmcli</command> and <command>NetworkManager</command>
-          version compatibility. Use it with care, because using incompatible versions
-          may produce incorrect results.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><group choice='plain'>
           <arg choice='plain'><option>-a</option></arg>
           <arg choice='plain'><option>--ask</option></arg>
         </group></term>
@@ -2807,14 +2793,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term><errorcode>9</errorcode></term>
-        <listitem>
-          <para><command>nmcli</command> and <command>NetworkManager</command>
-          versions mismatch.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><errorcode>10</errorcode></term>
         <listitem>
           <para>Connection, device, or access point does not exist.</para>
diff --git a/man/nmtui.1 b/man/nmtui.1
index 2b825dfe..b56113e1 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/20/2016
+.\"      Date: 05/11/2016
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.2.0
+.\"    Source: NetworkManager 1.2.2
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.2\&.2" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/po/ar.po b/po/ar.po
index 751a7164..37cb6ab5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4783,8 +4783,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5759,20 +5757,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/as.po b/po/as.po
index d18ae8f8..001a375b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -5406,8 +5406,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5434,8 +5432,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6519,24 +6515,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "বিকলà§à¦ª '--terse' à§° বিশেষ '--fields' বিকলà§à¦ª মানসমূহ ধাৰà§à¦¯à§à¦¯ কৰাৰ পà§à§°à§Ÿà§‹à¦œà¦¨, '%s' নহয়"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"সতৰà§à¦•বাৰà§à¦¤à¦¾: nmcli (%s) আৰৠNetworkManager (%s) সংসà§à¦•ৰণসমূহ মিল নাখায়। সতৰà§à¦•বাৰà§à¦¤à¦¾ "
-"দবাবলে --nocheck বà§à¦¯à§±à¦¹à¦¾à§° কৰক।\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"তà§à§°à§à¦Ÿà¦¿: nmcli (%s) আৰৠNetworkManager (%s) সংসà§à¦•ৰণসমূহ মিল নাখায়। --nocheck "
-"বà§à¦¯à§±à¦¹à¦¾à§° কৰি à¦à¦•à§à¦¸à¦¿à¦•িউচন বলৱৎ কৰক, কিনà§à¦¤à§ ফলাফলসমূহৰ আগজাননী দিব নোৱাৰি।"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/be@latin.po b/po/be@latin.po
index f5b91c40..9153b650 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -4757,8 +4757,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5732,20 +5730,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 689c1cf8..31b27d74 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4875,8 +4875,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5876,20 +5874,6 @@ msgstr "ОпциÑта „--terse“ изиÑква указването на â€
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "ОпциÑта „--terse“ изиÑква конкретни ÑтойноÑти за „--fields“, а не „%s“"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index f0b10ef4..8f318e06 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -5408,8 +5408,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5436,8 +5434,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6518,24 +6514,6 @@ msgstr ""
 "'--terse' বিকলà§à¦ªà§‡à¦° কà§à¦·à§‡à¦¤à§à¦°à§‡ '--fields' বিকলà§à¦ªà§‡à¦° সà§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ মান উলà§à¦²à§‡à¦– করা আবশà§à¦¯à¦•, "
 "'%s' বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যাবে না"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"সতরà§à¦•বারà§à¦¤à¦¾: nmcli (%s) ও NetworkManager-র (%s) সংসà§à¦•রণে গরমিল। সতরà§à¦•বারà§à¦¤à¦¾ আড়াল "
-"করার জনà§à¦¯ --nocheck বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨à¥¤\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"তà§à¦°à§à¦Ÿà¦¿: nmcli (%s) ও NetworkManager-র (%s) সংসà§à¦•রণে গরমিল। বাধà§à¦¯à¦¤à¦¾à¦®à§‚লক ভাবে "
-"সঞà§à¦šà¦¾à¦²à¦¨ করার জনà§à¦¯ --nocheck বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨, কিনà§à¦¤à§ অপà§à¦°à¦¤à§à¦¯à¦¾à¦¶à¦¿à¦¤ ফলাফল সৃষà§à¦Ÿà¦¿ হতে পারে।"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index fc50dde3..5edba306 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4770,8 +4770,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5745,20 +5743,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 3f3ed6c0..22449da5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5563,8 +5563,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5594,8 +5592,6 @@ msgstr ""
 "sortida\n"
 "  -e[scape] yes|no                          separadors de columnes "
 "d'escapament als valors\n"
-"  -n[ocheck]                                 no comprovis les versions de "
-"nmcli i de NetworkManager\n"
 "  -a[sk]                                     demana els paràmetres que "
 "faltin\n"
 "  -s[how-secrets]                            permet que es mostrin les "
@@ -6730,24 +6726,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "L'opció «--terse» requereix valors específics de l'opció «--fields» i no «%s»"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Advertiment: les versions del nmcli (%s) i del NetworkManager (%s) no "
-"concorden. Useu --nocheck per suprimir l'advertiment.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Error: les versions del nmcli (%s) i del NetworkManager (%s) no concorden. "
-"Forceu l'execució usant --nocheck, però els resultats no són predicibles."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Ja està en marxa una sessió d'autenticació."
diff --git a/po/cs.po b/po/cs.po
index 2f88c91f..0d2a9e13 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4848,8 +4848,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4875,8 +4873,6 @@ msgstr ""
 "  -m[ode] tabular|multiline                  režim výstupu\n"
 "  -f[ields] <field1,field2,...>|all|common   specifikace polí výstupu\n"
 "  -e[scape] yes|no                           oddÄ›lovaÄe sloupců v hodnotách\n"
-"  -n[ocheck]                                 nekontrolovat verze programů "
-"nmcli a NetworkManager\n"
 "  -v[ersion]                                 zobrazit verzi programu\n"
 "  -h[elp]                                    zobrazit tuto nápovědu\n"
 "\n"
@@ -5847,24 +5843,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "PÅ™epínaÄ â€ž--terse“ vyžaduje urÄité hodnoty pÅ™epínaÄe „--fields“, ne „%s“"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Varování: verze programů nmcli (%s) a NetworkManager (%s) si neodpovídají. "
-"Pro potlaÄení varování použijte --nocheck.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Varování: verze programů nmcli (%s) a NetworkManager (%s) si neodpovídají. "
-"Pro spuštění použijte --nocheck, ale může dojít k nepředvídatelnému chování."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 5cb386e6..8c186461 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4866,8 +4866,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5864,20 +5862,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Tilvalg '--terse' kræver specifikke tilvalgsværdier for '--fields', ikke '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 73d673b3..38e84491 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5609,8 +5609,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5638,8 +5636,6 @@ msgstr ""
 "  -f[ields] <Feld1,Feld2, …>|all|common      Ausgabefelder angeben\n"
 "  -e[scape] yes|no                           Escape-Spaltenseparator in "
 "Werten\n"
-"  -n[ocheck]                                 Nicht die Versionen von nmcli "
-"und NetworkManager prüfen\n"
 "  -a[sk]                                     Nach fehlenden Parametern "
 "fragen\n"
 "  -s[how-secrets]                            Passwörter anzeigen\n"
@@ -6761,25 +6757,6 @@ msgstr "Option »--terse« benötigt die Angabe von »--fields«"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Option »--terse« benötigt bestimmte »--fields«-Werte, nicht »%s«"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Warnung: Die Versionen von nmcli (%s) und NetworkManager (%s) stimmen nicht "
-"überein. Verwenden Sie »--nocheck«, um diese Warnung zu unterdrücken.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Fehler: Die Versionen von nmcli (%s) und NetworkManager (%s) stimmen nicht "
-"überein. Eine Ausführung kann mit »--nocheck« erzwungen werden, aber die "
-"Resultate sind unvorhersehbar."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 9f38b2eb..45bf19ce 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -4779,8 +4779,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5755,20 +5753,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 647c03e8..1223feba 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5495,8 +5495,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5523,8 +5521,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   οÏισμός πεδίων εξόδου\n"
 "  -e[scape] yes|no                           διαφυγή διαχωÏιστικών στηλών σε "
 "τιμές\n"
-"  -n[ocheck]                                 να μην ελέγχονται οι εκδόσεις "
-"nmcli και NetworkManager\n"
 "  -a[sk]                                     εÏώτηση για ελλείπουσες "
 "παÏαμέτÏους\n"
 "  -w[ait] <seconds>                          οÏισμός χÏόνου λήξης αναμονής "
@@ -6627,26 +6623,6 @@ msgstr ""
 "Η επιλογή '--terse' απαιτεί να καθοÏισθοÏν συγκεκÏιμένες τιμές της επιλογής "
 "'--fields', όχι '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"ΠÏοειδοποίηση: δεν ταιÏιάζουν οι εκδόσεις του nmcli (%s) και του "
-"NetworkManager (%s) . ΧÏησιμοποιείστε --nocheck για να εξαφανίσετε την "
-"Ï€Ïοειδοποίηση.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Σφάλμα: δεν ταιÏιάζουν οι εκδόσεις του nmcli (%s) και του NetworkManager "
-"(%s) . Κάντε εξαναγκασμένη εκτέλεση χÏησιμοποιώντας --nocheck, αλλά τα "
-"αποτελέσματα είναι απÏόβλεπτα."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/en_CA.po b/po/en_CA.po
index 4080fc13..1be22278 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -4805,8 +4805,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5781,20 +5779,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index c86bb58f..9982b4eb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4852,8 +4852,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4880,8 +4878,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -v[ersion]                                 show program version\n"
 "  -h[elp]                                    print this help\n"
 "\n"
@@ -5852,24 +5848,6 @@ msgstr "Option '--terse' requires specifying '--fields'"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Option '--terse' requires specific '--fields' option values , not '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index d50fcbb9..584640f2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4828,8 +4828,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5827,20 +5825,6 @@ msgstr ""
 "Opcio '--terse' postulas specifajn elektindajn valorojn de '--fields', ne "
 "'%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/es.po b/po/es.po
index cc67a75a..b804504a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5465,8 +5465,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5493,8 +5491,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6565,25 +6561,6 @@ msgstr "Opción «--terse» requiere especificar «--fields»"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opción «--terse» requiere valores de «--fields» específicos, no «%s»"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Advertencia: las versiones de nmcli (%s) y de NetworkManager (%s) no "
-"coinciden. Use «--nocheck» para evitar el aviso.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Error: las versiones de nmcli (%s) y de NetworkManager (%s) no coinciden. "
-"Fuerce la ejecución usando «--nocheck», pero los resultados son "
-"impredecibles."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/et.po b/po/et.po
index 556bd7d2..a24995a3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4764,8 +4764,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5739,20 +5737,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 8ca589ec..d36a90f6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4846,8 +4846,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5827,20 +5825,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 40ee94c2..4cf36286 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4825,8 +4825,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5802,20 +5800,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4041c462..b07e873c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5502,8 +5502,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5530,8 +5528,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6618,25 +6614,6 @@ msgstr ""
 "L'option « --terse » requiert des valeurs d'options « --fields » "
 "spécifiques, pas « %s »"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Avertissement : les versions de nmcli (%s) et de NetworkManager (%s) ne "
-"correspondent pas. Utilisez --nocheck pour supprimer cet avertissement.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Erreur : les versions de nmcli (%s) et de NetworkManager (%s) ne "
-"correspondent pas. L'exécution peut être forcée avec --nocheck, mais les "
-"résultats sont imprévisibles."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/gd.po b/po/gd.po
index 1af7ba30..96b0137d 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -4935,8 +4935,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5918,20 +5916,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index b999f4c8..1e4bed65 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4863,8 +4863,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4892,8 +4890,6 @@ msgstr ""
 "mostrar\n"
 "  -e[scape] yes|no                           escapar os separadores de "
 "columnas nos valores\n"
-"  -n[ocheck]                                 non comprobar versións de nmcli "
-"e NetworkManager\n"
 "  -v[ersion]                                 mostrar a versión do programa\n"
 "  -h[elp]                                    mostrar esta axuda\n"
 "\n"
@@ -5862,24 +5858,6 @@ msgstr ""
 "A opción «--terse» require que especifique os valores da opción «--fields», "
 "non «%s»"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Advertencia: as versións de nmcli (%s) e de NetworkManager (%s) non "
-"coinciden. Use «--nocheck» para evitar o aviso.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Erro: as versións de nmcli (%s) e de NetworkManager (%s) non coinciden. "
-"Force a execución usando «--nocheck», pero os resultados son impredecíbeis."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 909d9104..10ea91c9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -5360,8 +5360,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5387,8 +5385,6 @@ msgstr ""
 "  -m[ode] tabular|multiline                  આઉટપà«àªŸ સà«àª¥àª¿àª¤àª¿\n"
 "  -f[ields] <field1,field2,...>|all|common   આઉટપà«àªŸàª®àª¾àª‚ કà«àª·à«‡àª¤à«àª°à«‹àª¨à«‡ સà«àªªàª·à«àªŸ કરો\n"
 "  -e[scape] yes|no                           કિંમતોમાં સà«àª¤àª‚ભ વિભાજકને છોડો\n"
-"  -n[ocheck]                                 nmcli અને NetworkManager આવૃતà«àª¤àª¿àª¨à«‡ "
-"ચકાસો નહિં\n"
 "  -a[sk]                                     ગેરહાજર પરિમાણો વિશે પૂછો\n"
 "  -w[ait] <seconds>                         કà«àª°àª¿àª¯àª¾àª“ સમાપà«àª¤ કરવાની રાહ જોવા સમય "
 "સમાપà«àª¤àª¿àª¨à«‡ સà«àª¯à«‹àªœàª¿àª• કરો \n"
@@ -6450,24 +6446,6 @@ msgstr "વિકલà«àªª '--terse' ને '--fields' ની જરૂર છà«
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "વિકલà«àªª '--terse' ને ચોકà«àª•સ '--fields' વિકલà«àªª કિંમતોની જરૂર છે, '%s' ની નહિં"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"ચેતવણી: nmcli (%s) અને NetworkManager (%s) આવૃતà«àª¤àª¿àª“ બંધબેસતી નથી. ચેતવણીઓ પર પà«àª°àª¤àª¿àª¬àª‚ધ "
-"મૂકવા માટે --nocheck વાપરો.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"ભૂલ: nmcli (%s) અને NetworkManager (%s) આવૃતà«àª¤àª¿àª“ બંધબેસતી નથી. --nocheck મદદથી "
-"ચલાવવા પર દબાણ કરો, પરંતૠપરિણામો ધારી શકાય તેમ નથી."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 791070c5..35938328 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4756,8 +4756,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5731,20 +5729,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 6b28ba8c..72e2ec97 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -5402,8 +5402,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5430,8 +5428,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6506,24 +6502,6 @@ msgstr "विकलà¥à¤ª '--terse' के लिठ'--fields' निरà¥à¤¦
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "विकलà¥à¤ª '--terse' के लिठ'--fields' विकलà¥à¤ª मान की जरूरत है, न कि '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"चेतावनी: nmcli(%s) और नेटवरà¥à¤•पà¥à¤°à¤¬à¤‚धक संसà¥à¤•रण (%s) से मेल नहीं खाती है. पà¥à¤°à¤¯à¥‹à¤— करें -चेतावनी "
-"को दबाने  के लिठnocheck करें.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"तà¥à¤°à¥à¤Ÿà¤¿: nmcli(%s) और नेटवरà¥à¤•पà¥à¤°à¤¬à¤‚धक संसà¥à¤•रण (%s) से मेल नहीं खाती है.बल कà¥à¤°à¤¿à¤¯à¤¾à¤¨à¥à¤µà¤¯à¤¨ का "
-"उपयोग करें - nocheck, लेकिन परिणाम अपà¥à¤°à¤¤à¥à¤¯à¤¾à¤¶à¤¿à¤¤ हैं."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 3b5fc06c..1bbe238c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4857,8 +4857,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4886,8 +4884,6 @@ msgstr ""
 "ispisati\n"
 "  -e[scape] yes|no                           izbacuje razdjelnike stupaca u "
 "vrijednostima\n"
-"  -n[ocheck]                                 bez provjere verzija nmcli i "
-"NetworkManagera\n"
 "  -v[ersion]                                 prikazuje verziju programa\n"
 "  -h[elp]                                    ispisuje ovu pomoć\n"
 "\n"
@@ -5858,26 +5854,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Opcija '--terse' zahtijeva oznaÄene vrijednosti opcije '--fields', a ne '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Upozorenje: verzije nmcli (%s) i NetworkManager (%s) se ne podudaraju. "
-"Korištenje --nocheck zanemaruje ovo upozorenje.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Greška: verzije nmcli (%s) i NetworkManager (%s) se ne podudaraju. "
-"KoriÅ¡tenje --nocheck prisiljava izvrÅ¡avanje, uz moguće neoÄekivane "
-"rezultate.\n"
-"."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index d185f112..2e12fbfe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4887,8 +4887,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4916,8 +4914,6 @@ msgstr ""
 "  -e[scape] yes|no                           oszlopelválasztók escape-lése "
 "az\n"
 "                                               értékekben\n"
-"  -n[ocheck]                                 ne ellenőrizze az nmcli és a\n"
-"                                               Hálózatkezelő verzióit\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -v[ersion]                                 programverzió kiírása\n"
 "  -h[elp]                                    ezen súgó kiírása\n"
@@ -5892,25 +5888,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "A „--terse†adott „--fields†kapcsolóértékeket követel meg, nem ezt: „%sâ€."
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Figyelmeztetés: az nmcli (%s) és a Hálózatkezelő (%s) verziói nem egyeznek. "
-"A figyelmeztetés kikapcsolásához használja a --nocheck kapcsolót.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Figyelmeztetés: az nmcli (%s) és a Hálózatkezelő (%s) verziói nem egyeznek. "
-"A végrehajtás kikényszerítve a --nocheck kapcsolóval, de az eredmények "
-"kiszámíthatatlanok."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 5b554b99..d1e3edf2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4843,8 +4843,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4870,8 +4868,6 @@ msgstr ""
 "  -m[ode] tabular|multiline                  mode keluaran\n"
 "  -f[ields] <field1,field2,...>|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"
 "  -v[ersion]                                 tampilkan versi program\n"
 "  -h[elp]                                    cetak bantuan ini\n"
 "\n"
@@ -5841,24 +5837,6 @@ msgstr "Opsi '--terse' memerlukan penyataan '--fields'"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opsi '--terse' memerlukan nilai opsi '--fields' spesifik, bukan '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Peringatan: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Gunakan --"
-"nocheck untuk meredam peringatan.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Galat: Versi nmcli (%s) dan NetworkManager (%s) tak cocok. Paksakan eksekusi "
-"memakai --nocheck, tapi hasilnya tak dapat ditebak."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/it.po b/po/it.po
index c5e7744a..f91fbf26 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5464,8 +5464,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5492,9 +5490,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   Specifica i campi da mostrare\n"
 "  -e[scape] yes|no                           Esegue l'escape dei separatori\n"
 "                                             delle colonne nei valori\n"
-"  -n[ocheck]                                 Non verifica le versioni di "
-"nmcli e\n"
-"                                             NetworkManager\n"
 "  -a[sk]                                     Chiede i parametri mancanti\n"
 "  -w[ait] <secondi>                          Imposta il timeout di attesa "
 "per il\n"
@@ -6610,25 +6605,6 @@ msgstr ""
 "L'opzione «--terse» richiede valori specifici dell'opzione «--fields», non "
 "«%s»"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Attenzione: le versioni di nmcli (%s) e NetworkManager (%s) non "
-"corrispondono. Usare --nocheck per disabilitare questo avviso.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Errore: le versioni di nmcli (%s) e NetworkManager (%s) non corrispondono. È "
-"possibile forzare l'esecuzione utilizzando --nocheck, ma i risultati non "
-"sono prevedibili."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Una sessione di autenticazione è già in corso."
diff --git a/po/ja.po b/po/ja.po
index d75db2c5..27ad0b01 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5367,8 +5367,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5395,8 +5393,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   å‡ºåŠ›ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã®æŒ‡å®š\n"
 "  -e[scape] yes|no                           値内ã®ã‚³ãƒ©ãƒ ã‚»ãƒ‘レーターをエス"
 "ケープ\n"
-"  -n[ocheck]                                 nmcli ãŠã‚ˆã³ NetworkManager ã®"
-"ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ãƒã‚§ãƒƒã‚¯ã—ãªã„\n"
 "  -a[sk]                                     足りãªã„パラメーターをå•ã„åˆã‚ã›"
 "ã‚‹\n"
 "  -w[ait] <seconds>                          動作ã®å®Œäº†ã‚’待機ã™ã‚‹ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆ"
@@ -6465,25 +6461,6 @@ msgstr ""
 "オプション'--terse' ã«ã¯ç‰¹å®šã® '--fields' オプションã®å€¤ãŒå¿…è¦ã§ã€ '%s' ã§ã¯"
 "ã‚りã¾ã›ã‚“"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"警告: nmcli (%s) 㨠NetworkManager (%s) ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒä¸€è‡´ã—ã¾ã›ã‚“。警告を回"
-"é¿ã™ã‚‹å ´åˆã¯ --nocheck を使用ã—ã¾ã™ã€‚\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"エラー: nmcli (%s) 㨠NetworkManager (%s) ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒä¸€è‡´ã—ã¾ã›ã‚“。--"
-"nocheck を使用ã™ã‚‹ã¨å¼·åˆ¶çš„ã«å®Ÿè¡Œã™ã‚‹ã“ã¨ã¯ã§ãã¾ã™ãŒã€äºˆæ¸¬ã§ããªã„çµæžœã¨ãªã‚Š"
-"ã¾ã™ã€‚"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/ka.po b/po/ka.po
index 1b906524..56f4b33f 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -4805,8 +4805,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5782,20 +5780,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 988fd09b..a8bd6ebd 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -5452,8 +5452,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -6563,26 +6561,6 @@ msgstr ""
 "'--terse' ಎಂಬ ಆಯà³à²•ೆಗೆ ನಿಶà³à²šà²¿à²¤à²µà²¾à²¦ '--fields' ಆಯà³à²•ೆಯ ಮೌಲà³à²¯à²¦ ಅಗತà³à²¯à²µà²¿à²°à³à²¤à³à²¤à²¦à³†à²¯à³† ಹೊರತà³, "
 "'%s' ಎಂಬà³à²¦à²²à³à²²"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"ಎಚà³à²šà²°à²¿à²•ೆ: nmcli (%s) ಮತà³à²¤à³ NetworkManager (%s) ಆವೃತà³à²¤à²¿à²—ಳೠತಾಳೆಯಾಗà³à²¤à³à²¤à²¿à²²à³à²². "
-"ಎಚà³à²šà²°à²¿à²•ೆಯನà³à²¨à³ ಮರೆಮಾಚಲೠ--nocheck ಬಳಸà³.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"ಎಚà³à²šà²°à²¿à²•ೆ: nmcli (%s) ಮತà³à²¤à³ NetworkManager (%s) ಆವೃತà³à²¤à²¿à²—ಳೠತಾಳೆಯಾಗà³à²¤à³à²¤à²¿à²²à³à²². --"
-"nocheck ಅನà³à²¨à³ ಬಳಸಿಕೊಂಡೠಕಾರà³à²¯à²—ತಗೊಳಿಸಲೠಒತà³à²¤à²¾à²¯à²ªà²¡à²¿à²¸à³, ಆದರೆ ಫಲಿತಾಂಶಗಳೠ"
-"ಅನಿರೀಕà³à²·à²¿à²¤à²µà²¾à²—ಿರà³à²¤à³à²¤à²µà³†.\n"
-"."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 6a7e5593..29a9961c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5362,8 +5362,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5390,8 +5388,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   출력할 필드 지정\n"
 "  -e[scape] yes|no                           ê°’ìœ¼ë¡œëœ ì¹¼ëŸ¼ 분리기ì—서 나가"
 "기 \n"
-"  -n[ocheck]                                 nmcli and NetworkManager ë²„ì „ì„ "
-"확ì¸í•˜ì§€ 않ìŒ\n"
 "  -a[sk]                                     누ë½ëœ 매개 변수 요청 \n"
 "  -w[ait] <seconds>                          ë™ìž‘ ì™„ë£Œì˜ ëŒ€ê¸° ì‹œê°„ì„ ì„¤ì •\n"
 "  -v[ersion]                                 프로그램 버전 표시\n"
@@ -6456,24 +6452,6 @@ msgstr "옵션 '--terse'는 '--fields' ì„¤ì •ì„ ìš”êµ¬í•©ë‹ˆë‹¤"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "옵션 '--terse'는 '%s'ì´(ê°€) 아닌 구체ì ì¸ '--fields' ê°’ì„ ìš”êµ¬í•©ë‹ˆë‹¤"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"경고: nmcli (%s) ë° ë„¤íŠ¸ì›Œí¬ ê´€ë¦¬ (%s) ë²„ì „ì´ ë§žì§€ 않습니다. ì´ ê²½ê³ ë¥¼ 무시하"
-"려면 --nocheck ì˜µì…˜ì„ ì‚¬ìš©í•˜ì‹­ì‹œì˜¤.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"경고: nmcli (%s) ë° ë„¤íŠ¸ì›Œí¬ ê´€ë¦¬ (%s) ë²„ì „ì´ ë§žì§€ 않습니다. --nocheck 옵션"
-"ì„ ì‚¬ìš©í–ˆìœ¼ë¯€ë¡œ 계ì†í•˜ì§€ë§Œ, 예ìƒì¹˜ 못한 결과가 나타날 수 있습니다."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index a289d2ec..8e86de67 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -4788,8 +4788,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5763,20 +5761,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index d25f162f..fe939a53 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5071,8 +5071,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5099,8 +5097,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   nurodyti išvedamus laukus\n"
 "  -e[scape] yes|no                           keisti stulpelių skirtukus "
 "vertÄ—se\n"
-"  -n[ocheck]                                 netikrinti nmcli ir "
-"NetworkManager versijų\n"
 "  -a[sk]                                     prašyti trūkstamų parametrų\n"
 "  -w[ait] <seconds>                          nustatyti laiko ribą veiksmų "
 "užbaigimui\n"
@@ -6162,24 +6158,6 @@ msgstr ""
 "Parinktis „--terse“ reikalauja konkreÄių parinkties „--fields“ reikÅ¡mių, ne "
 "„%s“"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Įspėjimas: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Naudokite "
-"--nocheck įspėjimui nerodyti.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Klaida: nmcli (%s) ir NetworkManager (%s) versijos neatitinka. Priverskite "
-"vykdymÄ… naudodami --nocheck, bet rezultatai yra nenuspÄ—jami."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 7a097697..28adfaa1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -4809,8 +4809,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5786,20 +5784,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index d74f8805..a3f20999 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -4764,8 +4764,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5739,20 +5737,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 15736441..18d99e5c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -5350,8 +5350,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5378,8 +5376,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6441,24 +6437,6 @@ msgstr "'--terse' à´à´šàµà´›à´¿à´•à´¤àµà´¤à´¿à´¨àµàµ '--fields' നലàµâ€
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "'--terse' à´Žà´¨àµà´¨ à´à´šàµà´›à´¿à´•à´¤àµà´¤à´¿à´¨àµàµ à´ªàµà´°à´¤àµà´¯àµ‡à´• '--fields' à´à´šàµà´›à´¿à´•à´‚ ആവശàµà´¯à´®àµà´£àµà´Ÿàµàµ, '%s' à´…à´²àµà´²"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"à´®àµà´¨àµà´¨à´±à´¿à´¯à´¿à´ªàµà´ªàµàµ: nmcli (%s), NetworkManager (%s) പതിപàµà´ªàµà´•à´³àµâ€ തമàµà´®à´¿à´²àµâ€ ചേരàµà´¨àµà´¨à´¿à´²àµà´². à´®àµà´¨àµà´¨à´±à´¿à´¯à´¿à´ªàµà´ªàµàµ "
-"ഇലàµà´²à´¾à´¤à´¾à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨à´¾à´¯à´¿ --nocheck ഉപയോഗിയàµà´•àµà´•àµà´•.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"പിശകàµ: nmcli (%s), NetworkManager (%s) പതിപàµà´ªàµà´•à´³àµâ€ തമàµà´®à´¿à´²àµâ€ ചേരàµà´¨àµà´¨à´¿à´²àµà´². നിരàµâ€à´¬à´¨àµà´§à´®à´¾à´¯à´¿ "
-"à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´¯àµà´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµàµ --nocheck ഉപയോഗിയàµà´•àµà´•àµà´•."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index ee74ce71..03b76b51 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -5401,8 +5401,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5429,8 +5427,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6508,24 +6504,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "परà¥à¤¯à¤¾à¤¯ '--terse' यांस '--fields' परà¥à¤¯à¤¾à¤¯ मूलà¥à¤¯à¥‡ निरà¥à¤¦à¥‡à¤¶à¥€à¤¤ करणे आवशà¥à¤¯à¤• आहे , '%s' नाही"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"सावधानता: nmcli (%s) व NetworkManager (%s) आवृतà¥à¤¤à¥€ जà¥à¤³à¤¤ नाही. सावधानता "
-"दडपणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ --nocheck याचा वापर करा.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"तà¥à¤°à¥à¤Ÿà¥€: nmcli (%s) व NetworkManager (%s) आवृतà¥à¤¤à¥€ जà¥à¤³à¤¤ नाही. जबरनरितà¥à¤¯à¤¾ चालवणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ "
-"--nocheck याचा वापर करा, परंतॠपरिणाम वरà¥à¤¤à¤µà¤£à¥‡à¤œà¥‹à¤—ी नाही."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 0d89a56c..cf39c70d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4759,8 +4759,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5734,20 +5732,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index dcabab11..bf9a2601 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -4780,8 +4780,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5756,20 +5754,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 2e4f9908..809f71a6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4767,8 +4767,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5742,20 +5740,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/oc.po b/po/oc.po
index df0bbdc2..0a3d29ee 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -4771,8 +4771,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5747,20 +5745,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/or.po b/po/or.po
index 6bd80c39..dcedfaa0 100644
--- a/po/or.po
+++ b/po/or.po
@@ -5355,8 +5355,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5383,8 +5381,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6446,24 +6442,6 @@ msgstr "ବିକଳà­à¬ª '--terse' '--fields' କୠଉଲà­à¬²à­‡à¬– କର
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "ବିକଳà­à¬ª '--terse' ନିରà­à¬¦à­à¬¦à¬¿à¬·à­à¬Ÿ '--fields' ବିକଳà­à¬ª ମୂଲà­à­Ÿà¬—à­à¬¡à¬¼à¬¿à¬•ୠଆବଶà­à­Ÿà¬• କରିଥାଠ, '%s' କୠନà­à¬¹à¬"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"ଚେତାବନୀ: nmcli (%s) à¬à¬¬à¬‚ NetworkManager (%s) ସଂସà­à¬•ରଣ ମେଳ ଖାଇନଥାà¬à¥¤ ଚେତାବନୀକୠ"
-"à¬à¬¡à¬¼à¬¾à¬‡à¬¬à¬¾ ପାଇଠ--nocheck କୠବà­à­Ÿà¬¬à¬¹à¬¾à¬° କରନà­à¬¤à­à¥¤\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"ତà­à¬°à­à¬Ÿà¬¿: nmcli (%s) à¬à¬¬à¬‚ NetworkManager (%s) ସଂସà­à¬•ରଣ ମେଳ ଖାଇନଥାà¬à¥¤ --nocheck ବà­à­Ÿà¬¬à¬¹à¬¾à¬° "
-"କରି ନିଷà­à¬ªà¬¾à¬¦à¬¨ କà­à¬°à¬¿à­Ÿà¬¾à¬•ୠଚଲାନà­à¬¤à­, କିନà­à¬¤à­ ଫଳାଫଳ ଜଣା ନାହିà¬à¥¤"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 5b650122..c6b2f621 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -5392,8 +5392,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5420,8 +5418,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6482,24 +6478,6 @@ msgstr "Option '--terse' requires specifying '--fields'"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Option '--terse' requires specific '--fields' option values , not '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"ਸਾਵਧਾਨ: nmcli (%s) ਅਤੇ ਨੈੱਟਵਰਕਮੈਨੇਜਰ (NetworkManager) (%s) ਸੰਸਕਰਣ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ। "
-"ਚੇਤਾਵਨੀਆਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਲਈ --nocheck ਵਰਤੋਂ\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"ਗਲਤੀ: nmcli (%s) ਅਤੇ ਨੈੱਟਵਰਕਮੈਨੇਜਰ (NetworkManager) (%s) ਸੰਸਕਰਣ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ। --"
-"nocheck ਦੀ ਵਰਤੋਂ ਨਾਲ ਚੱਲਣ ਲਈ ਮਨਜ਼ੂਰ ਕਰੋ, ਪਰ ਨਤੀਜੇ ਅਣਕਿਆਸੇ ਹੋ ਸਕਦੇ ਹਨ।"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 32c35837..73bf059e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-12 15:49+0200\n"
-"PO-Revision-Date: 2016-04-12 15:50+0200\n"
+"POT-Creation-Date: 2016-05-07 14:44+0200\n"
+"PO-Revision-Date: 2016-05-07 14:45+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -111,14 +111,14 @@ msgstr "Błąd: zainicjowanie agenta polkit się nie powiodło: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "Pomyślnie zarejestrowano program nmcli jako agenta polkit.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
-#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11054
+#: ../clients/cli/devices.c:3644 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:481
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Błąd: usługa NetworkManager nie jest uruchomiona."
 
-#: ../clients/cli/agent.c:242
+#: ../clients/cli/agent.c:239
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Błąd: polecenie „agent†„%s†jest nieprawidłowe."
@@ -238,7 +238,7 @@ msgstr "łączenie (uruchamianie drugorzędnych połączeń)"
 msgid "connected"
 msgstr "połączono"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:645
 msgid "deactivating"
 msgstr "dezaktywowanie"
 
@@ -247,25 +247,25 @@ msgid "connection failed"
 msgstr "połączenie się nie powiodło"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
-#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/connections.c:650 ../clients/cli/connections.c:673
+#: ../clients/cli/connections.c:1946 ../clients/cli/devices.c:1024
 #: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
 #: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/general.c:429 ../clients/cli/general.c:445
 #: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
 #: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../clients/cli/settings.c:3198
 #, c-format
 msgid "unknown"
 msgstr "nieznane"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:930
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934
+#: ../clients/cli/connections.c:968 ../clients/cli/connections.c:1037
+#: ../clients/cli/connections.c:1038 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:3454 ../clients/cli/connections.c:8567
+#: ../clients/cli/connections.c:8568 ../clients/cli/devices.c:772
 #: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
 #: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
 #: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
@@ -274,15 +274,15 @@ msgstr "nieznane"
 #: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
 #: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
 #: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../clients/cli/general.c:439 ../clients/cli/settings.c:3193
 msgid "yes"
 msgstr "tak"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:930
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934
+#: ../clients/cli/connections.c:1037 ../clients/cli/connections.c:1038
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:3455
+#: ../clients/cli/connections.c:8567 ../clients/cli/connections.c:8568
 #: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
 #: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
 #: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
@@ -291,8 +291,8 @@ msgstr "tak"
 #: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
 #: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
 #: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
-#: ../clients/cli/settings.c:3202
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:441
+#: ../clients/cli/settings.c:3195
 msgid "no"
 msgstr "nie"
 
@@ -309,7 +309,7 @@ msgid "No reason given"
 msgstr "Nie podano przyczyny"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2980
 #, c-format
 msgid "Unknown error"
 msgstr "Nieznany błąd"
@@ -780,7 +780,7 @@ msgstr "KONKRETNY-OBIEKT"
 #. 4
 #. Ask for optional 'vpn' arguments.
 #: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/cli/connections.c:4173 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -851,7 +851,7 @@ msgstr "IP6"
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:272
+#: ../clients/cli/connections.c:269
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -927,7 +927,7 @@ msgstr ""
 "  export [id | uuid | path] <identyfikator> [<plik wyjściowy>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:294
+#: ../clients/cli/connections.c:291
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -972,7 +972,7 @@ msgstr ""
 "więcej informacji. Podanie opcji „--active†spowoduje uwzględnienie tylko\n"
 "aktywnych profili. Opcja „--show-secrets†ujawni także powiązane hasła.\n"
 
-#: ../clients/cli/connections.c:315
+#: ../clients/cli/connections.c:312
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1017,7 +1017,7 @@ msgstr ""
 "passwd-file — plik z hasłami wymaganymi do aktywowania połączenia\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:333
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1039,7 +1039,7 @@ msgstr ""
 "identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:348
+#: ../clients/cli/connections.c:345
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1326,7 +1326,7 @@ msgstr ""
 "                  [ip4 <adres IPv4>] [gw4 <brama IPv4>]\n"
 "                  [ip6 <adres IPv6>] [gw6 <brama IPv6>]\n"
 
-#: ../clients/cli/connections.c:460
+#: ../clients/cli/connections.c:457
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1373,7 +1373,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:483
+#: ../clients/cli/connections.c:480
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1395,7 +1395,7 @@ msgstr ""
 "utworzona) oraz „id†(podana jako parametr <nowa nazwa>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:492
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1423,7 +1423,7 @@ msgstr ""
 "Dodaje nowy profil połączenia w interaktywnym edytorze.\n"
 "\n"
 
-#: ../clients/cli/connections.c:510
+#: ../clients/cli/connections.c:507
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1442,7 +1442,7 @@ msgstr ""
 "Profil jest identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:521
+#: ../clients/cli/connections.c:518
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1463,7 +1463,7 @@ msgstr ""
 "Monitoruje wszystkie profile połączeń, jeśli żaden nie zostanie podany.\n"
 "\n"
 
-#: ../clients/cli/connections.c:533
+#: ../clients/cli/connections.c:530
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1476,7 +1476,7 @@ msgstr ""
 "Wczytuje ponownie wszystkie pliki połączeń z dysku.\n"
 "\n"
 
-#: ../clients/cli/connections.c:541
+#: ../clients/cli/connections.c:538
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1498,7 +1498,7 @@ msgstr ""
 "usługa NetworkManager zna jego najnowszy stan.\n"
 "\n"
 
-#: ../clients/cli/connections.c:553
+#: ../clients/cli/connections.c:550
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1523,7 +1523,7 @@ msgstr ""
 "importowana przez wtyczki VPN usługi NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:566
+#: ../clients/cli/connections.c:563
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1543,197 +1543,197 @@ msgstr ""
 "nazwÄ™.\n"
 "\n"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:641
 msgid "activating"
 msgstr "aktywowanie"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:643
 msgid "activated"
 msgstr "aktywowano"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:647
 msgid "deactivated"
 msgstr "dezaktywowano"
 
-#: ../clients/cli/connections.c:662
+#: ../clients/cli/connections.c:659
 msgid "VPN connecting (prepare)"
 msgstr "ÅÄ…czenie z VPN (przygotowanie)"
 
-#: ../clients/cli/connections.c:664
+#: ../clients/cli/connections.c:661
 msgid "VPN connecting (need authentication)"
 msgstr "ÅÄ…czenie z VPN (wymaga uwierzytelnienia)"
 
-#: ../clients/cli/connections.c:666
+#: ../clients/cli/connections.c:663
 msgid "VPN connecting"
 msgstr "ÅÄ…czenie z VPN"
 
-#: ../clients/cli/connections.c:668
+#: ../clients/cli/connections.c:665
 msgid "VPN connecting (getting IP configuration)"
 msgstr "ÅÄ…czenie z VPN (pobieranie konfiguracji adresu IP)"
 
-#: ../clients/cli/connections.c:670
+#: ../clients/cli/connections.c:667
 msgid "VPN connected"
 msgstr "Połączono z VPN"
 
-#: ../clients/cli/connections.c:672
+#: ../clients/cli/connections.c:669
 msgid "VPN connection failed"
 msgstr "Połączenie z VPN się nie powiodło"
 
-#: ../clients/cli/connections.c:674
+#: ../clients/cli/connections.c:671
 msgid "VPN disconnected"
 msgstr "Rozłączono z VPN"
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:741
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Błąd podczas aktualizowania haseł dla %s: %s\n"
 
-#: ../clients/cli/connections.c:764
+#: ../clients/cli/connections.c:761
 msgid "Connection profile details"
 msgstr "Szczegóły profilu połączenia"
 
-#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#: ../clients/cli/connections.c:773 ../clients/cli/connections.c:1166
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Błąd: „connection showâ€: %s"
 
-#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
+#: ../clients/cli/connections.c:929 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "nigdy"
 
-#: ../clients/cli/connections.c:1157
+#: ../clients/cli/connections.c:1154
 msgid "Activate connection details"
 msgstr "Szczegóły aktywowania połączenia"
 
-#: ../clients/cli/connections.c:1393
+#: ../clients/cli/connections.c:1390
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "nieprawidÅ‚owe pole „%sâ€; dozwolone pola: %s i %s, albo %s,%s"
 
-#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#: ../clients/cli/connections.c:1405 ../clients/cli/connections.c:1413
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "„%s†musi być same"
 
 #. Add headers
-#: ../clients/cli/connections.c:1634
+#: ../clients/cli/connections.c:1631
 msgid "NetworkManager active profiles"
 msgstr "Aktywne profile usługi NetworkManager"
 
-#: ../clients/cli/connections.c:1635
+#: ../clients/cli/connections.c:1632
 msgid "NetworkManager connection profiles"
 msgstr "Profile połączeń usługi NetworkManager"
 
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
-#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
-#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
-#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
-#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
-#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
-#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
-#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
-#: ../clients/cli/devices.c:3503
+#: ../clients/cli/connections.c:1678 ../clients/cli/connections.c:2393
+#: ../clients/cli/connections.c:2415 ../clients/cli/connections.c:2424
+#: ../clients/cli/connections.c:2433 ../clients/cli/connections.c:2592
+#: ../clients/cli/connections.c:10160 ../clients/cli/connections.c:10277
+#: ../clients/cli/connections.c:10409 ../clients/cli/connections.c:10542
+#: ../clients/cli/connections.c:10652 ../clients/cli/connections.c:10663
+#: ../clients/cli/connections.c:10762 ../clients/cli/devices.c:2322
+#: ../clients/cli/devices.c:2330 ../clients/cli/devices.c:2653
+#: ../clients/cli/devices.c:2660 ../clients/cli/devices.c:2674
+#: ../clients/cli/devices.c:2681 ../clients/cli/devices.c:2698
+#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2719
+#: ../clients/cli/devices.c:3083 ../clients/cli/devices.c:3090
+#: ../clients/cli/devices.c:3097 ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3122 ../clients/cli/devices.c:3129
+#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3481
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Błąd: brak parametru %s."
 
-#: ../clients/cli/connections.c:1696
+#: ../clients/cli/connections.c:1693
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Błąd: %s — nie ma takiego profilu połączenia."
 
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../clients/cli/connections.c:1752 ../clients/cli/connections.c:2456
+#: ../clients/cli/connections.c:11163 ../clients/cli/devices.c:3270
+#: ../clients/cli/devices.c:3751 ../clients/cli/general.c:536
+#: ../clients/cli/general.c:585 ../clients/cli/general.c:602
+#: ../clients/cli/general.c:641 ../clients/cli/general.c:655
+#: ../clients/cli/general.c:773 ../clients/cli/general.c:820
+#: ../clients/cli/general.c:840
 #, c-format
 msgid "Error: %s."
 msgstr "Błąd: %s."
 
-#: ../clients/cli/connections.c:1851
+#: ../clients/cli/connections.c:1848
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "brak aktywnych połączeÅ„ na urzÄ…dzeniu „%sâ€"
 
-#: ../clients/cli/connections.c:1859
+#: ../clients/cli/connections.c:1856
 msgid "no active connection or device"
 msgstr "brak aktywnych połączeń na urządzeń"
 
-#: ../clients/cli/connections.c:1910
+#: ../clients/cli/connections.c:1907
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "urzÄ…dzenie „%s†nie jest zgodne z połączeniem „%sâ€"
 
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nie odnaleziono urzÄ…dzenia dla połączenia „%sâ€"
 
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:1922
 msgid "unknown reason"
 msgstr "nieznany powód"
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:1924 ../clients/cli/general.c:277
 msgid "none"
 msgstr "brak"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:1926
 msgid "the user was disconnected"
 msgstr "rozłączono użytkownika"
 
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:1928
 msgid "the base network connection was interrupted"
 msgstr "przerwano podstawowe połączenie sieciowe"
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:1930
 msgid "the VPN service stopped unexpectedly"
 msgstr "usługa VPN została nieoczekiwanie zatrzymana"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:1932
 msgid "the VPN service returned invalid configuration"
 msgstr "usługa VPN zwróciła nieprawidłową konfigurację"
 
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:1934
 msgid "the connection attempt timed out"
 msgstr "próba połączenia przekroczyła czas oczekiwania"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:1936
 msgid "the VPN service did not start in time"
 msgstr "usługa VPN nie została uruchomiona w czasie"
 
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:1938
 msgid "the VPN service failed to start"
 msgstr "uruchomienie usługi VPN się nie powiodło"
 
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:1940
 msgid "no valid VPN secrets"
 msgstr "brak prawidłowych haseł VPN"
 
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:1942
 msgid "invalid VPN secrets"
 msgstr "nieprawidłowe hasła VPN"
 
-#: ../clients/cli/connections.c:1947
+#: ../clients/cli/connections.c:1944
 msgid "the connection was removed"
 msgstr "usunięto połączenie"
 
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:1966 ../clients/cli/connections.c:2001
+#: ../clients/cli/connections.c:2162 ../clients/cli/connections.c:8458
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Pomyślnie aktywowano połączenie (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:1976
+#: ../clients/cli/connections.c:1974
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1742,198 +1742,199 @@ msgstr ""
 "Pomyślnie aktywowano połączenie (główne oczekujące na podrzędne) (ścieżka "
 "aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:1981 ../clients/cli/connections.c:1984
+#: ../clients/cli/connections.c:2006
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Błąd: aktywacja połączenia się nie powiodła."
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2057
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Pomyślnie aktywowano połączenie VPN (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2061
+#: ../clients/cli/connections.c:2065
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s."
 
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
+#: ../clients/cli/connections.c:2084 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Błąd: przekroczono czas oczekiwania o %d sekund."
 
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2144
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s"
 
-#: ../clients/cli/connections.c:2225
+#: ../clients/cli/connections.c:2229
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "odczytanie passwd-file „%s†się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2241
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "brak dwukropka we wpisie „password†„%sâ€"
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2249
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "brak kropki we wpisie „password†„%sâ€"
 
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2262
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "nieprawidÅ‚owa nazwa ustawienia we wpisie „password†„%sâ€"
 
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2318
 #, c-format
 msgid "unknown device '%s'."
 msgstr "nieznane urzÄ…dzenie „%sâ€."
 
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2323
 msgid "neither a valid connection nor device given"
 msgstr "nie podano prawidłowego połączenia ani urządzenia"
 
-#: ../clients/cli/connections.c:2402
+#: ../clients/cli/connections.c:2406
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Błąd: połączenie „%s†nie istnieje."
 
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
-#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
-#: ../clients/cli/devices.c:3336
+#: ../clients/cli/connections.c:2441 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2336 ../clients/cli/devices.c:2730
+#: ../clients/cli/devices.c:3314
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Nieznany parametr: %s\n"
 
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2466
 msgid "preparing"
 msgstr "przygotowywanie"
 
-#: ../clients/cli/connections.c:2483
+#: ../clients/cli/connections.c:2487
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Pomyślnie usunięto połączenie „%s†(%s).\n"
 
-#: ../clients/cli/connections.c:2499
+#: ../clients/cli/connections.c:2503
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "Pomyślnie dezaktywowano połączenie „%s†(ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2574 ../clients/cli/connections.c:10395
+#: ../clients/cli/connections.c:10594
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Błąd: nie podano połączenia."
 
-#: ../clients/cli/connections.c:2602
+#: ../clients/cli/connections.c:2606
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Błąd: „%s†nie jest aktywnym połączeniem.\n"
 
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#: ../clients/cli/connections.c:2607 ../clients/cli/connections.c:10424
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Błąd: nie odnaleziono wszystkich aktywnych połączeń."
 
-#: ../clients/cli/connections.c:2612
+#: ../clients/cli/connections.c:2616
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Błąd: nie podano aktywnego połączenia."
 
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:2959 ../clients/cli/utils.c:648
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "„%s†nie jest w [%s]"
 
-#: ../clients/cli/connections.c:3032
+#: ../clients/cli/connections.c:3036
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Błąd: „%sâ€: „%s†nie jest prawidÅ‚owym adresem MAC %s."
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/cli/connections.c:3037 ../clients/cli/connections.c:3569
 #: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
 #: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../clients/cli/connections.c:3037 ../clients/tui/nm-editor-utils.c:146
 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3053
+#: ../clients/cli/connections.c:3057
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Błąd: „mtuâ€: „%s†nie jest prawidÅ‚owym MTU."
 
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3073
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Błąd: „parentâ€: „%s†nie jest prawidÅ‚owÄ… nazwÄ… interfejsu."
 
-#: ../clients/cli/connections.c:3090
+#: ../clients/cli/connections.c:3094
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Błąd: „p-keyâ€: „%s†nie jest prawidÅ‚owym P_KEY InfiniBand."
 
-#: ../clients/cli/connections.c:3105
+#: ../clients/cli/connections.c:3109
 #, c-format
 msgid "Error: '%s' is not a valid UID/GID."
 msgstr "Błąd: „%s†nie jest prawidłowym UID/GID."
 
-#: ../clients/cli/connections.c:3149
+#: ../clients/cli/connections.c:3153
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
 msgstr "Błąd: „%sâ€: „%s†nie jest prawidÅ‚owym %s %s."
 
-#: ../clients/cli/connections.c:3162
+#: ../clients/cli/connections.c:3166
 msgid "Wi-Fi mode"
 msgstr "Tryb Wi-Fi"
 
-#: ../clients/cli/connections.c:3171
+#: ../clients/cli/connections.c:3175
 msgid "InfiniBand transport mode"
 msgstr "Tryb przesyłania InfiniBand"
 
-#: ../clients/cli/connections.c:3183
+#: ../clients/cli/connections.c:3187
 msgid "ADSL protocol"
 msgstr "Protokół ADSL"
 
-#: ../clients/cli/connections.c:3194
+#: ../clients/cli/connections.c:3198
 msgid "ADSL encapsulation"
 msgstr "Kapsułkowanie ADSL"
 
-#: ../clients/cli/connections.c:3203
+#: ../clients/cli/connections.c:3207
 msgid "TUN device mode"
 msgstr "Tryb urzÄ…dzenia TUN"
 
-#: ../clients/cli/connections.c:3216
+#: ../clients/cli/connections.c:3220
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Błąd: „flagsâ€: „%s†jest nieprawidÅ‚owe; należy użyć <0-7>."
 
-#: ../clients/cli/connections.c:3238
+#: ../clients/cli/connections.c:3242
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Błąd: „%sâ€: „%s†jest nieprawidÅ‚owe; %s "
 
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:3420
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 "Ostrzeżenie: master=„%s†nie odnosi się do żadnego istniejącego profilu.\n"
 
-#: ../clients/cli/connections.c:3441
+#: ../clients/cli/connections.c:3445
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Błąd: „%sâ€: „%s†jest nieprawidÅ‚owe; należy użyć <%u-%u>."
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
+#: ../clients/cli/connections.c:3501
 #, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
@@ -1941,7 +1942,7 @@ msgstr[0] "Istnieje %d opcjonalny parametr dla typu połączenia „%sâ€.\n"
 msgstr[1] "IstniejÄ… %d opcjonalne parametry dla typu połączenia „%sâ€.\n"
 msgstr[2] "Istnieje %d opcjonalnych parametrów dla typu połączenia „%sâ€.\n"
 
-#: ../clients/cli/connections.c:3500
+#: ../clients/cli/connections.c:3504
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1950,552 +1951,552 @@ msgstr[1] "Podać je? %s"
 msgstr[2] "Podać je? %s"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
+#: ../clients/cli/connections.c:3521
 msgid "ethernet"
 msgstr "ethernet"
 
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+#: ../clients/cli/connections.c:3526 ../clients/cli/connections.c:3574
+#: ../clients/cli/connections.c:3708 ../clients/cli/connections.c:3787
 msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
+#: ../clients/cli/connections.c:3537 ../clients/cli/connections.c:3585
+#: ../clients/cli/connections.c:3680 ../clients/cli/connections.c:3719
+#: ../clients/cli/connections.c:4105
 msgid "MAC [none]: "
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3544
+#: ../clients/cli/connections.c:3548
 msgid "Cloned MAC [none]: "
 msgstr "Sklonowany MAC [none]: "
 
-#: ../clients/cli/connections.c:3592
+#: ../clients/cli/connections.c:3596
 #, c-format
 msgid "Transport mode %s"
 msgstr "Tryb przesyłania %s"
 
-#: ../clients/cli/connections.c:3605
+#: ../clients/cli/connections.c:3609
 msgid "Parent interface [none]: "
 msgstr "Interfejs nadrzędny [none]: "
 
-#: ../clients/cli/connections.c:3616
+#: ../clients/cli/connections.c:3620
 msgid "P_KEY [none]: "
 msgstr "P_KEY [none]: "
 
-#: ../clients/cli/connections.c:3626
+#: ../clients/cli/connections.c:3630
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Błąd: „p-key†jest wymagane, kiedy podano „parentâ€.\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../clients/cli/connections.c:3647 ../clients/tui/nm-editor-utils.c:154
 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#: ../clients/cli/connections.c:3655 ../clients/cli/connections.c:6203
 #, c-format
 msgid "Mode %s"
 msgstr "Tryb %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../clients/cli/connections.c:3675 ../libnm-glib/nm-device.c:1857
 #: ../libnm/nm-device.c:1808
 msgid "WiMAX"
 msgstr "WiMAX"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
+#: ../clients/cli/connections.c:3698
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
+#: ../clients/cli/connections.c:3702 ../clients/cli/connections.c:3740
+#: ../clients/cli/connections.c:4227
 msgid "Password [none]: "
 msgstr "Hasło [none]: "
 
-#: ../clients/cli/connections.c:3700
+#: ../clients/cli/connections.c:3704
 msgid "Service [none]: "
 msgstr "Usługa [none]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
+#: ../clients/cli/connections.c:3734
 msgid "mobile broadband"
 msgstr "komórkowe"
 
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+#: ../clients/cli/connections.c:3738 ../clients/cli/connections.c:4177
 msgid "Username [none]: "
 msgstr "Nazwa użytkownika [none]: "
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
+#: ../clients/cli/connections.c:3753
 msgid "bluetooth"
 msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:3756
+#: ../clients/cli/connections.c:3760
 #, c-format
 msgid "Bluetooth type %s"
 msgstr "Typ Bluetooth %s"
 
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:3766
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Błąd: „bt-typeâ€: „%s†nie jest prawidÅ‚owym typem Bluetooth.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/cli/connections.c:3782 ../clients/cli/devices.c:239
 #: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
 #: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
 #: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/cli/connections.c:3794
+#: ../clients/cli/connections.c:3798
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Flagi VLAN= (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:3805
+#: ../clients/cli/connections.c:3809
 msgid "Ingress priority maps [none]: "
 msgstr "Wejściowe mapy priorytetów [none]: "
 
-#: ../clients/cli/connections.c:3816
+#: ../clients/cli/connections.c:3820
 msgid "Egress priority maps [none]: "
 msgstr "Wyjściowe mapy priorytetów [none]: "
 
-#: ../clients/cli/connections.c:3827
+#: ../clients/cli/connections.c:3831
 msgid "Bonding mode [balance-rr]: "
 msgstr "Tryb wiÄ…zania [balance-rr]: "
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
+#: ../clients/cli/connections.c:3847
 msgid "bond"
 msgstr "wiÄ…zanie"
 
-#: ../clients/cli/connections.c:3865
+#: ../clients/cli/connections.c:3869
 msgid "Bonding primary interface [none]: "
 msgstr "Główny interfejs wiązania [none]: "
 
-#: ../clients/cli/connections.c:3868
+#: ../clients/cli/connections.c:3872
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Błąd: „primaryâ€: „%s†nie jest prawidÅ‚owÄ… nazwÄ… interfejsu.\n"
 
-#: ../clients/cli/connections.c:3876
+#: ../clients/cli/connections.c:3880
 #, c-format
 msgid "Bonding monitoring mode %s"
 msgstr "Tryb monitorowania wiÄ…zania %s"
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3886
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Błąd: „%s†nie jest prawidłowym trybem monitorowania; należy użyć „%s†lub "
 "„%sâ€.\n"
 
-#: ../clients/cli/connections.c:3891
+#: ../clients/cli/connections.c:3895
 msgid "Bonding miimon [100]: "
 msgstr "„miimon†wiązania [100]: "
 
-#: ../clients/cli/connections.c:3894
+#: ../clients/cli/connections.c:3898
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: „miimonâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3902
+#: ../clients/cli/connections.c:3906
 msgid "Bonding downdelay [0]: "
 msgstr "„downdelay†wiązania [0]: "
 
-#: ../clients/cli/connections.c:3905
+#: ../clients/cli/connections.c:3909
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: „downdelayâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3913
+#: ../clients/cli/connections.c:3917
 msgid "Bonding updelay [0]: "
 msgstr "„updelay†wiązania [0]: "
 
-#: ../clients/cli/connections.c:3916
+#: ../clients/cli/connections.c:3920
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: „updelayâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3925
+#: ../clients/cli/connections.c:3929
 msgid "Bonding arp-interval [0]: "
 msgstr "„arp-interval†wiązania [0]: "
 
-#: ../clients/cli/connections.c:3928
+#: ../clients/cli/connections.c:3932
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: „arp-intervalâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-%u>.\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
+#: ../clients/cli/connections.c:3940
 msgid "Bonding arp-ip-target [none]: "
 msgstr "„arp-ip-target†wiązania [none]: "
 
-#: ../clients/cli/connections.c:3943
+#: ../clients/cli/connections.c:3947
 msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "PrÄ™dkość LACP („slow†lub „fastâ€) [slow]: "
 
-#: ../clients/cli/connections.c:3949
+#: ../clients/cli/connections.c:3953
 #, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
 msgstr "Błąd: „lacp_rateâ€: „%s†jest nieprawidÅ‚owe („slow†lub „fastâ€).\n"
 
-#: ../clients/cli/connections.c:3972
+#: ../clients/cli/connections.c:3976
 msgid "Team JSON configuration [none]: "
 msgstr "Konfiguracja JSON zespołu [none]: "
 
-#: ../clients/cli/connections.c:3989
+#: ../clients/cli/connections.c:3993
 msgid "team"
 msgstr "zespół"
 
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:3999
 msgid "team-slave"
 msgstr "podrzędny-zespołu"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
+#: ../clients/cli/connections.c:4011
 msgid "bridge"
 msgstr "mostek"
 
-#: ../clients/cli/connections.c:4013
+#: ../clients/cli/connections.c:4017
 #, c-format
 msgid "Enable STP %s"
 msgstr "Włączenie STP %s"
 
-#: ../clients/cli/connections.c:4018
+#: ../clients/cli/connections.c:4022
 #, c-format
 msgid "Error: 'stp': %s.\n"
 msgstr "Błąd: „stpâ€: %s.\n"
 
-#: ../clients/cli/connections.c:4026
+#: ../clients/cli/connections.c:4030
 msgid "STP priority [32768]: "
 msgstr "Priorytet STP [32768]: "
 
-#: ../clients/cli/connections.c:4030
+#: ../clients/cli/connections.c:4034
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Błąd: „priorityâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4042
 msgid "Forward delay [15]: "
 msgstr "Forward-delay [15]: "
 
-#: ../clients/cli/connections.c:4042
+#: ../clients/cli/connections.c:4046
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Błąd: „forward-delayâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <2-30>.\n"
 
-#: ../clients/cli/connections.c:4051
+#: ../clients/cli/connections.c:4055
 msgid "Hello time [2]: "
 msgstr "Hello-time [2]: "
 
-#: ../clients/cli/connections.c:4055
+#: ../clients/cli/connections.c:4059
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Błąd: „hello-timeâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <1-10>.\n"
 
-#: ../clients/cli/connections.c:4063
+#: ../clients/cli/connections.c:4067
 msgid "Max age [20]: "
 msgstr "Max-age [20]: "
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:4071
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Błąd: „max-ageâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <6-40>.\n"
 
-#: ../clients/cli/connections.c:4075
+#: ../clients/cli/connections.c:4079
 msgid "MAC address ageing time [300]: "
 msgstr "Czas starzenia adresu MAC [300]: "
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:4083
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Błąd: „ageing-timeâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4088
+#: ../clients/cli/connections.c:4092
 #, c-format
 msgid "Enable IGMP snooping %s"
 msgstr "Włączenie węszenia IGMP %s"
 
-#: ../clients/cli/connections.c:4093
+#: ../clients/cli/connections.c:4097
 #, c-format
 msgid "Error: 'multicast-snooping': %s.\n"
 msgstr "Błąd: „multicast-snoopingâ€: %s.\n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
+#: ../clients/cli/connections.c:4124
 msgid "bridge-slave"
 msgstr "podrzędny-mostku"
 
-#: ../clients/cli/connections.c:4125
+#: ../clients/cli/connections.c:4129
 msgid "Bridge port priority [32]: "
 msgstr "Priorytet portu mostku [32]: "
 
-#: ../clients/cli/connections.c:4138
+#: ../clients/cli/connections.c:4142
 msgid "Bridge port STP path cost [100]: "
 msgstr "Koszt ścieżki STP portu mostku [100]: "
 
-#: ../clients/cli/connections.c:4152
+#: ../clients/cli/connections.c:4156
 #, c-format
 msgid "Hairpin %s"
 msgstr "Hairpin %s"
 
-#: ../clients/cli/connections.c:4157
+#: ../clients/cli/connections.c:4161
 #, c-format
 msgid "Error: 'hairpin': %s.\n"
 msgstr "Błąd: „hairpinâ€: %s.\n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../clients/cli/connections.c:4188 ../libnm-glib/nm-device.c:1855
 #: ../libnm/nm-device.c:1806
 msgid "OLPC Mesh"
 msgstr "Kratowe OLPC"
 
-#: ../clients/cli/connections.c:4189
+#: ../clients/cli/connections.c:4193
 msgid "OLPC Mesh channel [1]: "
 msgstr "Kanał sieci kratowej OLPC [1]: "
 
-#: ../clients/cli/connections.c:4192
+#: ../clients/cli/connections.c:4196
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Błąd: „channelâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <1-13>.\n"
 
-#: ../clients/cli/connections.c:4200
+#: ../clients/cli/connections.c:4204
 msgid "DHCP anycast MAC address [none]: "
 msgstr "Adres MAC „anycast†DHCP [none]: "
 
 #. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../clients/cli/connections.c:4223 ../libnm-glib/nm-device.c:1871
 #: ../libnm/nm-device.c:1822
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4227
+#: ../clients/cli/connections.c:4231
 #, c-format
 msgid "ADSL encapsulation %s"
 msgstr "Kapsułkowanie ADSL %s"
 
 #. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
+#: ../clients/cli/connections.c:4249
 msgid "macvlan"
 msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4251
+#: ../clients/cli/connections.c:4255
 #, c-format
 msgid "Tap %s"
 msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4256
+#: ../clients/cli/connections.c:4260
 #, c-format
 msgid "Error: 'tap': %s.\n"
 msgstr "Błąd: „tapâ€: %s.\n"
 
 #. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../clients/cli/connections.c:4276 ../libnm-glib/nm-device.c:1875
 #: ../libnm/nm-device.c:1826
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+#: ../clients/cli/connections.c:4281 ../clients/cli/connections.c:4605
 msgid "Parent device [none]: "
 msgstr "Urządzenie nadrzędne [none]: "
 
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4610
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
 msgstr "Błąd: „devâ€: „%s†nie jest UUID ani nazwÄ… interfejsu.\n"
 
-#: ../clients/cli/connections.c:4291
+#: ../clients/cli/connections.c:4295
 msgid "Local address [none]: "
 msgstr "Lokalny adres [none]: "
 
-#: ../clients/cli/connections.c:4296
+#: ../clients/cli/connections.c:4300
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
 msgstr "Błąd: „localâ€: „%s†nie jest prawidÅ‚owym adresem IP.\n"
 
-#: ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4309
 msgid "Minimum source port [0]: "
 msgstr "Minimalny port źródłowy [0]: "
 
-#: ../clients/cli/connections.c:4309
+#: ../clients/cli/connections.c:4313
 #, c-format
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
 msgstr "Błąd: „source-port-minâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4318
+#: ../clients/cli/connections.c:4322
 msgid "Maximum source port [0]: "
 msgstr "Maksymalny port źródłowy [0]: "
 
-#: ../clients/cli/connections.c:4322
+#: ../clients/cli/connections.c:4326
 #, c-format
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
 msgstr "Błąd: „source-port-maxâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4331
+#: ../clients/cli/connections.c:4335
 msgid "Destination port [8472]: "
 msgstr "Port docelowy [8472]: "
 
-#: ../clients/cli/connections.c:4335
+#: ../clients/cli/connections.c:4339
 #, c-format
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
 msgstr "Błąd: „destination-portâ€: „%s†nie jest prawidÅ‚owÄ… liczbÄ… <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4374
+#: ../clients/cli/connections.c:4378
 msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Adres IPv4 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4376
+#: ../clients/cli/connections.c:4380
 msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "Adres IPv6 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4394
 #, c-format
 msgid "  Address successfully added: %s\n"
 msgstr "  Pomyślnie dodano adres: %s\n"
 
-#: ../clients/cli/connections.c:4392
+#: ../clients/cli/connections.c:4396
 #, c-format
 msgid "  Warning: address already present: %s\n"
 msgstr "  Ostrzeżenie: adres jest już obecny: %s\n"
 
-#: ../clients/cli/connections.c:4394
+#: ../clients/cli/connections.c:4398
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Ostrzeżenie: ignorowanie Å›mieci na koÅ„cu: „%sâ€\n"
 
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
+#: ../clients/cli/connections.c:4400 ../clients/cli/connections.c:5609
+#: ../clients/cli/connections.c:5656 ../clients/cli/connections.c:6573
+#: ../clients/cli/connections.c:6606
 msgid "Error: "
 msgstr "Błąd: "
 
-#: ../clients/cli/connections.c:4416
+#: ../clients/cli/connections.c:4420
 msgid "IPv4 gateway [none]: "
 msgstr "Brama IPv4 [none]: "
 
-#: ../clients/cli/connections.c:4419
+#: ../clients/cli/connections.c:4423
 msgid "IPv6 gateway [none]: "
 msgstr "Brama IPv6 [none]: "
 
-#: ../clients/cli/connections.c:4439
+#: ../clients/cli/connections.c:4443
 #, c-format
 msgid "Error: invalid gateway address '%s'\n"
 msgstr "Błąd: nieprawidÅ‚owy adres bramy „%sâ€\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
+#: ../clients/cli/connections.c:4456
 #, c-format
 msgid "Do you want to add IP addresses? %s"
 msgstr "Dodać adresy IP? %s"
 
-#: ../clients/cli/connections.c:4460
+#: ../clients/cli/connections.c:4464
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
 msgstr "Naciśnięcie klawisza <Enter> zakończy dodawanie adresów.\n"
 
 #. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../clients/cli/connections.c:4508 ../libnm-glib/nm-device.c:1879
 #: ../libnm/nm-device.c:1830
 msgid "Tun"
 msgstr "TUN"
 
-#: ../clients/cli/connections.c:4509
+#: ../clients/cli/connections.c:4513
 msgid "User ID [none]: "
 msgstr "Identyfikator użytkownika [none]: "
 
-#: ../clients/cli/connections.c:4522
+#: ../clients/cli/connections.c:4526
 msgid "Group ID [none]: "
 msgstr "Identyfikator grupy [none]: "
 
-#: ../clients/cli/connections.c:4536
+#: ../clients/cli/connections.c:4540
 #, c-format
 msgid "Enable PI %s"
 msgstr "Włączenie PI %s"
 
-#: ../clients/cli/connections.c:4541
+#: ../clients/cli/connections.c:4545
 #, c-format
 msgid "Error: 'pi': %s.\n"
 msgstr "Błąd: „piâ€: %s.\n"
 
-#: ../clients/cli/connections.c:4549
+#: ../clients/cli/connections.c:4553
 #, c-format
 msgid "Enable VNET header %s"
 msgstr "Włączenie nagłówka VNET %s"
 
-#: ../clients/cli/connections.c:4554
+#: ../clients/cli/connections.c:4558
 #, c-format
 msgid "Error: 'vnet-hdr': %s.\n"
 msgstr "Błąd: „vnet-hdrâ€: %s.\n"
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:4566
 #, c-format
 msgid "Enable multi queue %s"
 msgstr "Włączenie wielokrotnej kolejki %s"
 
-#: ../clients/cli/connections.c:4567
+#: ../clients/cli/connections.c:4571
 #, c-format
 msgid "Error: 'multi-queue': %s.\n"
 msgstr "Błąd: „multi-queueâ€: %s.\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
+#: ../clients/cli/connections.c:4585
 msgid "IP Tunnel"
 msgstr "Tunel IP"
 
-#: ../clients/cli/connections.c:4586
+#: ../clients/cli/connections.c:4590
 msgid "Local endpoint [none]: "
 msgstr "Lokalny punkt końcowy [none]: "
 
-#: ../clients/cli/connections.c:4592
+#: ../clients/cli/connections.c:4596
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
 msgstr "Błąd: „localâ€: „%s†nie jest prawidÅ‚owe; musi być adresem IP\n"
 
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#: ../clients/cli/connections.c:4662 ../clients/cli/connections.c:10188
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Błąd: brak parametru <ustawienie>.<właściwość>."
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:4667
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Błąd: brak wartoÅ›ci dla „%sâ€."
 
-#: ../clients/cli/connections.c:4681
+#: ../clients/cli/connections.c:4685
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Błąd: nieprawidÅ‚owe <ustawienie>.<wÅ‚aÅ›ciwość> „%sâ€."
 
-#: ../clients/cli/connections.c:4689
+#: ../clients/cli/connections.c:4693
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Błąd: nieprawidÅ‚owe lub niedozwolone ustawienie „%sâ€: %s."
 
-#: ../clients/cli/connections.c:4700
+#: ../clients/cli/connections.c:4704
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr "Błąd: nie wiadomo, jak utworzyć ustawienie „%sâ€."
 
-#: ../clients/cli/connections.c:4710
+#: ../clients/cli/connections.c:4714
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Błąd: nieprawidÅ‚owa wÅ‚aÅ›ciwość „%sâ€: %s."
 
-#: ../clients/cli/connections.c:4722
+#: ../clients/cli/connections.c:4726
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Błąd: zmodyfikowanie %s.%s się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:4741
+#: ../clients/cli/connections.c:4745
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Błąd: usunięcie wartości z %s.%s się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:4775
+#: ../clients/cli/connections.c:4779
 #, c-format
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
@@ -2503,330 +2504,330 @@ msgstr ""
 "Ostrzeżenie: „type†jest ignorowane. Należy użyć polecenia „nmcli connection "
 "add \"%s\" …†zamiast tego."
 
-#: ../clients/cli/connections.c:4783
+#: ../clients/cli/connections.c:4787
 msgid "Error: redundant 'master' option."
 msgstr "Błąd: nadmiarowa opcja „masterâ€."
 
-#: ../clients/cli/connections.c:4796
+#: ../clients/cli/connections.c:4800
 msgid "Error: 'master' is required."
 msgstr "Błąd: opcja „master†jest wymagana."
 
-#: ../clients/cli/connections.c:4950
+#: ../clients/cli/connections.c:4954
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Błąd: „parentâ€: nieprawidÅ‚owe bez „p-keyâ€."
 
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:5971
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+#: ../clients/cli/connections.c:5012 ../clients/cli/connections.c:5974
 msgid "Error: 'ssid' is required."
 msgstr "Błąd: „ssid†jest wymagane."
 
-#: ../clients/cli/connections.c:5072
+#: ../clients/cli/connections.c:5076
 msgid "WiMAX NSP name: "
 msgstr "Nazwa NSP sieci WiMAX: "
 
-#: ../clients/cli/connections.c:5075
+#: ../clients/cli/connections.c:5079
 msgid "Error: 'nsp' is required."
 msgstr "Błąd: „nsp†jest wymagane."
 
-#: ../clients/cli/connections.c:5127
+#: ../clients/cli/connections.c:5131
 msgid "PPPoE username: "
 msgstr "Nazwa użytkownika PPPoE: "
 
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+#: ../clients/cli/connections.c:5134 ../clients/cli/connections.c:6041
 msgid "Error: 'username' is required."
 msgstr "Błąd: „username†jest wymagane."
 
-#: ../clients/cli/connections.c:5199
+#: ../clients/cli/connections.c:5203
 msgid "APN: "
 msgstr "APN: "
 
-#: ../clients/cli/connections.c:5202
+#: ../clients/cli/connections.c:5206
 msgid "Error: 'apn' is required."
 msgstr "Błąd: „apn†jest wymagane."
 
-#: ../clients/cli/connections.c:5260
+#: ../clients/cli/connections.c:5264
 msgid "Bluetooth device address: "
 msgstr "Adres urzÄ…dzenia Bluetooth: "
 
-#: ../clients/cli/connections.c:5263
+#: ../clients/cli/connections.c:5267
 msgid "Error: 'addr' is required."
 msgstr "Błąd: „addr†jest wymagane."
 
-#: ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:5308
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 "Błąd: „bt-typeâ€: „%s†jest nieprawidÅ‚owe; należy użyć [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:5348
+#: ../clients/cli/connections.c:5352
 msgid "VLAN parent device or connection UUID: "
 msgstr "Urządzenie nadrzędne VLAN lub UUID połączenia: "
 
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+#: ../clients/cli/connections.c:5355 ../clients/cli/connections.c:6112
 msgid "Error: 'dev' is required."
 msgstr "Błąd: „dev†jest wymagane."
 
-#: ../clients/cli/connections.c:5355
+#: ../clients/cli/connections.c:5359
 msgid "VLAN ID <0-4094>: "
 msgstr "Identyfikator VLAN <0-4094>: "
 
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:5362 ../clients/cli/connections.c:6428
 msgid "Error: 'id' is required."
 msgstr "Błąd: „id†jest wymagane."
 
-#: ../clients/cli/connections.c:5364
+#: ../clients/cli/connections.c:5368
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4094>."
 msgstr "Błąd: „idâ€: „%s†jest nieprawidÅ‚owe; należy użyć <0-4094>."
 
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#: ../clients/cli/connections.c:5378 ../clients/cli/connections.c:6120
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr "Błąd: „devâ€: „%s†nie jest UUID, nazwÄ… interfejsu ani MAC."
 
-#: ../clients/cli/connections.c:5506
+#: ../clients/cli/connections.c:5510
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Błąd: „modeâ€: %s."
 
-#: ../clients/cli/connections.c:5515
+#: ../clients/cli/connections.c:5519
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Błąd: „primaryâ€: „%s†nie jest prawidÅ‚owÄ… nazwÄ… interfejsu."
 
-#: ../clients/cli/connections.c:5738
+#: ../clients/cli/connections.c:5742
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Błąd: „stpâ€: %s."
 
-#: ../clients/cli/connections.c:5747
+#: ../clients/cli/connections.c:5751
 #, c-format
 msgid "Error: 'multicast-snooping': %s."
 msgstr "Błąd: „multicast-snoopingâ€: %s."
 
-#: ../clients/cli/connections.c:5866
+#: ../clients/cli/connections.c:5870
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Błąd: „hairpinâ€: %s."
 
-#: ../clients/cli/connections.c:5915
+#: ../clients/cli/connections.c:5919
 msgid "Error: 'vpn-type' is required."
 msgstr "Błąd: „vpn-type†jest wymagane."
 
-#: ../clients/cli/connections.c:5922
+#: ../clients/cli/connections.c:5926
 #, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Błąd: „vpn-typeâ€: nieznane %s.\n"
 
-#: ../clients/cli/connections.c:5983
+#: ../clients/cli/connections.c:5987
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Błąd: „channelâ€: „%s†jest nieprawidÅ‚owe; należy użyć <1-13>."
 
-#: ../clients/cli/connections.c:6034
+#: ../clients/cli/connections.c:6038
 msgid "Username: "
 msgstr "Nazwa użytkownika: "
 
-#: ../clients/cli/connections.c:6043
+#: ../clients/cli/connections.c:6047
 #, c-format
 msgid "Protocol %s"
 msgstr "Protokół %s"
 
-#: ../clients/cli/connections.c:6046
+#: ../clients/cli/connections.c:6050
 msgid "Error: 'protocol' is required."
 msgstr "Błąd: „protocol†jest wymagane."
 
-#: ../clients/cli/connections.c:6105
+#: ../clients/cli/connections.c:6109
 msgid "MACVLAN parent device or connection UUID: "
 msgstr "Urządzenie nadrzędne MACVLAN lub UUID połączenia: "
 
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
+#: ../clients/cli/connections.c:6129 ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:6311
 msgid "Error: 'mode' is required."
 msgstr "Błąd: „mode†jest wymagane."
 
-#: ../clients/cli/connections.c:6131
+#: ../clients/cli/connections.c:6135
 msgid "Error: 'mode' is not valid."
 msgstr "Błąd: „mode†jest nieprawidłowe."
 
-#: ../clients/cli/connections.c:6144
+#: ../clients/cli/connections.c:6148
 #, c-format
 msgid "Error: 'tap': %s."
 msgstr "Błąd: „tapâ€: %s."
 
-#: ../clients/cli/connections.c:6230
+#: ../clients/cli/connections.c:6234
 #, c-format
 msgid "Error: 'pi': %s."
 msgstr "Błąd: „piâ€: %s."
 
-#: ../clients/cli/connections.c:6241
+#: ../clients/cli/connections.c:6245
 #, c-format
 msgid "Error: 'vnet-hdr': %s."
 msgstr "Błąd: „vnet-hdrâ€: %s."
 
-#: ../clients/cli/connections.c:6252
+#: ../clients/cli/connections.c:6256
 #, c-format
 msgid "Error: 'multi-queue': %s."
 msgstr "Błąd: „multi-queueâ€: %s."
 
-#: ../clients/cli/connections.c:6321
+#: ../clients/cli/connections.c:6325
 #, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
 msgstr "Błąd: „modeâ€: „%s†jest nieprawidÅ‚owe, należy użyć jednego z %s"
 
-#: ../clients/cli/connections.c:6327
+#: ../clients/cli/connections.c:6331
 msgid "Remote endpoint: "
 msgstr "Zdalny punkt końcowy: "
 
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+#: ../clients/cli/connections.c:6334 ../clients/cli/connections.c:6436
 msgid "Error: 'remote' is required."
 msgstr "Błąd: „remote†jest wymagane."
 
-#: ../clients/cli/connections.c:6337
+#: ../clients/cli/connections.c:6341
 #, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
 msgstr "Błąd: „remoteâ€: „%s†jest nieprawidÅ‚owe; musi być adresem IP"
 
-#: ../clients/cli/connections.c:6351
+#: ../clients/cli/connections.c:6355
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
 msgstr "Błąd: „localâ€: „%s†jest nieprawidÅ‚owe; musi być adresem IP"
 
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#: ../clients/cli/connections.c:6364 ../clients/cli/connections.c:6459
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
 msgstr "Błąd: „devâ€: „%s†nie jest UUID ani nazwÄ… interfejsu."
 
-#: ../clients/cli/connections.c:6421
+#: ../clients/cli/connections.c:6425
 msgid "VXLAN ID: "
 msgstr "Identyfikator VXLAN: "
 
-#: ../clients/cli/connections.c:6429
+#: ../clients/cli/connections.c:6433
 msgid "Remote: "
 msgstr "Zdalne: "
 
-#: ../clients/cli/connections.c:6438
+#: ../clients/cli/connections.c:6442
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
 msgstr "Błąd: „idâ€: „%s†jest nieprawidÅ‚owe; należy użyć <0-16777215>."
 
-#: ../clients/cli/connections.c:6464
+#: ../clients/cli/connections.c:6468
 #, c-format
 msgid "Error: 'remote': '%s' is not a valid IP address"
 msgstr "Błąd: „remoteâ€: „%s†nie jest prawidÅ‚owym adresem IP"
 
-#: ../clients/cli/connections.c:6473
+#: ../clients/cli/connections.c:6477
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address"
 msgstr "Błąd: „localâ€: „%s†nie jest prawidÅ‚owym adresem IP"
 
-#: ../clients/cli/connections.c:6482
+#: ../clients/cli/connections.c:6486
 #, c-format
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
 msgstr ""
 "Błąd: „source-port-minâ€: „%s†jest nieprawidÅ‚owe; należy użyć <0-65535>."
 
-#: ../clients/cli/connections.c:6491
+#: ../clients/cli/connections.c:6495
 #, c-format
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
 msgstr ""
 "Błąd: „source-port-maxâ€: „%s†jest nieprawidÅ‚owe; należy użyć <0-65535>."
 
-#: ../clients/cli/connections.c:6500
+#: ../clients/cli/connections.c:6504
 #, c-format
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
 msgstr ""
 "Błąd: „destination-portâ€: „%s†jest nieprawidÅ‚owe; należy użyć <0-65535>."
 
-#: ../clients/cli/connections.c:6540
+#: ../clients/cli/connections.c:6544
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Błąd: „%s†nie jest prawidłowym typem połączenia."
 
-#: ../clients/cli/connections.c:6581
+#: ../clients/cli/connections.c:6585
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr "Błąd: podano bramę IPv4 bez adresów IPv4"
 
-#: ../clients/cli/connections.c:6585
+#: ../clients/cli/connections.c:6589
 #, c-format
 msgid "Error: multiple IPv4 gateways specified"
 msgstr "Błąd: podano wiele bram IPv4"
 
-#: ../clients/cli/connections.c:6589
+#: ../clients/cli/connections.c:6593
 #, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
 msgstr "Błąd: nieprawidÅ‚owa brama IPv4 „%sâ€"
 
-#: ../clients/cli/connections.c:6614
+#: ../clients/cli/connections.c:6618
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr "Błąd: podano bramę IPv6 bez adresów IPv6"
 
-#: ../clients/cli/connections.c:6618
+#: ../clients/cli/connections.c:6622
 #, c-format
 msgid "Error: multiple IPv6 gateways specified"
 msgstr "Błąd: podano wiele bram IPv6"
 
-#: ../clients/cli/connections.c:6622
+#: ../clients/cli/connections.c:6626
 #, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
 msgstr "Błąd: nieprawidÅ‚owa brama IPv6 „%sâ€"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:10227
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Błąd: dodanie połączenia „%s†się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:6675
+#: ../clients/cli/connections.c:6679
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Pomyślnie dodano połączenie „%s†(%s).\n"
 
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#: ../clients/cli/connections.c:6955 ../clients/cli/connections.c:10682
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Błąd: parametr „type†jest wymagany."
 
-#: ../clients/cli/connections.c:6959
+#: ../clients/cli/connections.c:6963
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Błąd: nieznany typ połączenia; %s."
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:6972 ../clients/cli/devices.c:2142
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Błąd: „autoconnectâ€: %s."
 
-#: ../clients/cli/connections.c:6978
+#: ../clients/cli/connections.c:6982
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Błąd: „saveâ€: %s."
 
-#: ../clients/cli/connections.c:6995
+#: ../clients/cli/connections.c:6999
 msgid "Interface name [*]: "
 msgstr "Nazwa interfejsu [*]: "
 
-#: ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:7004
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Błąd: parametr „ifname†jest wymagany."
 
-#: ../clients/cli/connections.c:7002
+#: ../clients/cli/connections.c:7006
 #, c-format
 msgid "Error: mandatory 'ifname' not seen before '%s'."
 msgstr "Błąd: wymagane „ifname†nie wystÄ™puje przed „%sâ€."
 
-#: ../clients/cli/connections.c:7011
+#: ../clients/cli/connections.c:7015
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr "Błąd: „ifnameâ€: „%s†nie jest prawidÅ‚owym interfejsem ani „*â€."
 
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:8039
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[wartoÅ›ci ustawienia „%sâ€]\n"
@@ -2834,7 +2835,7 @@ msgstr "[wartoÅ›ci ustawienia „%sâ€]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8117
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2871,7 +2872,7 @@ msgstr ""
 "nmcli    <opcja konfiguracji> <wartość>        :: konfiguracja nmcli\n"
 "quit                                           :: kończy działanie nmcli\n"
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:8148
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2892,7 +2893,7 @@ msgstr ""
 "           nmcli connection> goto secondaries\n"
 "           nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:8155
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -2913,7 +2914,7 @@ msgstr ""
 "Przykłady: nmcli> remove wifi-sec\n"
 "           nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:8162
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2928,7 +2929,7 @@ msgstr ""
 "\n"
 "Przykład: nmcli> set con.id Moje połączenie\n"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:8167
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2941,7 +2942,7 @@ msgstr ""
 "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM\n"
 "można znaleźć na stronie podręcznika nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:8172
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2956,7 +2957,7 @@ msgstr ""
 "\n"
 "Przykład: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:8177
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2980,7 +2981,7 @@ msgstr ""
 "           nmcli> verify fix\n"
 "           nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:8186
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -3006,7 +3007,7 @@ msgstr ""
 "między ponownymi uruchomieniami. Aby w pełni usunąć trwałe połączenie,\n"
 "należy usunąć profil połączenia.\n"
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:8197
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -3028,7 +3029,7 @@ msgstr ""
 "                     poprzedzić znakiem /, kiedy nie podano\n"
 "                     <nazwy-interfejsu>)\n"
 
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:8204 ../clients/cli/connections.c:8363
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -3037,7 +3038,7 @@ msgstr ""
 "back  :: przechodzi do menu wyższego poziomu\n"
 "\n"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:8207
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -3046,7 +3047,7 @@ msgstr ""
 "help/? [<polecenie>]  :: pomoc dla poleceń nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:8206
+#: ../clients/cli/connections.c:8210
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -3073,7 +3074,7 @@ msgstr ""
 "           nmcli> nmcli save-confirmation no\n"
 "           nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8232 ../clients/cli/connections.c:8369
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -3086,8 +3087,8 @@ msgstr ""
 "To polecenie kończy działanie nmcli. Jeśli modyfikowane połączenie nie jest "
 "zapisane, użytkownik zostanie poproszony o potwierdzenie działania.\n"
 
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:8237 ../clients/cli/connections.c:8374
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:9746
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Nieznane polecenie: „%sâ€\n"
@@ -3095,7 +3096,7 @@ msgstr "Nieznane polecenie: „%sâ€\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8299
+#: ../clients/cli/connections.c:8303
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -3122,7 +3123,7 @@ msgstr ""
 "help/?   [<polecenie>]           :: wyświetla tę pomoc lub opis polecenia\n"
 "quit                             :: kończy działanie nmcli\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -3133,7 +3134,7 @@ msgstr ""
 "\n"
 "To polecenie ustawia podaną <wartość> tej właściwości\n"
 
-#: ../clients/cli/connections.c:8328
+#: ../clients/cli/connections.c:8332
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -3148,7 +3149,7 @@ msgstr ""
 "jest typu kontener. W przypadku właściwości zawierających jedną wartość "
 "zastÄ™puje tÄ™ wartość (podobnie jak „setâ€).\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -3159,7 +3160,7 @@ msgstr ""
 "\n"
 "Wyświetla bieżącą wartość i umożliwia jej modyfikację.\n"
 
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:8342
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3192,7 +3193,7 @@ msgstr ""
 "           nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:8353
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3205,7 +3206,7 @@ msgstr ""
 "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM "
 "można znaleźć na stronie podręcznika nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:8358
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3220,7 +3221,7 @@ msgstr ""
 "Wyświetla wartość właściwości. Podając parametr można także wyświetlić "
 "wartości dla całego ustawienia lub połączenia.\n"
 
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:8366
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -3229,28 +3230,28 @@ msgstr ""
 "help/? [<polecenie>]  :: pomoc dla poleceń nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8464
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Błąd: aktywacja połączenia się nie powiodła.\n"
 
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:8547
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Błąd: ustawienie „%s†jest wymagane i nie może być usuwane.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8561
+#: ../clients/cli/connections.c:8565
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Typ: %s | nazwa: %s | UUID: %s | dirty: %s | tymczasowe: %s ]\n"
 
-#: ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8601
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "Połączenie nie jest zapisane. Na pewno zakończyć? %s"
 
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:8650
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3259,66 +3260,66 @@ msgstr ""
 "Profil połączenia został usunięty z innego klienta. Można wpisać „save†w "
 "głównym oknie, aby go przywrócić.\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Dozwolone wartoÅ›ci dla wÅ‚aÅ›ciwoÅ›ci „%sâ€: %s\n"
 
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:8679 ../clients/cli/connections.c:9101
+#: ../clients/cli/connections.c:9159
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "ProszÄ™ podać wartość „%sâ€: "
 
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:8694 ../clients/cli/connections.c:8716
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9164
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Błąd: ustawienie właściwości „%s†się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:8710
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Modyfikacja wartoÅ›ci „%sâ€: "
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:8739
 #, c-format
 msgid "Error: %s\n"
 msgstr "Błąd: %s\n"
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:8745 ../clients/cli/connections.c:9246
+#: ../clients/cli/connections.c:9294
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Błąd: usunięcie wartości „%s†się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:8766
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Nieznany parametr polecenia: „%sâ€\n"
 
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:8871
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Dostępne ustawienia: %s\n"
 
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:8883
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Błąd: nieprawidłowa nazwa ustawienia; %s\n"
 
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:8900
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Dostępne właściwości: %s\n"
 
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:8908
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Błąd: właściwość %s\n"
 
-#: ../clients/cli/connections.c:8945
+#: ../clients/cli/connections.c:8949
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -3329,12 +3330,12 @@ msgstr ""
 "natychmiastową aktywację połączenia.\n"
 "Na pewno zapisać? %s"
 
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Można modyfikować następujące ustawienia: %s\n"
 
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:9067
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3343,221 +3344,221 @@ msgstr ""
 "Profil połączenia zostaÅ‚ usuniÄ™ty z innego klienta. Można wpisać „saveâ€, aby "
 "go przywrócić.\n"
 
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:9109 ../clients/cli/connections.c:9339
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Błąd: nie wybrano ustawienia; prawidłowe to [%s]\n"
 
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:9110
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "należy najpierw użyć „goto <ustawienie>†lub „set <ustawienie>."
 "<wÅ‚aÅ›ciwość>â€\n"
 
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9273
+#: ../clients/cli/connections.c:9361
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Błąd: nieprawidÅ‚owy parametr ustawienia „%sâ€; prawidÅ‚owe to [%s]\n"
 
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Błąd: brak ustawienia dla wÅ‚aÅ›ciwoÅ›ci „%sâ€\n"
 
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:9141
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Błąd: nieprawidłowa właściwość: %s\n"
 
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Błąd: nieznane ustawienie „%sâ€\n"
 
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:9207
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Można modyfikować następujące właściwości: %s\n"
 
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:9251
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Błąd: nie podano żadnego parametru; prawidłowe to [%s]\n"
 
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:9270
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Ustawienie „%s†nie jest obecne w połączeniu.\n"
 
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:9315
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Błąd: właściwości %s, ani nie jest nazwą ustawiania.\n"
 
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:9340
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "należy najpierw użyć „goto <ustawienie>†lub „describe <ustawienie>."
 "<wÅ‚aÅ›ciwość>â€\n"
 
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:9389
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Błąd: nieprawidłowa właściwość: %s: ani prawidłową nazwą ustawienia.\n"
 
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:9421
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Błąd: nieznane ustawienie: „%sâ€\n"
 
-#: ../clients/cli/connections.c:9422
+#: ../clients/cli/connections.c:9426
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Błąd: ustawienie „%s†nie jest obecne w połączeniu\n"
 
-#: ../clients/cli/connections.c:9450
+#: ../clients/cli/connections.c:9454
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Błąd: nieprawidłowa właściwość: %s%s\n"
 
-#: ../clients/cli/connections.c:9452
+#: ../clients/cli/connections.c:9456
 msgid ", neither a valid setting name"
 msgstr ", ani prawidłową nazwą ustawienia"
 
-#: ../clients/cli/connections.c:9469
+#: ../clients/cli/connections.c:9473
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Nieprawidłowa opcja sprawdzania: %s\n"
 
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:9481
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Sprawdzenie ustawienia „%sâ€: %s\n"
 
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:9496
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Sprawdzenie połączenia: %s\n"
 
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:9499
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Nie można automatycznie naprawić błędu.\n"
 
-#: ../clients/cli/connections.c:9512
+#: ../clients/cli/connections.c:9516
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Błąd: nieprawidÅ‚owy parametr „%sâ€\n"
 
-#: ../clients/cli/connections.c:9545
+#: ../clients/cli/connections.c:9549
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Błąd: zapisanie połączenia „%s†(%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:9556
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Pomyślnie zapisano połączenie „%s†(%s).\n"
 
-#: ../clients/cli/connections.c:9553
+#: ../clients/cli/connections.c:9557
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Pomyślnie zaktualizowano połączenie „%s†(%s).\n"
 
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:9590
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Błąd: sprawdzenie połączenia się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:9591
 msgid "(unknown error)"
 msgstr "(nieznany błąd)"
 
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:9592
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Można spróbować wykonać „verify fixâ€, aby naprawić błędy.\n"
 
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Błąd: połączenie nie jest zapisane. Należy najpierw wpisać „saveâ€.\n"
 
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:9618
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Błąd: połączenie jest nieprawidłowe: %s\n"
 
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:9628
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Błąd: nie można aktywować połączenia: %s.\n"
 
-#: ../clients/cli/connections.c:9634
+#: ../clients/cli/connections.c:9638
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Błąd: aktywowanie połączenia „%s†(%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/connections.c:9640
+#: ../clients/cli/connections.c:9644
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Aktywacja monitorowania połączenia (naciśnięcie dowolnego klawisza "
 "kontynuuje)\n"
 
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:9682
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Błąd: status-line: %s\n"
 
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:9690
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Błąd: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:9694
+#: ../clients/cli/connections.c:9698
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Błąd: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:9703
+#: ../clients/cli/connections.c:9707
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "Błąd: błędny kolor: %s\n"
 
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:9721
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Obecna konfiguracja nmcli:\n"
 
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:9731
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "NieprawidÅ‚owa opcja konfiguracji „%sâ€; dozwolone [%s]\n"
 
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:9986
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Błąd: tylko jedno z „idâ€, UUID lub „path†może być podane."
 
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:9998 ../clients/cli/connections.c:10175
+#: ../clients/cli/connections.c:10182 ../clients/cli/connections.c:10310
+#: ../clients/cli/connections.c:10786
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Błąd: nieznane połączenie „%sâ€."
 
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:10016
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Ostrzeżenie: modyfikowanie istniejÄ…cego połączenia „%sâ€; parametr „type†"
 "jest ignorowany\n"
 
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:10019
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3565,223 +3566,223 @@ msgstr ""
 "Ostrzeżenie: modyfikowanie istniejÄ…cego połączenia „%sâ€; parametr „con-name†"
 "jest ignorowany\n"
 
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:10033
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Prawidłowe typy połączeń: %s\n"
 
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:10035
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Błąd: nieznany typ połączenia; %s\n"
 
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:10074
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| interaktywny edytor połączeń nmcli |==="
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modyfikowanie istniejÄ…cego połączenia „%sâ€: „%sâ€"
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Dodawanie nowego połączenia „%sâ€"
 
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:10081
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Wpisanie „help†lub „?†wyświetla dostępne polecenia."
 
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:10083
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Wpisanie „describe [<ustawienie>.<właściwość>]†wyświetla szczegółowy opis "
 "właściwości."
 
-#: ../clients/cli/connections.c:10117
+#: ../clients/cli/connections.c:10121
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Błąd: zmodyfikowanie połączenia „%s†się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:10128
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Pomyślnie zmodyfikowano połączenie „%s†(%s).\n"
 
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
+#: ../clients/cli/connections.c:10150 ../clients/cli/connections.c:10266
+#: ../clients/cli/connections.c:10643 ../clients/cli/connections.c:10751
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Błąd: nie podano żadnych parametrów."
 
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
+#: ../clients/cli/connections.c:10169 ../clients/cli/connections.c:10298
+#: ../clients/cli/connections.c:10780
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "Błąd: brak identyfikatora połączenia."
 
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:10232
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "Sklonowano %s (%s) jako %s (%s).\n"
 
-#: ../clients/cli/connections.c:10260
+#: ../clients/cli/connections.c:10264
 msgid "New connection name: "
 msgstr "Nazwa nowego połączenia: "
 
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#: ../clients/cli/connections.c:10285 ../clients/cli/connections.c:10303
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Błąd: brak parametru <nowa nazwa>."
 
-#: ../clients/cli/connections.c:10287
+#: ../clients/cli/connections.c:10291
 #, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "Błąd: nieoczekiwany dodatkowy parametr „%sâ€."
 
-#: ../clients/cli/connections.c:10356
+#: ../clients/cli/connections.c:10360
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Błąd: nie usunięto wszystkich połączeń."
 
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:10361
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Błąd: usunięcie połączenia się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#: ../clients/cli/connections.c:10423 ../clients/cli/connections.c:10551
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Błąd: nieznane połączenie „%sâ€\n"
 
-#: ../clients/cli/connections.c:10433
+#: ../clients/cli/connections.c:10437
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Błąd: nie podano połączenia."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:10462
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Błąd: nie można usunąć nieznanych połączeń: %s."
 
-#: ../clients/cli/connections.c:10470
+#: ../clients/cli/connections.c:10474
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: zmieniono profil połączenia\n"
 
-#: ../clients/cli/connections.c:10496
+#: ../clients/cli/connections.c:10500
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: utworzono profil połączenia\n"
 
-#: ../clients/cli/connections.c:10505
+#: ../clients/cli/connections.c:10509
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: usunięto profil połączenia\n"
 
-#: ../clients/cli/connections.c:10548
+#: ../clients/cli/connections.c:10552
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Błąd: nie odnaleziono wszystkich połączeń."
 
-#: ../clients/cli/connections.c:10571
+#: ../clients/cli/connections.c:10575
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Błąd: ponowne wczytanie połączeń się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:10603
+#: ../clients/cli/connections.c:10607
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Błąd: wczytanie połączeń się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:10615
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Nie można wczytać pliku „%sâ€\n"
 
-#: ../clients/cli/connections.c:10620
+#: ../clients/cli/connections.c:10624
 msgid "File to import: "
 msgstr "Plik do zaimportowania: "
 
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:10659
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Ostrzeżenie: „type†zostało już podane, ignorowanie dodatkowego.\n"
 
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:10670
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Ostrzeżenie: „file†zostało już podane, ignorowanie dodatkowego.\n"
 
-#: ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:10672
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Nieznany parametr: %s"
 
-#: ../clients/cli/connections.c:10683
+#: ../clients/cli/connections.c:10687
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Błąd: parametr „file†jest wymagany."
 
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#: ../clients/cli/connections.c:10695 ../clients/cli/connections.c:10802
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Błąd: wczytanie wtyczki VPN się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:10699
+#: ../clients/cli/connections.c:10703
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Błąd: zaimportowanie „%s†się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:10745
+#: ../clients/cli/connections.c:10749
 msgid "Output file name: "
 msgstr "Nazwa pliku wyjściowego: "
 
-#: ../clients/cli/connections.c:10769
+#: ../clients/cli/connections.c:10773
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Błąd: nieznany dodatkowy parametr: „%sâ€."
 
-#: ../clients/cli/connections.c:10789
+#: ../clients/cli/connections.c:10793
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Błąd: połączenie nie jest VPN."
 
-#: ../clients/cli/connections.c:10810
+#: ../clients/cli/connections.c:10814
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Błąd: utworzenie pliku tymczasowego %s się nie powiodło."
 
-#: ../clients/cli/connections.c:10819
+#: ../clients/cli/connections.c:10823
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Błąd: wyeksportowanie „%s†się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:10830
+#: ../clients/cli/connections.c:10834
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Błąd: odczytanie pliku tymczasowego „%s†się nie powiodło: %s."
 
-#: ../clients/cli/connections.c:10976
+#: ../clients/cli/connections.c:10980
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "niepoprawny ciÄ…g „%s†opcji „--orderâ€"
 
-#: ../clients/cli/connections.c:11002
+#: ../clients/cli/connections.c:11006
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "niepoprawny element „%s†w opcji „--orderâ€"
 
-#: ../clients/cli/connections.c:11089
+#: ../clients/cli/connections.c:11090
 msgid "'--order' argument is missing"
 msgstr "Brak parametru „--orderâ€"
 
-#: ../clients/cli/connections.c:11154
+#: ../clients/cli/connections.c:11155
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Błąd: „%s†nie jest prawidÅ‚owym poleceniem „connectionâ€."
@@ -4214,7 +4215,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname> ...\n"
+"  reapply <ifname>\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -4250,7 +4251,7 @@ msgstr ""
 "\n"
 "  connect <nazwa interfejsu>\n"
 "\n"
-"  reapply <nazwa interfejsu> …\n"
+"  reapply <nazwa interfejsu>\n"
 "\n"
 "  disconnect <nazwa interfejsu> …\n"
 "\n"
@@ -4349,7 +4350,7 @@ msgstr ""
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4357,7 +4358,7 @@ msgid ""
 msgstr ""
 "Użycie: nmcli device reapply { PARAMETRY | help }\n"
 "\n"
-"PARAMETRY := <nazwa interfejsu> …\n"
+"PARAMETRY := <nazwa interfejsu>\n"
 "\n"
 "Próbuje zaktualizować urządzenie zmianami wprowadzonymi do obecnie aktywnego "
 "połączenia od ostatniego zastosowania zmian.\n"
@@ -4578,23 +4579,23 @@ msgstr ""
 "\n"
 
 #: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
-#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
-#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1876
+#: ../clients/cli/devices.c:2081 ../clients/cli/devices.c:2088
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Błąd: nie podano żadnego interfejsu."
 
-#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
+#: ../clients/cli/devices.c:547
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Ostrzeżenie: podwójny parametr „%sâ€.\n"
 
-#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#: ../clients/cli/devices.c:549
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Błąd: nie odnaleziono urzÄ…dzenia „%sâ€.\n"
 
-#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#: ../clients/cli/devices.c:550
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Błąd: nie odnaleziono wszystkich urządzeń."
@@ -4669,14 +4670,14 @@ msgstr "Błąd: „device statusâ€: %s"
 msgid "Status of devices"
 msgstr "Stan urzÄ…dzenia"
 
-#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3487
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Błąd: nieprawidÅ‚owy dodatkowy parametr „%sâ€."
 
 #: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
-#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:2104 ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:3526
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Błąd: nie odnaleziono urzÄ…dzenia „%sâ€."
@@ -4743,7 +4744,7 @@ msgid "Error: extra argument not allowed: '%s'."
 msgstr "Błąd: niedozwolony dodatkowy parametr: „%sâ€."
 
 #: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
-#: ../clients/cli/devices.c:1964
+#: ../clients/cli/devices.c:1942
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "PomyÅ›lnie rozłączono urzÄ…dzenie „%sâ€.\n"
@@ -4755,96 +4756,96 @@ msgstr "PomyÅ›lnie usuniÄ™to urzÄ…dzenie „%sâ€.\n"
 
 #: ../clients/cli/devices.c:1838
 #, c-format
-msgid "Error: not all connections reapplied."
-msgstr "Błąd: nie zastosowano ponownie wszystkich połączeń."
-
-#: ../clients/cli/devices.c:1839
-#, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr ""
 "Błąd: ponowne zastosowanie połączenia do urządzenia „%s†(%s) się nie "
-"powiodło: %s\n"
+"powiodło: %s"
 
-#: ../clients/cli/devices.c:1849
+#: ../clients/cli/devices.c:1848
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "PomyÅ›lnie zastosowano ponownie połączenie do urzÄ…dzenia „%sâ€.\n"
 
-#: ../clients/cli/devices.c:1912
+#: ../clients/cli/devices.c:1885
+#, c-format
+msgid "Error: unsupported argument '%s'."
+msgstr "Błąd: nieobsÅ‚ugiwany parametr „%sâ€."
+
+#: ../clients/cli/devices.c:1899
 #, c-format
-msgid "Error: no valid device provided."
-msgstr "Błąd: nie podano prawidłowego urządzenia."
+msgid "Error: device '%s' not found."
+msgstr "Błąd: nie odnaleziono urzÄ…dzenia „%sâ€."
 
-#: ../clients/cli/devices.c:1949
+#: ../clients/cli/devices.c:1927
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Błąd: nie rozłączono wszystkich połączeń."
 
-#: ../clients/cli/devices.c:1950
+#: ../clients/cli/devices.c:1928
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Błąd: rozłączenie urządzenia „%s†(%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/devices.c:2025
+#: ../clients/cli/devices.c:2003
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Błąd: nie usunięto wszystkich urządzeń."
 
-#: ../clients/cli/devices.c:2026
+#: ../clients/cli/devices.c:2004
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Błąd: usunięcie urządzenia „%s†(%s) się nie powiodło: %s\n"
 
-#: ../clients/cli/devices.c:2132
+#: ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No property specified."
 msgstr "Błąd: nie podano właściwości."
 
-#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
+#: ../clients/cli/devices.c:2122 ../clients/cli/devices.c:2137
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Błąd: brak parametru „%sâ€."
 
-#: ../clients/cli/devices.c:2149
+#: ../clients/cli/devices.c:2127
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Błąd: „managedâ€: %s."
 
-#: ../clients/cli/devices.c:2174
+#: ../clients/cli/devices.c:2152
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Błąd: nieznana wÅ‚aÅ›ciwość „%sâ€."
 
-#: ../clients/cli/devices.c:2220
+#: ../clients/cli/devices.c:2198
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: używanie połączenia „%sâ€\n"
 
-#: ../clients/cli/devices.c:2246
+#: ../clients/cli/devices.c:2224
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: utworzono urzÄ…dzenie\n"
 
-#: ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2231
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: usunięto urządzenie\n"
 
-#: ../clients/cli/devices.c:2339
+#: ../clients/cli/devices.c:2317
 msgid "Wi-Fi scan list"
 msgstr "Lista skanowania sieci Wi-Fi"
 
-#: ../clients/cli/devices.c:2377
+#: ../clients/cli/devices.c:2355
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Błąd: „device wifiâ€: %s"
 
-#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
+#: ../clients/cli/devices.c:2397 ../clients/cli/devices.c:2478
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Błąd: nie odnaleziono punktu dostÄ™powego z BSSID „%sâ€."
 
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2424
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4853,27 +4854,27 @@ msgstr ""
 "Błąd: urządzenie „%s†nie zostało rozpoznane jako urządzenie Wi-Fi. Proszę "
 "sprawdzić poprawność instalacji wtyczki Wi-Fi usługi NetworkManager."
 
-#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
-#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:2426 ../clients/cli/devices.c:2758
+#: ../clients/cli/devices.c:3178 ../clients/cli/devices.c:3327
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Błąd: urządzenie „%s†nie jest urządzeniem Wi-Fi."
 
-#: ../clients/cli/devices.c:2660
+#: ../clients/cli/devices.c:2638
 msgid "SSID or BSSID: "
 msgstr "SSID lub BSSID: "
 
-#: ../clients/cli/devices.c:2665
+#: ../clients/cli/devices.c:2643
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Błąd: brak SSID lub BSSID."
 
-#: ../clients/cli/devices.c:2689
+#: ../clients/cli/devices.c:2667
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Błąd: wartość parametru BSSID „%s†nie jest prawidłowym BSSID."
 
-#: ../clients/cli/devices.c:2713
+#: ../clients/cli/devices.c:2691
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4881,43 +4882,43 @@ msgstr ""
 "Błąd: wartość „%s†parametru wep-key-type jest nieprawidłowa, należy użyć "
 "„key†lub „phraseâ€."
 
-#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
+#: ../clients/cli/devices.c:2711 ../clients/cli/devices.c:2724
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Błąd: %s: %s."
 
-#: ../clients/cli/devices.c:2761
+#: ../clients/cli/devices.c:2739
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Błąd: BSSID do połączenia (%s) różni się od parametru BSSID (%s)."
 
-#: ../clients/cli/devices.c:2767
+#: ../clients/cli/devices.c:2745
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Błąd: parametr „%s†nie wynosi SSID ani BSSID."
 
-#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:2760 ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3329
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Błąd: nie odnaleziono urządzenia Wi-Fi."
 
-#: ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:2780
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Błąd: skanowanie ukrytego SSID się nie powiodło: %s."
 
-#: ../clients/cli/devices.c:2827
+#: ../clients/cli/devices.c:2805
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Błąd: nie odnaleziono sieci z SSID „%sâ€."
 
-#: ../clients/cli/devices.c:2829
+#: ../clients/cli/devices.c:2807
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Błąd: nie odnaleziono punktu dostÄ™powego z BSSID „%sâ€."
 
-#: ../clients/cli/devices.c:2871
+#: ../clients/cli/devices.c:2849
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -4925,90 +4926,90 @@ msgstr ""
 "Ostrzeżenie: „%s†powinno być SSID dla ukrytych punktów dostępowych, ale "
 "wyglÄ…da jak BSSID.\n"
 
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:2863
 msgid "Password: "
 msgstr "Hasło: "
 
-#: ../clients/cli/devices.c:3034
+#: ../clients/cli/devices.c:3012
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "„%s†nie jest prawidłowym PSK WPA"
 
-#: ../clients/cli/devices.c:3051
+#: ../clients/cli/devices.c:3029
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "„%s†nie jest prawidłowym kluczem WEP (powinien mieć 5 lub 13 znaków ASCII)"
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3045
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Hasło hotspota: %s\n"
 
-#: ../clients/cli/devices.c:3125
+#: ../clients/cli/devices.c:3103
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Błąd: SSID jest za długie."
 
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3115
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "Błąd: wartość „%s†parametru pasma jest nieprawidłowa; należy użyć „a†lub "
 "„bgâ€."
 
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3139
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Błąd: nieznany parametr %s."
 
-#: ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3158
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Błąd: kanał także wymaga pasma."
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3164
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Błąd: „channelâ€: „%s†jest nieprawidÅ‚owe dla pasma „%sâ€."
 
-#: ../clients/cli/devices.c:3214
+#: ../clients/cli/devices.c:3192
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "Błąd: urządzenie „%s†nie obsługuje trybu punktu dostępowego ani Ad-Hoc."
 
-#: ../clients/cli/devices.c:3249
+#: ../clients/cli/devices.c:3227
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Błąd: nieprawidÅ‚owe „passwordâ€: %s."
 
-#: ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3296
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Błąd: „%s†nie może się powtarzać."
 
-#: ../clients/cli/devices.c:3399
+#: ../clients/cli/devices.c:3377
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Błąd: polecenie „device wifi†„%s†jest nieprawidłowe."
 
 #. Main header name
-#: ../clients/cli/devices.c:3425
+#: ../clients/cli/devices.c:3403
 msgid "Device LLDP neighbors"
 msgstr "SÄ…siedzi LLDP urzÄ…dzenia"
 
-#: ../clients/cli/devices.c:3528
+#: ../clients/cli/devices.c:3506
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Błąd: „device lldp lisâ€: %s"
 
-#: ../clients/cli/devices.c:3575
+#: ../clients/cli/devices.c:3553
 #, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "Błąd: polecenie „device lldp†„%s†jest nieprawidłowe."
 
-#: ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3742
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Błąd: polecenie „dev†„%s†jest nieprawidłowe."
@@ -5385,157 +5386,157 @@ msgstr "pełne"
 msgid "Error: only these fields are allowed: %s"
 msgstr "Błąd: tylko te pola są dozwolone: %s"
 
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:357
 msgid "NetworkManager status"
 msgstr "Stan usługi NetworkManager"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:362
 msgid "running"
 msgstr "uruchamiany"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "starting"
 msgstr "uruchamianie"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "started"
 msgstr "uruchomiono"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "enabled"
 msgstr "włączone"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "disabled"
 msgstr "wyłączone"
 
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:443
 msgid "auth"
 msgstr "uwierzytelnianie"
 
-#: ../clients/cli/general.c:475
+#: ../clients/cli/general.c:472
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Błąd: „general permissionsâ€: %s"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:486
 msgid "NetworkManager permissions"
 msgstr "Uprawnienia usługi NetworkManager"
 
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:527
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Błąd: „general loggingâ€: %s"
 
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:542
 msgid "NetworkManager logging"
 msgstr "Dziennik usługi NetworkManager"
 
-#: ../clients/cli/general.c:567
+#: ../clients/cli/general.c:564
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Błąd: ustawienie nazwy komputera się nie powiodło: %s"
 
-#: ../clients/cli/general.c:680
+#: ../clients/cli/general.c:677
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Błąd: ustawienie zapisywania w dzienniku się nie powiodło: %s"
 
-#: ../clients/cli/general.c:689
+#: ../clients/cli/general.c:686
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Błąd: polecenie „general†„%s†jest nieprawidłowe."
 
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:704
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "Błąd: wartość „--fields†„%s†jest nieprawidłowa (dozwolone pola: %s)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:729
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Błąd: nieprawidÅ‚owy parametr „%sâ€: „%s†(należy użyć on/off)."
 
-#: ../clients/cli/general.c:743
+#: ../clients/cli/general.c:740
 msgid "Connectivity"
 msgstr "ÅÄ…czność"
 
-#: ../clients/cli/general.c:758
+#: ../clients/cli/general.c:755
 msgid "Networking"
 msgstr "Sieć"
 
-#: ../clients/cli/general.c:783
+#: ../clients/cli/general.c:780
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Błąd: polecenie „networking connectivity†„%s†jest nieprawidłowe."
 
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:796
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Błąd: polecenie „networking†„%s†jest nieprawidłowe."
 
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:825 ../clients/cli/general.c:845
 msgid "Radio switches"
 msgstr "Przełączniki radiowe"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:863
 msgid "Wi-Fi radio switch"
 msgstr "Przełącznik radiowy Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:879
 msgid "WWAN radio switch"
 msgstr "Przełącznik radiowy WWAN"
 
-#: ../clients/cli/general.c:893
+#: ../clients/cli/general.c:890
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Błąd: polecenie „radio†„%s†jest nieprawidłowe."
 
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:911
 msgid "NetworkManager has started"
 msgstr "Uruchomiono usługę NetworkManager"
 
-#: ../clients/cli/general.c:917
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has stopped"
 msgstr "Zatrzymano usługę NetworkManager"
 
-#: ../clients/cli/general.c:931
+#: ../clients/cli/general.c:928
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Ustawiono nazwÄ™ komputera na „%sâ€\n"
 
-#: ../clients/cli/general.c:946
+#: ../clients/cli/general.c:943
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "„%s†jest teraz głównym połączeniem\n"
 
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:945
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Brak głównego połączenia\n"
 
-#: ../clients/cli/general.c:960
+#: ../clients/cli/general.c:957
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "ÅÄ…czność wynosi teraz „%sâ€\n"
 
-#: ../clients/cli/general.c:973
+#: ../clients/cli/general.c:970
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "UsÅ‚uga NetworkManager jest teraz w stanie „%sâ€\n"
 
-#: ../clients/cli/general.c:984
+#: ../clients/cli/general.c:981
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Błąd: polecenie „monitor†„%s†jest nieprawidłowe."
 
-#: ../clients/cli/general.c:998
+#: ../clients/cli/general.c:995
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr ""
 "Usługa NetworkManager nie jest uruchomiona (oczekiwanie na uruchomienie)\n"
@@ -5554,8 +5555,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5583,8 +5582,6 @@ msgstr ""
 "  -f[ields] <pole1,pole2,…>|all|common       określa pola do wyjścia\n"
 "  -e[scape] yes|no                           modyfikuje separatory kolumn\n"
 "                                             w wartościach\n"
-"  -n[ocheck]                                 bez sprawdzania wersji nmcli\n"
-"                                             i NetworkManager\n"
 "  -a[sk]                                     pyta o brakujÄ…ce parametry\n"
 "  -s[how-secrets]                            zezwala na wyświetlanie haseł\n"
 "  -w[ait] <sekundy>                          ustawia czas oczekiwania\n"
@@ -5602,66 +5599,66 @@ msgstr ""
 "  m[onitor]       monitoruje zmiany usługi NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:143
+#: ../clients/cli/nmcli.c:142
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr ""
 "Błąd: obiekt „%s†jest nieznany, można spróbować polecenie „nmcli helpâ€."
 
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:172
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Błąd: opcja „--terse†został podana po raz drugi."
 
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:177
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Błąd: opcja „--terse†jest wzajemnie wykluczajÄ…ca z opcjÄ… „--prettyâ€."
 
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:185
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Błąd: opcja „--pretty†został podana po raz drugi."
 
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:190
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Błąd: opcja „--pretty†jest wzajemnie wykluczajÄ…ca z opcjÄ… „--terseâ€."
 
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216
+#: ../clients/cli/nmcli.c:234 ../clients/cli/nmcli.c:265
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Błąd: brak parametru dla opcji „%sâ€."
 
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:227
+#: ../clients/cli/nmcli.c:243
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Błąd: „%s†nie jest prawidÅ‚owym parametrem dla opcji „%sâ€."
 
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:250
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Błąd: brak pól dla opcji „%sâ€."
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:270
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Błąd: „%s†nie jest prawidÅ‚owym czasem oczekiwania dla opcji „%sâ€."
 
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:277
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "narzędzie nmcli, wersja %s\n"
 
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:283
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr ""
 "Błąd: opcja „%s†jest nieznana. Można spróbować polecenie „nmcli helpâ€."
 
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#: ../clients/cli/nmcli.c:366 ../clients/cli/nmcli.c:376
 #, c-format
 msgid ""
 "\n"
@@ -5670,22 +5667,22 @@ msgstr ""
 "\n"
 "Błąd: nmcli zostało zakończone sygnałem %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:408
+#: ../clients/cli/nmcli.c:407
 #, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "Ustawienie maski sygnału nie powiodło: %d\n"
 
-#: ../clients/cli/nmcli.c:415
+#: ../clients/cli/nmcli.c:414
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "Utworzenie wątku obsługującego sygnały się nie powiodło: %d\n"
 
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:511 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Błąd: nie można utworzyć obiektu NMClient: %s."
 
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:528
 msgid "Success"
 msgstr "Powodzenie"
 
@@ -5846,24 +5843,24 @@ msgstr "nieprawidÅ‚owy tryb „%sâ€, należy użyć jednego z %s"
 msgid "always"
 msgstr "zawsze"
 
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3279
+#: ../clients/cli/settings.c:4471 ../clients/cli/settings.c:4974
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "nieprawidÅ‚owa opcja „%sâ€, należy użyć jednej z [%s]"
 
-#: ../clients/cli/settings.c:2116
+#: ../clients/cli/settings.c:2109
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Ustawić „%s†na „%s� [yes]: "
 
-#: ../clients/cli/settings.c:2118
+#: ../clients/cli/settings.c:2111
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Wyczyścić „%s� [yes]: "
 
-#: ../clients/cli/settings.c:2279
+#: ../clients/cli/settings.c:2272
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
@@ -5871,86 +5868,86 @@ msgstr ""
 "Ostrzeżenie: ustawiono %s.%s na „%sâ€, ale może zostać zignorowane w trybie "
 "infrastruktury\n"
 
-#: ../clients/cli/settings.c:2298
+#: ../clients/cli/settings.c:2291
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr "Ostrzeżenie: ustawienie %s.%s wymaga usunięcia ustawień IPv4 i IPv6\n"
 
-#: ../clients/cli/settings.c:2300
+#: ../clients/cli/settings.c:2293
 msgid "Do you want to remove them? [yes] "
 msgstr "Usunąć je? [yes] "
 
-#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
-#: ../clients/cli/settings.c:5182
+#: ../clients/cli/settings.c:2389 ../clients/cli/settings.c:2784
+#: ../clients/cli/settings.c:5175
 #, c-format
 msgid "'%s' is not valid"
 msgstr "„%s†jest nieprawidłowe"
 
-#: ../clients/cli/settings.c:2419
+#: ../clients/cli/settings.c:2412
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "„%d†jest nieprawidłowe; należy użyć <%d-%d>"
 
-#: ../clients/cli/settings.c:2441
+#: ../clients/cli/settings.c:2434
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "„%lld†jest nieprawidłowe; należy użyć <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2463
+#: ../clients/cli/settings.c:2456
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "„%u†jest nieprawidłowe; należy użyć <%u-%u>"
 
-#: ../clients/cli/settings.c:2502
+#: ../clients/cli/settings.c:2495
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "flagi „%u†są nieprawidłowe; należy użyć połączenia %s"
 
-#: ../clients/cli/settings.c:2569
+#: ../clients/cli/settings.c:2562
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "„%s†jest nieprawidłowe; należy użyć <opcja>=<wartość>"
 
-#: ../clients/cli/settings.c:2603
+#: ../clients/cli/settings.c:2596
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "indeks „%s†jest nieprawidłowy"
 
-#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
+#: ../clients/cli/settings.c:2601 ../clients/cli/settings.c:2626
 msgid "no item to remove"
 msgstr "brak elementu do usunięcia"
 
-#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
+#: ../clients/cli/settings.c:2605 ../clients/cli/settings.c:2630
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "indeks „%d†jest poza zakresem <0-%d>"
 
-#: ../clients/cli/settings.c:2652
+#: ../clients/cli/settings.c:2645
 #, c-format
 msgid "invalid option '%s'"
 msgstr "nieprawidÅ‚owa opcja „%sâ€"
 
-#: ../clients/cli/settings.c:2654
+#: ../clients/cli/settings.c:2647
 msgid "missing option"
 msgstr "brak opcji"
 
-#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
-#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
+#: ../clients/cli/settings.c:2674 ../clients/cli/settings.c:2694
+#: ../clients/cli/settings.c:2714 ../clients/cli/settings.c:2734
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "„%s†nie jest prawidłową liczbą (lub jest poza zakresem)"
 
-#: ../clients/cli/settings.c:2775
+#: ../clients/cli/settings.c:2768
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "„%s†nie jest prawidłową wartością; należy użyć -1, 0 lub 1"
 
-#: ../clients/cli/settings.c:2807
+#: ../clients/cli/settings.c:2800
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "„%s†nie jest prawidłowym adresem MAC Ethernetu"
 
-#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2825 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5958,40 +5955,40 @@ msgstr "„%s†nie jest prawidłowym adresem MAC Ethernetu"
 msgid "'%s' is not a valid interface name"
 msgstr "„%s†nie jest prawidłową nazwą interfejsu"
 
-#: ../clients/cli/settings.c:2856
+#: ../clients/cli/settings.c:2849
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "„%s†nie jest prawidłowym numerem flagi; należy użyć <0-%d>"
 
-#: ../clients/cli/settings.c:2868
+#: ../clients/cli/settings.c:2861
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 "Ostrzeżenie: suma „%s†jest wyższa niż wszystkie flagi => wszystkie "
 "ustawione flagi\n"
 
-#: ../clients/cli/settings.c:2909
+#: ../clients/cli/settings.c:2902
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "„%s†nie jest prawidłowym znakiem szesnastkowym"
 
-#: ../clients/cli/settings.c:2939
+#: ../clients/cli/settings.c:2932
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "„%s†nie jest prawidłowym adresem MAC"
 
-#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2958 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "„%s†nie jest prawidłowym UUID"
 
-#: ../clients/cli/settings.c:3032
+#: ../clients/cli/settings.c:3025
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera uprawnienia „%sâ€"
 
-#: ../clients/cli/settings.c:3044
+#: ../clients/cli/settings.c:3037
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -6007,40 +6004,40 @@ msgstr ""
 "\n"
 "Przykład: alice bob charlie\n"
 
-#: ../clients/cli/settings.c:3063
+#: ../clients/cli/settings.c:3056
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "„%s†nie jest prawidÅ‚owym „masterâ€; należy użyć nazwy interfejsu lub UUID "
 "połączenia"
 
-#: ../clients/cli/settings.c:3107
+#: ../clients/cli/settings.c:3100
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr ""
 "Ostrzeżenie: %s nie jest UUID żadnego istniejącego profilu połączenia\n"
 
-#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#: ../clients/cli/settings.c:3104 ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "„%s†nie jest profilem połączenia VPN"
 
-#: ../clients/cli/settings.c:3120
+#: ../clients/cli/settings.c:3113
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "„%s†nie jest nazwą żadnego istniejącego profilu"
 
-#: ../clients/cli/settings.c:3154
+#: ../clients/cli/settings.c:3147
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "wartość „%s†nie jest prawidłowym UUID"
 
-#: ../clients/cli/settings.c:3161
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera UUID „%sâ€"
 
-#: ../clients/cli/settings.c:3173
+#: ../clients/cli/settings.c:3166
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -6061,7 +6058,7 @@ msgstr ""
 "\n"
 "Przykład: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3240
+#: ../clients/cli/settings.c:3233
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -6076,16 +6073,16 @@ msgstr ""
 "„unknown†umożliwia usłudze NetworkManager wybranie wartości używając "
 "heurystyki\n"
 
-#: ../clients/cli/settings.c:3364
+#: ../clients/cli/settings.c:3357
 msgid "private key password not provided"
 msgstr "nie podano hasła klucza prywatnego"
 
-#: ../clients/cli/settings.c:3392
+#: ../clients/cli/settings.c:3385
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera metody EAP „%sâ€"
 
-#: ../clients/cli/settings.c:3409
+#: ../clients/cli/settings.c:3402
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -6099,12 +6096,12 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3428
+#: ../clients/cli/settings.c:3421
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera alternatywnego dopasowania tematu „%sâ€"
 
-#: ../clients/cli/settings.c:3444
+#: ../clients/cli/settings.c:3437
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -6118,7 +6115,7 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3456
+#: ../clients/cli/settings.c:3449
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6134,12 +6131,12 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3469
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera alternatywnego dopasowania tematu „phase2†„%sâ€"
 
-#: ../clients/cli/settings.c:3492
+#: ../clients/cli/settings.c:3485
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6155,7 +6152,7 @@ msgstr ""
 "danych typu blob.\n"
 "Przykład: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3512
+#: ../clients/cli/settings.c:3505
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -6169,7 +6166,7 @@ msgstr ""
 "surowych danych typu blob.\n"
 "Przykład: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3583
+#: ../clients/cli/settings.c:3576
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -6190,7 +6187,7 @@ msgstr ""
 "Przykłady: ab0455a6ea3a74C2\n"
 "           ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3704
+#: ../clients/cli/settings.c:3697
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -6221,33 +6218,33 @@ msgstr ""
 "\n"
 "Przykład: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3735
+#: ../clients/cli/settings.c:3728
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "„%s†nie jest prawidłowym adresem MAC InfiniBand"
 
-#: ../clients/cli/settings.c:3772
+#: ../clients/cli/settings.c:3765
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "„%s†nie jest prawidłowym P_Key IBoIP"
 
-#: ../clients/cli/settings.c:3803
+#: ../clients/cli/settings.c:3796
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr ""
 "„%s†jest nieprawidłowe (format: ip[/przedrostek] [next-hop] [parametry])"
 
-#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
+#: ../clients/cli/settings.c:3844 ../clients/cli/settings.c:3863
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "nieprawidÅ‚owy adres IPv4 „%sâ€"
 
-#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
+#: ../clients/cli/settings.c:3869 ../clients/cli/settings.c:4177
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera serwera DNS „%sâ€"
 
-#: ../clients/cli/settings.c:3888
+#: ../clients/cli/settings.c:3881
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -6257,22 +6254,22 @@ msgstr ""
 "\n"
 "Przykład: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
+#: ../clients/cli/settings.c:3917 ../clients/cli/settings.c:4231
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera domeny wyszukiwania DNS „%sâ€"
 
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#: ../clients/cli/settings.c:3955 ../clients/cli/settings.c:4269
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera opcji DNS „%sâ€"
 
-#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
+#: ../clients/cli/settings.c:4009 ../clients/cli/settings.c:4322
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera adresu IP „%sâ€"
 
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:4022
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6286,17 +6283,17 @@ msgstr ""
 "\n"
 "Przykład: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#: ../clients/cli/settings.c:4038 ../clients/cli/settings.c:4351
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "nieprawidÅ‚owy adres bramy „%sâ€"
 
-#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#: ../clients/cli/settings.c:4093 ../clients/cli/settings.c:4406
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera trasy „%sâ€"
 
-#: ../clients/cli/settings.c:4113
+#: ../clients/cli/settings.c:4106
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6319,12 +6316,12 @@ msgstr ""
 "Przykłady: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "           10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
+#: ../clients/cli/settings.c:4152 ../clients/cli/settings.c:4171
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "nieprawidÅ‚owy adres IPv6 „%sâ€"
 
-#: ../clients/cli/settings.c:4196
+#: ../clients/cli/settings.c:4189
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -6345,7 +6342,7 @@ msgstr ""
 "\n"
 "Przykład: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4342
+#: ../clients/cli/settings.c:4335
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6359,7 +6356,7 @@ msgstr ""
 "\n"
 "Przykład: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4426
+#: ../clients/cli/settings.c:4419
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6384,28 +6381,28 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4436 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "„%s†nie jest liczbą"
 
-#: ../clients/cli/settings.c:4450
+#: ../clients/cli/settings.c:4443
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "„%s†jest nieprawidłowe; należy użyć 0, 1 lub 2"
 
-#: ../clients/cli/settings.c:4497
+#: ../clients/cli/settings.c:4490
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "„%s†nie jest prawidłowym kanałem; należy użyć <1-13>"
 
-#: ../clients/cli/settings.c:4534
+#: ../clients/cli/settings.c:4527
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "„%s†jest nieprawidłowe; należy użyć [e, o, n]"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4555
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -6423,16 +6420,16 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/mój-zespół.conf\n"
 
-#: ../clients/cli/settings.c:4602
+#: ../clients/cli/settings.c:4595
 msgid "no priority to remove"
 msgstr "brak priorytetu do usunięcia"
 
-#: ../clients/cli/settings.c:4606
+#: ../clients/cli/settings.c:4599
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "indeks „%d†jest poza zakresem <0-%d>"
 
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4638
 #, c-format
 msgid ""
 "Warning: only one mapping at a time is supported; taking the first one (%s)\n"
@@ -6440,17 +6437,17 @@ msgstr ""
 "Ostrzeżenie: obsługiwane jest tylko jedno mapowanie na raz; przyjmowanie "
 "pierwszego (%s)\n"
 
-#: ../clients/cli/settings.c:4652
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera mapowania „%sâ€"
 
-#: ../clients/cli/settings.c:4700
+#: ../clients/cli/settings.c:4693
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "„%s†nie może być puste"
 
-#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../clients/cli/settings.c:4767 ../clients/cli/settings.c:4934
 #: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
 #: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
 #: ../libnm-util/nm-setting-wireless.c:859
@@ -6459,17 +6456,17 @@ msgstr "„%s†nie może być puste"
 msgid "'%s' is not a valid MAC address"
 msgstr "„%s†nie jest prawidłowym adresem MAC"
 
-#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4773 ../clients/cli/settings.c:4940
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera adresu MAC „%sâ€"
 
-#: ../clients/cli/settings.c:4799
+#: ../clients/cli/settings.c:4792
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "„%s†jest nieprawidłowe; powinny zostać podane dwa lub trzy ciągi"
 
-#: ../clients/cli/settings.c:4813
+#: ../clients/cli/settings.c:4806
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6479,12 +6476,12 @@ msgstr ""
 "\n"
 "Przykład: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4835
+#: ../clients/cli/settings.c:4828
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "wartość ciągu „%s†powinna składać się z 1-199 znaków"
 
-#: ../clients/cli/settings.c:4867
+#: ../clients/cli/settings.c:4860
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6495,28 +6492,28 @@ msgstr ""
 "  opcja = <wartość>, opcja = <wartość>,…\n"
 "Prawidłowe opcje: %s\n"
 
-#: ../clients/cli/settings.c:4913
+#: ../clients/cli/settings.c:4906
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "„%s†nie jest prawidłowym kanałem"
 
-#: ../clients/cli/settings.c:4919
+#: ../clients/cli/settings.c:4912
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "„%ld†nie jest prawidłowym kanałem"
 
-#: ../clients/cli/settings.c:5013
+#: ../clients/cli/settings.c:5006
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "nieprawidÅ‚owa opcja „%sâ€, należy użyć „defaultâ€, „never†lub „alwaysâ€"
 
-#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
-#: ../clients/cli/settings.c:5152
+#: ../clients/cli/settings.c:5067 ../clients/cli/settings.c:5106
+#: ../clients/cli/settings.c:5145
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "wÅ‚aÅ›ciwość nie zawiera protokoÅ‚u „%sâ€"
 
-#: ../clients/cli/settings.c:5191
+#: ../clients/cli/settings.c:5184
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -6525,23 +6522,23 @@ msgstr ""
 "„%s†nie jest zgodne z %s „%sâ€, proszÄ™ zmienić klucz lub ustawić najpierw "
 "właściwe %s."
 
-#: ../clients/cli/settings.c:5199
+#: ../clients/cli/settings.c:5192
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Klucz WEP jest prawdopodobnie typu „%sâ€\n"
 
-#: ../clients/cli/settings.c:5201
+#: ../clients/cli/settings.c:5194
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "Ustawiono indeks klucza WEP na „%dâ€\n"
 
-#: ../clients/cli/settings.c:5224
+#: ../clients/cli/settings.c:5217
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "„%s†nie jest jednym z [0 (unknown), 1 (key), 2 (passphrase)]"
 
-#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
-#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
+#: ../clients/cli/settings.c:5233 ../clients/cli/settings.c:5236
+#: ../clients/cli/settings.c:5239 ../clients/cli/settings.c:5242
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6550,7 +6547,7 @@ msgstr ""
 "Ostrzeżenie: „%s†nie jest zgodne z typem „%sâ€, proszÄ™ zmienić lub usunąć "
 "klucz.\n"
 
-#: ../clients/cli/settings.c:5262
+#: ../clients/cli/settings.c:5255
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6559,36 +6556,36 @@ msgstr ""
 "ProszÄ™ podać typ kluczy WEP. Możliwe wartoÅ›ci: 0 lub „unknownâ€, 1 lub „key†"
 "i 2 lub „passphraseâ€.\n"
 
-#: ../clients/cli/settings.c:5275
+#: ../clients/cli/settings.c:5268
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "„%s†nie jest prawidłowym PSK"
 
-#: ../clients/cli/settings.c:5319
+#: ../clients/cli/settings.c:5312
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "„%s†nie jest prawidłową flagą DCB"
 
-#: ../clients/cli/settings.c:5342
+#: ../clients/cli/settings.c:5335
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "„%s†nie jest prawidłowym priorytetem aplikacji DCB"
 
-#: ../clients/cli/settings.c:5368
+#: ../clients/cli/settings.c:5361
 msgid "must contain 8 comma-separated numbers"
 msgstr "musi zawierać osiem liczb oddzielonych przecinkami"
 
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5378
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "„%s†nie jest liczbą między 0 a %u (włącznie) lub %u"
 
-#: ../clients/cli/settings.c:5388
+#: ../clients/cli/settings.c:5381
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "„%s†nie jest liczbą między 0 a %u (włącznie)"
 
-#: ../clients/cli/settings.c:5410
+#: ../clients/cli/settings.c:5403
 #, c-format
 msgid ""
 "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
@@ -6598,42 +6595,42 @@ msgstr ""
 "(włączone)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5463
+#: ../clients/cli/settings.c:5456
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "procenty szerokości pasma muszą razem wynosić 100%%"
 
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+#: ../clients/cli/settings.c:5542 ../clients/cli/settings.c:5548
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr "Identyfikator operatora SIM musi być kodem MCCMNC o 5 lub 6 liczbach"
 
-#: ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5591
 #, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "nieprawidÅ‚owa opcja „%sâ€, należy użyć „%s†lub „%sâ€"
 
-#: ../clients/cli/settings.c:7644
+#: ../clients/cli/settings.c:7637
 msgid "don't know how to get the property value"
 msgstr "nie wiadomo, jak uzyskać wartość właściwości"
 
-#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
+#: ../clients/cli/settings.c:7690 ../clients/cli/settings.c:7730
 msgid "the property can't be changed"
 msgstr "nie można zmieniać tej właściwości"
 
-#: ../clients/cli/settings.c:7821
+#: ../clients/cli/settings.c:7814
 msgid "(not available)"
 msgstr "(niedostępne)"
 
-#: ../clients/cli/settings.c:7846
+#: ../clients/cli/settings.c:7839
 msgid "[NM property description]"
 msgstr "[opis właściwości NM]"
 
-#: ../clients/cli/settings.c:7851
+#: ../clients/cli/settings.c:7844
 msgid "[nmcli specific description]"
 msgstr "[konkretny opis nmcli]"
 
 #. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:7900
+#: ../clients/cli/settings.c:7893
 msgid "<hidden>"
 msgstr "<ukryte>"
 
@@ -6652,82 +6649,53 @@ msgstr "Błąd: oczekiwano parametru „%sâ€, ale podano „%sâ€."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Błąd: nieoczekiwany parametr „%sâ€"
 
-#: ../clients/cli/utils.c:202
-#, c-format
-msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "Błąd podczas konwertowania adresu IPv4 „0x%X†na formę tekstową"
-
-#: ../clients/cli/utils.c:230
-#, c-format
-msgid "Error converting IP6 address '%s' to text form"
-msgstr "Błąd podczas konwertowania adresu IPv6 „%s†na formę tekstową"
-
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "„%s†jest niejednoznaczne (%s)"
 
-#: ../clients/cli/utils.c:556
+#: ../clients/cli/utils.c:502
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "„%s†jest nieprawidłowe; należy użyć [%s] lub [%s]"
 
-#: ../clients/cli/utils.c:589
+#: ../clients/cli/utils.c:535
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "„%s†jest nieprawidłowe; należy użyć [%s], [%s] lub [%s]"
 
-#: ../clients/cli/utils.c:688
+#: ../clients/cli/utils.c:634
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "„%s†jest niejednoznaczne (%s x %s)"
 
-#: ../clients/cli/utils.c:700
+#: ../clients/cli/utils.c:646
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "brak nazwy, należy spróbować jednej z [%s]"
 
-#: ../clients/cli/utils.c:964
+#: ../clients/cli/utils.c:893
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "pole „%s†musi być same"
 
-#: ../clients/cli/utils.c:967
+#: ../clients/cli/utils.c:896
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "nieprawidÅ‚owe pole „%sâ€; dozwolone pola: %s"
 
-#: ../clients/cli/utils.c:1024
+#: ../clients/cli/utils.c:953
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opcja „--terse†wymaga podania opcji „--fieldsâ€"
 
-#: ../clients/cli/utils.c:1028
+#: ../clients/cli/utils.c:957
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opcja „--terse†wymaga konkretnej wartoÅ›ci opcji „--fieldsâ€, nie „%sâ€"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Ostrzeżenie: wersje programu nmcli (%s) i usługi NetworkManager (%s) się nie "
-"zgadzają. Użycie opcji --nocheck ukrywa ostrzeżenie.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Błąd: wersje programu nmcli (%s) i usługi NetworkManager (%s) się nie "
-"zgadzają. Wymuszono wykonanie używając opcji --nocheck, ale wynik może być "
-"nieprzewidywalny."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Sesja uwierzytelnienia jest już w drodze."
@@ -6751,7 +6719,8 @@ msgstr "Nazwa użytkownika"
 #: ../clients/common/nm-secret-agent-simple.c:525
 #: ../clients/common/nm-vpn-helpers.c:101
 #: ../clients/common/nm-vpn-helpers.c:102
-#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:106
+#: ../clients/common/nm-vpn-helpers.c:109 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6835,20 +6804,28 @@ msgid "could not get VPN plugin info"
 msgstr "nie można uzyskać informacji o wtyczce VPN"
 
 #: ../clients/common/nm-vpn-helpers.c:103
-#: ../clients/common/nm-vpn-helpers.c:106
+msgid "Certificate password"
+msgstr "Hasło certyfikatu"
+
+#: ../clients/common/nm-vpn-helpers.c:104
+msgid "HTTP proxy password"
+msgstr "Hasło pośrednika HTTP"
+
+#: ../clients/common/nm-vpn-helpers.c:107
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Group password"
 msgstr "Hasło grupy"
 
-#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:112 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Brama"
 
-#: ../clients/common/nm-vpn-helpers.c:109
+#: ../clients/common/nm-vpn-helpers.c:113
 msgid "Cookie"
 msgstr "Ciasteczko"
 
-#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:114
 msgid "Gateway certificate hash"
 msgstr "Suma kontrolna certyfikatu bramy"
 
@@ -9019,37 +8996,37 @@ msgstr "Archiwa biblioteki libtool nie są obsługiwane (%s)"
 msgid "Could not find \"%s\" binary"
 msgstr "Nie można odnaleźć pliku binarnego „%sâ€"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:132
+#: ../libnm-core/nm-vpn-editor-plugin.c:142
 #, c-format
-msgid "cannot load plugin %s"
-msgstr "nie można wczytać wtyczki %s"
+msgid "cannot load plugin \"%s\": %s"
+msgstr "nie można wczytać wtyczki „%sâ€: %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:160
+#: ../libnm-core/nm-vpn-editor-plugin.c:153
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr "nie można wczytać wtyczki VPN w „%sâ€: brak nazwy wtyczki"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:167
-#, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr "nie można wczytać wtyczki VPN w „%sâ€: nieprawidÅ‚owa nazwa usÅ‚ugi"
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "wczytanie „nm_vpn_editor_plugin_factory()†z %s się nie powiodło (%s)"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:183
+#: ../libnm-core/nm-vpn-editor-plugin.c:178
 #, c-format
 msgid "unknown error initializing plugin %s"
 msgstr "nieznany błąd podczas inicjowania wtyczki %s"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:195
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr "wczytanie „nm_vpn_editor_plugin_factory()†z %s się nie powiodło (%s)"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr "nie można wczytać wtyczki VPN w „%sâ€: brak nazwy wtyczki"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:256
+#: ../libnm-core/nm-vpn-editor-plugin.c:204
+#, c-format
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "nie można wczytać wtyczki VPN w „%sâ€: nieprawidÅ‚owa nazwa usÅ‚ugi"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:310
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "wtyczka nie obsługuje importowania"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:276
+#: ../libnm-core/nm-vpn-editor-plugin.c:330
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "wtyczka nie obsługuje eksportowania"
@@ -9514,17 +9491,17 @@ msgid ""
 msgstr ""
 "Polityka systemu powstrzymuje modyfikację trwałej globalnej konfiguracji DNS"
 
-#: ../shared/nm-shared-utils.c:174
+#: ../shared/nm-shared-utils.c:185
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "klasa obiektów „%s†nie posiada wÅ‚aÅ›ciwoÅ›ci o nazwie „%sâ€"
 
-#: ../shared/nm-shared-utils.c:181
+#: ../shared/nm-shared-utils.c:192
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "właściwość „%s†klasy obiektów „%s†nie jest zapisywalna"
 
-#: ../shared/nm-shared-utils.c:188
+#: ../shared/nm-shared-utils.c:199
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -9532,19 +9509,19 @@ msgstr ""
 "właściwość konstruktu „%s†dla obiektu „%s†nie może zostać ustawiona po "
 "konstrukcji"
 
-#: ../shared/nm-shared-utils.c:196
+#: ../shared/nm-shared-utils.c:207
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "„%s::%s†nie jest prawidłową nazwą właściwości; „%s†nie jest podtypem "
 "GObject"
 
-#: ../shared/nm-shared-utils.c:205
+#: ../shared/nm-shared-utils.c:216
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "nie można ustawić wÅ‚aÅ›ciwoÅ›ci „%s†typu „%s†z wartoÅ›ci typu „%sâ€"
 
-#: ../shared/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:227
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9730,8 +9707,8 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Nieznany/nieobsługiwany typ połączenia Bluetooth"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../src/devices/nm-device-ethernet.c:1420
+#: ../src/devices/nm-device-infiniband.c:193
 #: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "połączenie nie pasuje do urządzenia"
@@ -9744,11 +9721,11 @@ msgstr "Połączenie wiązane"
 msgid "Bridge connection"
 msgstr "Połączenie mostkowane"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "PPPoE connection"
 msgstr "Połączenie PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "Wired connection"
 msgstr "Połączenie przewodowe"
 
@@ -9757,7 +9734,7 @@ msgstr "Połączenie przewodowe"
 msgid "Wired connection %d"
 msgstr "Połączenie przewodowe %d"
 
-#: ../src/devices/nm-device-infiniband.c:174
+#: ../src/devices/nm-device-infiniband.c:175
 msgid "InfiniBand connection"
 msgstr "Połączenie InfiniBand"
 
@@ -9765,7 +9742,7 @@ msgstr "Połączenie InfiniBand"
 msgid "IP tunnel connection"
 msgstr "Połączenie tunelu IP"
 
-#: ../src/devices/nm-device-macvlan.c:428
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
 msgstr "Połączenie MACVLAN"
 
@@ -9773,7 +9750,7 @@ msgstr "Połączenie MACVLAN"
 msgid "TUN connection"
 msgstr "Połączenie TUN"
 
-#: ../src/devices/nm-device-vlan.c:447
+#: ../src/devices/nm-device-vlan.c:457
 msgid "VLAN connection"
 msgstr "Połączenie VLAN"
 
@@ -10128,7 +10105,7 @@ msgstr "Nieznany poziom dziennika „%sâ€"
 msgid "Unknown log domain '%s'"
 msgstr "Nieznana domena dziennika „%sâ€"
 
-#: ../src/nm-manager.c:3625
+#: ../src/nm-manager.c:3635
 msgid "VPN connection"
 msgstr "Połączenie VPN"
 
diff --git a/po/pt.po b/po/pt.po
index 238f5a97..e86d9c30 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4773,8 +4773,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5749,20 +5747,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 71008329..ddb94f22 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,10 +12,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network"
-"Manager&keywords=I18N+L10N&component=Translations\n"
-"POT-Creation-Date: 2016-04-04 01:29+0000\n"
-"PO-Revision-Date: 2016-04-06 13:08-0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
+"POT-Creation-Date: 2016-05-04 02:03+0000\n"
+"PO-Revision-Date: 2016-05-04 08:14-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -23,7 +23,7 @@ msgstr ""
 "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.1\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../clients/cli/agent.c:39
@@ -111,14 +111,14 @@ msgstr "Erro: inicialização do agente de polkit falhou: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli registrado com sucesso como um agente de polkit.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
-#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11054
+#: ../clients/cli/devices.c:3644 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:481
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Erro: O NetworkManager não está em execução."
 
-#: ../clients/cli/agent.c:242
+#: ../clients/cli/agent.c:239
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Erro: comando de \"%s\" de \"agente\" não é válido."
@@ -240,7 +240,7 @@ msgstr "conectando (iniciando conexões secundárias)"
 msgid "connected"
 msgstr "conectado"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:645
 msgid "deactivating"
 msgstr "desativando"
 
@@ -249,25 +249,25 @@ msgid "connection failed"
 msgstr "falha na conexão"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
-#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/connections.c:650 ../clients/cli/connections.c:673
+#: ../clients/cli/connections.c:1946 ../clients/cli/devices.c:1024
 #: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
 #: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/general.c:429 ../clients/cli/general.c:445
 #: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
 #: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../clients/cli/settings.c:3198
 #, c-format
 msgid "unknown"
 msgstr "desconhecido"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:930
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934
+#: ../clients/cli/connections.c:968 ../clients/cli/connections.c:1037
+#: ../clients/cli/connections.c:1038 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:3454 ../clients/cli/connections.c:8567
+#: ../clients/cli/connections.c:8568 ../clients/cli/devices.c:772
 #: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
 #: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
 #: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
@@ -276,15 +276,15 @@ msgstr "desconhecido"
 #: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
 #: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
 #: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../clients/cli/general.c:439 ../clients/cli/settings.c:3193
 msgid "yes"
 msgstr "sim"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:930
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934
+#: ../clients/cli/connections.c:1037 ../clients/cli/connections.c:1038
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:3455
+#: ../clients/cli/connections.c:8567 ../clients/cli/connections.c:8568
 #: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
 #: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
 #: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
@@ -293,8 +293,8 @@ msgstr "sim"
 #: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
 #: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
 #: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
-#: ../clients/cli/settings.c:3202
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:441
+#: ../clients/cli/settings.c:3195
 msgid "no"
 msgstr "não"
 
@@ -311,7 +311,7 @@ msgid "No reason given"
 msgstr "Nenhuma razão fornecida"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2980
 #, c-format
 msgid "Unknown error"
 msgstr "Erro desconhecido"
@@ -781,7 +781,7 @@ msgstr "OBJETO-ESPEC"
 #. 4
 #. Ask for optional 'vpn' arguments.
 #: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/cli/connections.c:4173 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -852,7 +852,7 @@ msgstr "IP6"
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:272
+#: ../clients/cli/connections.c:269
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -900,16 +900,16 @@ msgstr ""
 "  show [--active] [--order <especificação da ordem>]\n"
 "  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <nome-if>] [ap <BSSID>] [passwd-file <"
-"arquivo com senhas>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <nome-if>] [ap <BSSID>] [passwd-file "
+"<arquivo com senhas>]\n"
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add OPÇÕES_COMUNS OPÇÕES_ESPECÃFICAS_TIPO OPÇÕES_IP [-- "
-"([+|-]<definição>.<propriedade> <valor>)+]\n"
+"  add OPÇÕES_COMUNS OPÇÕES_ESPECÃFICAS_TIPO OPÇÕES_IP [-- ([+|-]<definição>."
+"<propriedade> <valor>)+]\n"
 "\n"
-"  modify [--temporary] [id | uuid | path] <ID> "
-"([+|-]<definição>.<propriedade> <valor>)+\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<definição>."
+"<propriedade> <valor>)+\n"
 "\n"
 "  clone [--temporary] [id | uuid | path ] <ID> <novo nome>\n"
 "\n"
@@ -929,7 +929,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<arquivo de saída>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:294
+#: ../clients/cli/connections.c:291
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -975,7 +975,7 @@ msgstr ""
 "perfis ativos são levados em conta. Use a opção global --show-secrets para\n"
 "também revelar segredos associados.\n"
 
-#: ../clients/cli/connections.c:315
+#: ../clients/cli/connections.c:312
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1008,8 +1008,8 @@ msgstr ""
 "por\n"
 "seu nome, UUID ou caminho do D-Bus.\n"
 "\n"
-"ARGUMENTOS := ifname <nome-if> [ap <BSSID>] [nsp <nome>] [passwd-file <"
-"arquivo com senhas>]\n"
+"ARGUMENTOS := ifname <nome-if> [ap <BSSID>] [nsp <nome>] [passwd-file "
+"<arquivo com senhas>]\n"
 "\n"
 "Ativa um dispositivo com uma conexão. O perfil da conexão é selecionado\n"
 "automaticamente pelo NetworkManager.\n"
@@ -1020,7 +1020,7 @@ msgstr ""
 "passwd-file - arquivo com senha(s) necessária(s) para ativar a conexão\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:333
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1042,7 +1042,7 @@ msgstr ""
 "seu nome, UUID ou caminho do D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:348
+#: ../clients/cli/connections.c:345
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1243,8 +1243,8 @@ msgstr ""
 "\n"
 "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
 "| broadcast (3) |\n"
-"                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]"
-"\n"
+"                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
+"(6)]\n"
 "                  [primary <nome da interface>]\n"
 "                  [miimon <núm>]\n"
 "                  [downdelay <núm>]\n"
@@ -1253,13 +1253,13 @@ msgstr ""
 "                  [arp-ip-target <núm>]\n"
 "                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <(nome interface ou nome ou UUID da conexão) mestre>"
-"\n"
+"    bond-slave:   master <(nome interface ou nome ou UUID da conexão) "
+"mestre>\n"
 "\n"
 "    team:         [config <arquivo>|<dados JSON não-tratados>]\n"
 "\n"
-"    team-slave:   master <(nome interface ou nome ou UUID da conexão) mestre>"
-"\n"
+"    team-slave:   master <(nome interface ou nome ou UUID da conexão) "
+"mestre>\n"
 "                  [config <arquivo>|<dados JSON não-tratados>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
@@ -1271,14 +1271,14 @@ msgstr ""
 "                  [multicast-snooping yes|no]\n"
 "                  [mac <endereço MAC>]\n"
 "\n"
-"    bridge-slave: master <(nome interface ou nome ou UUID da conexão) mestre>"
-"\n"
+"    bridge-slave: master <(nome interface ou nome ou UUID da conexão) "
+"mestre>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <nome de usuário>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -1326,7 +1326,7 @@ msgstr ""
 "                  [ip6 <endereço IPv6>] [gw6 <gateway IPv6>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:460
+#: ../clients/cli/connections.c:457
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1364,8 +1364,8 @@ msgstr ""
 "\n"
 "Exemplos:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -1373,7 +1373,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:483
+#: ../clients/cli/connections.c:480
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1396,7 +1396,7 @@ msgstr ""
 "argumento <novo nome>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:492
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1423,7 +1423,7 @@ msgstr ""
 "Adiciona um novo perfil de conexão em um editor interativo.\n"
 "\n"
 
-#: ../clients/cli/connections.c:510
+#: ../clients/cli/connections.c:507
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1442,7 +1442,7 @@ msgstr ""
 "O perfil é identificado por seu nome, UUID ou caminho de D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:521
+#: ../clients/cli/connections.c:518
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1463,7 +1463,7 @@ msgstr ""
 "Monitora todos os perfis de conexão no caso de nenhuma ser especificada.\n"
 "\n"
 
-#: ../clients/cli/connections.c:533
+#: ../clients/cli/connections.c:530
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1476,7 +1476,7 @@ msgstr ""
 "Recarrega todos os arquivos de conexão do disco.\n"
 "\n"
 
-#: ../clients/cli/connections.c:541
+#: ../clients/cli/connections.c:538
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1498,7 +1498,7 @@ msgstr ""
 "saiba do seu último estado.\n"
 "\n"
 
-#: ../clients/cli/connections.c:553
+#: ../clients/cli/connections.c:550
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1516,14 +1516,14 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [--temporary] type <tipo> file <arquivo a ser importado>\n"
 "\n"
-"Importa uma configuração externa como o perfil de conexão do NetworkManager."
-"\n"
+"Importa uma configuração externa como o perfil de conexão do "
+"NetworkManager.\n"
 "O tipo de arquivo de entrada é especificado pela opção type.\n"
 "Apenas configurações de VPN possuem suporte no momento. A configuração\n"
 "é importada pelos plug-ins VPN do NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:566
+#: ../clients/cli/connections.c:563
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1543,197 +1543,197 @@ msgstr ""
 "se um nome for informado.\n"
 "\n"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:641
 msgid "activating"
 msgstr "ativando"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:643
 msgid "activated"
 msgstr "ativado"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:647
 msgid "deactivated"
 msgstr "desativado"
 
-#: ../clients/cli/connections.c:662
+#: ../clients/cli/connections.c:659
 msgid "VPN connecting (prepare)"
 msgstr "Conexão VPN (preparando)"
 
-#: ../clients/cli/connections.c:664
+#: ../clients/cli/connections.c:661
 msgid "VPN connecting (need authentication)"
 msgstr "Conexão VPN (precisa de autenticação)"
 
-#: ../clients/cli/connections.c:666
+#: ../clients/cli/connections.c:663
 msgid "VPN connecting"
 msgstr "Conexão VPN"
 
-#: ../clients/cli/connections.c:668
+#: ../clients/cli/connections.c:665
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Conexão VPN (obtendo configuração de IP)"
 
-#: ../clients/cli/connections.c:670
+#: ../clients/cli/connections.c:667
 msgid "VPN connected"
 msgstr "VPN conectada"
 
-#: ../clients/cli/connections.c:672
+#: ../clients/cli/connections.c:669
 msgid "VPN connection failed"
 msgstr "Conexão VPN falhou"
 
-#: ../clients/cli/connections.c:674
+#: ../clients/cli/connections.c:671
 msgid "VPN disconnected"
 msgstr "VPN desconectada"
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:741
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Erro ao atualizar segredos para %s: %s\n"
 
-#: ../clients/cli/connections.c:764
+#: ../clients/cli/connections.c:761
 msgid "Connection profile details"
 msgstr "Detalhes do perfil de conexão"
 
-#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#: ../clients/cli/connections.c:773 ../clients/cli/connections.c:1166
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Erro: \"connection show\": %s"
 
-#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
+#: ../clients/cli/connections.c:929 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "nunca"
 
-#: ../clients/cli/connections.c:1157
+#: ../clients/cli/connections.c:1154
 msgid "Activate connection details"
 msgstr "Ativar detalhes da conexão"
 
-#: ../clients/cli/connections.c:1393
+#: ../clients/cli/connections.c:1390
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "campo inválido \"%s\"; campos permitidos: %s e %s, ou %s,%s"
 
-#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#: ../clients/cli/connections.c:1405 ../clients/cli/connections.c:1413
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "\"%s\" tem que ser um só"
 
 #. Add headers
-#: ../clients/cli/connections.c:1634
+#: ../clients/cli/connections.c:1631
 msgid "NetworkManager active profiles"
 msgstr "Perfis ativos do NetworkManager"
 
-#: ../clients/cli/connections.c:1635
+#: ../clients/cli/connections.c:1632
 msgid "NetworkManager connection profiles"
 msgstr "Perfis de conexão do NetworkManager"
 
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
-#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
-#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
-#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
-#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
-#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
-#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
-#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
-#: ../clients/cli/devices.c:3503
+#: ../clients/cli/connections.c:1678 ../clients/cli/connections.c:2393
+#: ../clients/cli/connections.c:2415 ../clients/cli/connections.c:2424
+#: ../clients/cli/connections.c:2433 ../clients/cli/connections.c:2592
+#: ../clients/cli/connections.c:10160 ../clients/cli/connections.c:10277
+#: ../clients/cli/connections.c:10409 ../clients/cli/connections.c:10542
+#: ../clients/cli/connections.c:10652 ../clients/cli/connections.c:10663
+#: ../clients/cli/connections.c:10762 ../clients/cli/devices.c:2322
+#: ../clients/cli/devices.c:2330 ../clients/cli/devices.c:2653
+#: ../clients/cli/devices.c:2660 ../clients/cli/devices.c:2674
+#: ../clients/cli/devices.c:2681 ../clients/cli/devices.c:2698
+#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2719
+#: ../clients/cli/devices.c:3083 ../clients/cli/devices.c:3090
+#: ../clients/cli/devices.c:3097 ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3122 ../clients/cli/devices.c:3129
+#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3481
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erro: está faltando o argumento %s."
 
-#: ../clients/cli/connections.c:1696
+#: ../clients/cli/connections.c:1693
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Erro: %s - perfil de conexão inexistente."
 
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../clients/cli/connections.c:1752 ../clients/cli/connections.c:2456
+#: ../clients/cli/connections.c:11163 ../clients/cli/devices.c:3270
+#: ../clients/cli/devices.c:3751 ../clients/cli/general.c:536
+#: ../clients/cli/general.c:585 ../clients/cli/general.c:602
+#: ../clients/cli/general.c:641 ../clients/cli/general.c:655
+#: ../clients/cli/general.c:773 ../clients/cli/general.c:820
+#: ../clients/cli/general.c:840
 #, c-format
 msgid "Error: %s."
 msgstr "Erro: %s."
 
-#: ../clients/cli/connections.c:1851
+#: ../clients/cli/connections.c:1848
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "nenhuma conexão ativa no dispositivo \"%s\""
 
-#: ../clients/cli/connections.c:1859
+#: ../clients/cli/connections.c:1856
 msgid "no active connection or device"
 msgstr "nenhuma conexão ou dispositivo ativo"
 
-#: ../clients/cli/connections.c:1910
+#: ../clients/cli/connections.c:1907
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "dispositivo \"%s\" não é compatível com a conexão \"%s\""
 
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nenhum dispositivo encontrado para a conexão \"%s\""
 
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:1922
 msgid "unknown reason"
 msgstr "razão desconhecida"
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:1924 ../clients/cli/general.c:277
 msgid "none"
 msgstr "nenhum(a)"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:1926
 msgid "the user was disconnected"
 msgstr "o usuário foi desconectado"
 
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:1928
 msgid "the base network connection was interrupted"
 msgstr "a conexão base de rede foi interrompida"
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:1930
 msgid "the VPN service stopped unexpectedly"
 msgstr "o serviço VPN parou inesperadamente"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:1932
 msgid "the VPN service returned invalid configuration"
 msgstr "o serviço VPN retornou uma configuração inválida"
 
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:1934
 msgid "the connection attempt timed out"
 msgstr "a tentativa de conexão esgotou o tempo limite"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:1936
 msgid "the VPN service did not start in time"
 msgstr "o serviço VPN não iniciou a tempo"
 
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:1938
 msgid "the VPN service failed to start"
 msgstr "o serviço VPN falhou ao iniciar"
 
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:1940
 msgid "no valid VPN secrets"
 msgstr "sem segredos VPN válidos"
 
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:1942
 msgid "invalid VPN secrets"
 msgstr "segredos VPN inválidos"
 
-#: ../clients/cli/connections.c:1947
+#: ../clients/cli/connections.c:1944
 msgid "the connection was removed"
 msgstr "a conexão foi removida"
 
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:1966 ../clients/cli/connections.c:2001
+#: ../clients/cli/connections.c:2162 ../clients/cli/connections.c:8458
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexão ativada com sucesso (caminho D-Bus ativo: %s)\n"
 
-#: ../clients/cli/connections.c:1976
+#: ../clients/cli/connections.c:1974
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1742,203 +1742,204 @@ msgstr ""
 "Conexão ativada com sucesso (mestre aguardando por escravos) (caminho D-Bus "
 "ativo: %s)\n"
 
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:1981 ../clients/cli/connections.c:1984
+#: ../clients/cli/connections.c:2006
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Erro: Ativação da conexão falhou."
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2057
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexão VPN ativada com sucesso (caminho D-Bus ativo: %s)\n"
 
-#: ../clients/cli/connections.c:2061
+#: ../clients/cli/connections.c:2065
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Erro: Ativação da conexão falhou: %s."
 
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
+#: ../clients/cli/connections.c:2084 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erro: Tempo limite de %d seg expirou."
 
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2144
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erro: Ativação da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:2225
+#: ../clients/cli/connections.c:2229
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "falha ao ler arquivo-passwd \"%s\": %s"
 
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2241
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "faltando vírgula na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2249
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "faltando ponto na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2262
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "nome inválido de definição na entrada \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2318
 #, c-format
 msgid "unknown device '%s'."
 msgstr "dispositivo \"%s\" desconhecido."
 
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2323
 msgid "neither a valid connection nor device given"
 msgstr "não há uma conexão válida nem um dispositivo fornecido"
 
-#: ../clients/cli/connections.c:2402
+#: ../clients/cli/connections.c:2406
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Erro: Conexão \"%s\" não existe."
 
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
-#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
-#: ../clients/cli/devices.c:3336
+#: ../clients/cli/connections.c:2441 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2336 ../clients/cli/devices.c:2730
+#: ../clients/cli/devices.c:3314
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parâmetro desconhecido: %s\n"
 
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2466
 msgid "preparing"
 msgstr "preparando"
 
-#: ../clients/cli/connections.c:2483
+#: ../clients/cli/connections.c:2487
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "A conexão \"%s\" (%s) foi excluída com sucesso.\n"
 
-#: ../clients/cli/connections.c:2499
+#: ../clients/cli/connections.c:2503
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "Conexão \"%s\" desativada com sucesso (caminho D-Bus ativo: %s)\n"
 
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2574 ../clients/cli/connections.c:10395
+#: ../clients/cli/connections.c:10594
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Erro: nenhuma conexão especificada."
 
-#: ../clients/cli/connections.c:2602
+#: ../clients/cli/connections.c:2606
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Erro: \"%s\" não é uma conexão ativa.\n"
 
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#: ../clients/cli/connections.c:2607 ../clients/cli/connections.c:10424
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Erro: nem todas as conexões ativas foram encontradas."
 
-#: ../clients/cli/connections.c:2612
+#: ../clients/cli/connections.c:2616
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Erro: não foi fornecida nenhuma conexão ativa."
 
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:2959 ../clients/cli/utils.c:648
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "\"%s\" não está entre [%s]"
 
-#: ../clients/cli/connections.c:3032
+#: ../clients/cli/connections.c:3036
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Erro: \"%s\": \"%s\" não é um endereço MAC %s válido."
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/cli/connections.c:3037 ../clients/cli/connections.c:3569
 #: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
 #: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../clients/cli/connections.c:3037 ../clients/tui/nm-editor-utils.c:146
 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3053
+#: ../clients/cli/connections.c:3057
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Erro: \"mtu\": \"%s\" não é um MTU válido."
 
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3073
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Erro: \"parent\": \"%s\" não é um nome de interface válido."
 
-#: ../clients/cli/connections.c:3090
+#: ../clients/cli/connections.c:3094
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Erro: a \"p-key\": \"%s\" não é uma P_KEY InfiniBand válida."
 
-#: ../clients/cli/connections.c:3105
+#: ../clients/cli/connections.c:3109
 #, c-format
 msgid "Error: '%s' is not a valid UID/GID."
 msgstr "Erro: \"%s\" não é um UID/GID válido."
 
-#: ../clients/cli/connections.c:3149
+#: ../clients/cli/connections.c:3153
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
 msgstr "Erro: \"%s\": \"%s\" não é um %s válido %s."
 
-#: ../clients/cli/connections.c:3162
+#: ../clients/cli/connections.c:3166
 msgid "Wi-Fi mode"
 msgstr "Modo Wi-Fi"
 
-#: ../clients/cli/connections.c:3171
+#: ../clients/cli/connections.c:3175
 msgid "InfiniBand transport mode"
 msgstr "Modo de transporte de InfiniBand"
 
-#: ../clients/cli/connections.c:3183
+#: ../clients/cli/connections.c:3187
 msgid "ADSL protocol"
 msgstr "Protocolo ADSL"
 
-#: ../clients/cli/connections.c:3194
+#: ../clients/cli/connections.c:3198
 msgid "ADSL encapsulation"
 msgstr "Encapsulamento ADSL"
 
-#: ../clients/cli/connections.c:3203
+#: ../clients/cli/connections.c:3207
 msgid "TUN device mode"
 msgstr "Modo de dispositivo TUN"
 
-#: ../clients/cli/connections.c:3216
+#: ../clients/cli/connections.c:3220
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Erro: \"flags\": \"%s\" não é válido; use <0-7>."
 
-#: ../clients/cli/connections.c:3238
+#: ../clients/cli/connections.c:3242
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Erro: \"%s\": \"%s\" não é válido; %s "
 
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:3420
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "Aviso: master=\"%s\" se refere a nenhum perfil existente.\n"
 
-#: ../clients/cli/connections.c:3441
+#: ../clients/cli/connections.c:3445
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Erro: \"%s\": \"%s\" não é válido; use <%u-%u>."
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
+#: ../clients/cli/connections.c:3501
 #, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
 msgstr[0] "Há %d argumento opcional para o tipo de conexão \"%s\".\n"
 msgstr[1] "Há %d argumentos opcionais para o tipo de conexão \"%s\".\n"
 
-#: ../clients/cli/connections.c:3500
+#: ../clients/cli/connections.c:3504
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1946,551 +1947,551 @@ msgstr[0] "Você deseja fornecê-lo? %s"
 msgstr[1] "Você deseja fornecê-los? %s"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
+#: ../clients/cli/connections.c:3521
 msgid "ethernet"
 msgstr "ethernet"
 
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+#: ../clients/cli/connections.c:3526 ../clients/cli/connections.c:3574
+#: ../clients/cli/connections.c:3708 ../clients/cli/connections.c:3787
 msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
+#: ../clients/cli/connections.c:3537 ../clients/cli/connections.c:3585
+#: ../clients/cli/connections.c:3680 ../clients/cli/connections.c:3719
+#: ../clients/cli/connections.c:4105
 msgid "MAC [none]: "
 msgstr "MAC [nenhum]: "
 
-#: ../clients/cli/connections.c:3544
+#: ../clients/cli/connections.c:3548
 msgid "Cloned MAC [none]: "
 msgstr "MAC clonado [nenhum]: "
 
-#: ../clients/cli/connections.c:3592
+#: ../clients/cli/connections.c:3596
 #, c-format
 msgid "Transport mode %s"
 msgstr "Modo de transporte %s"
 
-#: ../clients/cli/connections.c:3605
+#: ../clients/cli/connections.c:3609
 msgid "Parent interface [none]: "
 msgstr "Interface principal [nenhuma]: "
 
-#: ../clients/cli/connections.c:3616
+#: ../clients/cli/connections.c:3620
 msgid "P_KEY [none]: "
 msgstr "P_KEY [nenhum]: "
 
-#: ../clients/cli/connections.c:3626
+#: ../clients/cli/connections.c:3630
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Erro: \"p-key\" é obrigatório quando \"parent\" é especificado.\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../clients/cli/connections.c:3647 ../clients/tui/nm-editor-utils.c:154
 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
 msgid "Wi-Fi"
 msgstr "Sem fio (Wi-Fi)"
 
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#: ../clients/cli/connections.c:3655 ../clients/cli/connections.c:6203
 #, c-format
 msgid "Mode %s"
 msgstr "Modo %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../clients/cli/connections.c:3675 ../libnm-glib/nm-device.c:1857
 #: ../libnm/nm-device.c:1808
 msgid "WiMAX"
 msgstr "WiMAX"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
+#: ../clients/cli/connections.c:3698
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
+#: ../clients/cli/connections.c:3702 ../clients/cli/connections.c:3740
+#: ../clients/cli/connections.c:4227
 msgid "Password [none]: "
 msgstr "Senha [nenhuma]: "
 
-#: ../clients/cli/connections.c:3700
+#: ../clients/cli/connections.c:3704
 msgid "Service [none]: "
 msgstr "Serviço [nenhum]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
+#: ../clients/cli/connections.c:3734
 msgid "mobile broadband"
 msgstr "banda larga móvel"
 
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+#: ../clients/cli/connections.c:3738 ../clients/cli/connections.c:4177
 msgid "Username [none]: "
 msgstr "Nome de usuário [nenhum]: "
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
+#: ../clients/cli/connections.c:3753
 msgid "bluetooth"
 msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:3756
+#: ../clients/cli/connections.c:3760
 #, c-format
 msgid "Bluetooth type %s"
 msgstr "Bluetooth tipo %s"
 
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:3766
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Erro: o \"bt-type\": \"%s\" não é um tipo bluetooth válido.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/cli/connections.c:3782 ../clients/cli/devices.c:239
 #: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
 #: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
 #: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/cli/connections.c:3794
+#: ../clients/cli/connections.c:3798
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Sinalizadores VLAN (<0-7>) [nenhum]: "
 
-#: ../clients/cli/connections.c:3805
+#: ../clients/cli/connections.c:3809
 msgid "Ingress priority maps [none]: "
 msgstr "Mapas de prioridade de ingresso [nenhum]: "
 
-#: ../clients/cli/connections.c:3816
+#: ../clients/cli/connections.c:3820
 msgid "Egress priority maps [none]: "
 msgstr "Mapas de prioridade de egresso [nenhum]: "
 
-#: ../clients/cli/connections.c:3827
+#: ../clients/cli/connections.c:3831
 msgid "Bonding mode [balance-rr]: "
 msgstr "Modo de vinculação [balance-rr]: "
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
+#: ../clients/cli/connections.c:3847
 msgid "bond"
 msgstr "vínculo"
 
-#: ../clients/cli/connections.c:3865
+#: ../clients/cli/connections.c:3869
 msgid "Bonding primary interface [none]: "
 msgstr "Interface primária da vinculação [nenhuma]: "
 
-#: ../clients/cli/connections.c:3868
+#: ../clients/cli/connections.c:3872
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Erro: \"primary\": \"%s\" não é um nome de interface válido.\n"
 
-#: ../clients/cli/connections.c:3876
+#: ../clients/cli/connections.c:3880
 #, c-format
 msgid "Bonding monitoring mode %s"
 msgstr "Modo de monitoramento %s da vinculação"
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3886
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Erro: \"%s\" não é um modo de monitoramento válido; use \"%s\" ou \"%s\".\n"
 
-#: ../clients/cli/connections.c:3891
+#: ../clients/cli/connections.c:3895
 msgid "Bonding miimon [100]: "
 msgstr "Vinculação miimon [100]: "
 
-#: ../clients/cli/connections.c:3894
+#: ../clients/cli/connections.c:3898
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Erro: \"miimon\": \"%s\" não é um número válido <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3902
+#: ../clients/cli/connections.c:3906
 msgid "Bonding downdelay [0]: "
 msgstr "Vinculação downdelay [0]: "
 
-#: ../clients/cli/connections.c:3905
+#: ../clients/cli/connections.c:3909
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Erro: \"downdelay\": \"%s\" não é um número válido <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3913
+#: ../clients/cli/connections.c:3917
 msgid "Bonding updelay [0]: "
 msgstr "Vinculação updelay [0]: "
 
-#: ../clients/cli/connections.c:3916
+#: ../clients/cli/connections.c:3920
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Erro: \"updelay\": \"%s\" não é um número válido <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3925
+#: ../clients/cli/connections.c:3929
 msgid "Bonding arp-interval [0]: "
 msgstr "Vinculação intervalo arp [0]: "
 
-#: ../clients/cli/connections.c:3928
+#: ../clients/cli/connections.c:3932
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Erro: 'arp-interval': '%s' não é um número válido <0-%u>.\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
+#: ../clients/cli/connections.c:3940
 msgid "Bonding arp-ip-target [none]: "
 msgstr "Vinculação arp-ip-destino [nenhum]: "
 
-#: ../clients/cli/connections.c:3943
+#: ../clients/cli/connections.c:3947
 msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "Taxa LACP (\"slow\" ou \"fast\") [slow]: "
 
-#: ../clients/cli/connections.c:3949
+#: ../clients/cli/connections.c:3953
 #, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
 msgstr "Erro: \"lacp_rate\": \"%s\" é inválido (\"slow\" ou \"fast\").\n"
 
-#: ../clients/cli/connections.c:3972
+#: ../clients/cli/connections.c:3976
 msgid "Team JSON configuration [none]: "
 msgstr "Configuração da União JSON [nenhum]: "
 
-#: ../clients/cli/connections.c:3989
+#: ../clients/cli/connections.c:3993
 msgid "team"
 msgstr "união"
 
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:3999
 msgid "team-slave"
 msgstr "união-escrava"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
+#: ../clients/cli/connections.c:4011
 msgid "bridge"
 msgstr "ponte"
 
-#: ../clients/cli/connections.c:4013
+#: ../clients/cli/connections.c:4017
 #, c-format
 msgid "Enable STP %s"
 msgstr "Habilitar STP %s"
 
-#: ../clients/cli/connections.c:4018
+#: ../clients/cli/connections.c:4022
 #, c-format
 msgid "Error: 'stp': %s.\n"
 msgstr "Erro: \"stp\": %s.\n"
 
-#: ../clients/cli/connections.c:4026
+#: ../clients/cli/connections.c:4030
 msgid "STP priority [32768]: "
 msgstr "Prioridade STP [32768]: "
 
-#: ../clients/cli/connections.c:4030
+#: ../clients/cli/connections.c:4034
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Erro: \"priority\": \"%s\" não é um número válido <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4042
 msgid "Forward delay [15]: "
 msgstr "Atraso de encaminhamento [15]: "
 
-#: ../clients/cli/connections.c:4042
+#: ../clients/cli/connections.c:4046
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Errr: \"forward-delay\": \"%s\" não é um número válido <2-30>.\n"
 
-#: ../clients/cli/connections.c:4051
+#: ../clients/cli/connections.c:4055
 msgid "Hello time [2]: "
 msgstr "Tempo de saudação [2]: "
 
-#: ../clients/cli/connections.c:4055
+#: ../clients/cli/connections.c:4059
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Erro: \"hello-time\": \"%s\" não é um número válido <1-10>.\n"
 
-#: ../clients/cli/connections.c:4063
+#: ../clients/cli/connections.c:4067
 msgid "Max age [20]: "
 msgstr "Tempo de expiração máximo [20]: "
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:4071
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Erro: \"max-age\": \"%s\" não é um número válido <6-40>.\n"
 
-#: ../clients/cli/connections.c:4075
+#: ../clients/cli/connections.c:4079
 msgid "MAC address ageing time [300]: "
 msgstr "Tempo de vencimento do endereço MAC [300]: "
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:4083
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Erro: \"ageing-time\": \"%s\" não é um número válido <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4088
+#: ../clients/cli/connections.c:4092
 #, c-format
 msgid "Enable IGMP snooping %s"
 msgstr "Habilitar IGMP snooping %s"
 
-#: ../clients/cli/connections.c:4093
+#: ../clients/cli/connections.c:4097
 #, c-format
 msgid "Error: 'multicast-snooping': %s.\n"
 msgstr "Erro: \"multicast-snooping\": %s.\n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
+#: ../clients/cli/connections.c:4124
 msgid "bridge-slave"
 msgstr "ponte-escrava"
 
-#: ../clients/cli/connections.c:4125
+#: ../clients/cli/connections.c:4129
 msgid "Bridge port priority [32]: "
 msgstr "Prioridade da porta da ponte [32]: "
 
-#: ../clients/cli/connections.c:4138
+#: ../clients/cli/connections.c:4142
 msgid "Bridge port STP path cost [100]: "
 msgstr "Custo do caminho STP da porta da ponte [100]: "
 
-#: ../clients/cli/connections.c:4152
+#: ../clients/cli/connections.c:4156
 #, c-format
 msgid "Hairpin %s"
 msgstr "Hairpin %s"
 
-#: ../clients/cli/connections.c:4157
+#: ../clients/cli/connections.c:4161
 #, c-format
 msgid "Error: 'hairpin': %s.\n"
 msgstr "Erro: 'hairpin': %s.\n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../clients/cli/connections.c:4188 ../libnm-glib/nm-device.c:1855
 #: ../libnm/nm-device.c:1806
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../clients/cli/connections.c:4189
+#: ../clients/cli/connections.c:4193
 msgid "OLPC Mesh channel [1]: "
 msgstr "Canal da OLPC Mesh [1]: "
 
-#: ../clients/cli/connections.c:4192
+#: ../clients/cli/connections.c:4196
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Erro: \"channel\": \"%s\" não é um número válido <1-13>.\n"
 
-#: ../clients/cli/connections.c:4200
+#: ../clients/cli/connections.c:4204
 msgid "DHCP anycast MAC address [none]: "
 msgstr "Endereço MAC de difusão DHCP [nenhum]: "
 
 #. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../clients/cli/connections.c:4223 ../libnm-glib/nm-device.c:1871
 #: ../libnm/nm-device.c:1822
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4227
+#: ../clients/cli/connections.c:4231
 #, c-format
 msgid "ADSL encapsulation %s"
 msgstr "Encapsulamento ADSL %s"
 
 #. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
+#: ../clients/cli/connections.c:4249
 msgid "macvlan"
 msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4251
+#: ../clients/cli/connections.c:4255
 #, c-format
 msgid "Tap %s"
 msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4256
+#: ../clients/cli/connections.c:4260
 #, c-format
 msgid "Error: 'tap': %s.\n"
 msgstr "Erro: \"tap\": %s.\n"
 
 #. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../clients/cli/connections.c:4276 ../libnm-glib/nm-device.c:1875
 #: ../libnm/nm-device.c:1826
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+#: ../clients/cli/connections.c:4281 ../clients/cli/connections.c:4605
 msgid "Parent device [none]: "
 msgstr "Interface pai [nenhuma]: "
 
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4610
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
 msgstr "Erro: \"dev\": \"%s\" não é um UUID nem nome de interface.\n"
 
-#: ../clients/cli/connections.c:4291
+#: ../clients/cli/connections.c:4295
 msgid "Local address [none]: "
 msgstr "Endereço local [nenhum]: "
 
-#: ../clients/cli/connections.c:4296
+#: ../clients/cli/connections.c:4300
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
 msgstr "Erro: \"local\": \"%s\" não é um endereço IP válido.\n"
 
-#: ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4309
 msgid "Minimum source port [0]: "
 msgstr "Porta de origem mínima [0]: "
 
-#: ../clients/cli/connections.c:4309
+#: ../clients/cli/connections.c:4313
 #, c-format
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
 msgstr "Erro: \"source-port-min\": \"%s\" não é um número válido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4318
+#: ../clients/cli/connections.c:4322
 msgid "Maximum source port [0]: "
 msgstr "Porta de origem máxima [0]: "
 
-#: ../clients/cli/connections.c:4322
+#: ../clients/cli/connections.c:4326
 #, c-format
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
 msgstr "Erro: \"source-port-max\": \"%s\" não é um número válido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4331
+#: ../clients/cli/connections.c:4335
 msgid "Destination port [8472]: "
 msgstr "Porta de destino [8472]: "
 
-#: ../clients/cli/connections.c:4335
+#: ../clients/cli/connections.c:4339
 #, c-format
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
 msgstr "Erro: \"destination-port\": \"%s\" não é um número válido <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4374
+#: ../clients/cli/connections.c:4378
 msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Endereço IPv4 (IP[/plen]) [nenhum]: "
 
-#: ../clients/cli/connections.c:4376
+#: ../clients/cli/connections.c:4380
 msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "Endereço IPv6 (IP[/plen]) [nenhum]: "
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4394
 #, c-format
 msgid "  Address successfully added: %s\n"
 msgstr "  Endereço adicionado com sucesso: %s\n"
 
-#: ../clients/cli/connections.c:4392
+#: ../clients/cli/connections.c:4396
 #, c-format
 msgid "  Warning: address already present: %s\n"
 msgstr "  Aviso: endereço já existente: %s\n"
 
-#: ../clients/cli/connections.c:4394
+#: ../clients/cli/connections.c:4398
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Aviso: ignorando lixo ao final: '%s'\n"
 
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
+#: ../clients/cli/connections.c:4400 ../clients/cli/connections.c:5609
+#: ../clients/cli/connections.c:5656 ../clients/cli/connections.c:6573
+#: ../clients/cli/connections.c:6606
 msgid "Error: "
 msgstr "Erro: "
 
-#: ../clients/cli/connections.c:4416
+#: ../clients/cli/connections.c:4420
 msgid "IPv4 gateway [none]: "
 msgstr "Gateway IPv4 [nenhum]: "
 
-#: ../clients/cli/connections.c:4419
+#: ../clients/cli/connections.c:4423
 msgid "IPv6 gateway [none]: "
 msgstr "Gateway IPv6 [nenhum]: "
 
-#: ../clients/cli/connections.c:4439
+#: ../clients/cli/connections.c:4443
 #, c-format
 msgid "Error: invalid gateway address '%s'\n"
 msgstr "Erro: endereço de gateway \"%s\" inválido\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
+#: ../clients/cli/connections.c:4456
 #, c-format
 msgid "Do you want to add IP addresses? %s"
 msgstr "Você deseja adicionar endereços de IP? %s"
 
-#: ../clients/cli/connections.c:4460
+#: ../clients/cli/connections.c:4464
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
 msgstr "Pressione <Enter> para concluir a adição de endereços.\n"
 
 #. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../clients/cli/connections.c:4508 ../libnm-glib/nm-device.c:1879
 #: ../libnm/nm-device.c:1830
 msgid "Tun"
 msgstr "Tun"
 
-#: ../clients/cli/connections.c:4509
+#: ../clients/cli/connections.c:4513
 msgid "User ID [none]: "
 msgstr "ID de usuário [nenhum]: "
 
-#: ../clients/cli/connections.c:4522
+#: ../clients/cli/connections.c:4526
 msgid "Group ID [none]: "
 msgstr "ID do grupo [nenhum]: "
 
-#: ../clients/cli/connections.c:4536
+#: ../clients/cli/connections.c:4540
 #, c-format
 msgid "Enable PI %s"
 msgstr "Habilitar PI %s"
 
-#: ../clients/cli/connections.c:4541
+#: ../clients/cli/connections.c:4545
 #, c-format
 msgid "Error: 'pi': %s.\n"
 msgstr "Erro: \"pi\": %s.\n"
 
-#: ../clients/cli/connections.c:4549
+#: ../clients/cli/connections.c:4553
 #, c-format
 msgid "Enable VNET header %s"
 msgstr "Habilitar cabeçalho VNET %s"
 
-#: ../clients/cli/connections.c:4554
+#: ../clients/cli/connections.c:4558
 #, c-format
 msgid "Error: 'vnet-hdr': %s.\n"
 msgstr "Erro: \"vnet-hdr\": %s.\n"
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:4566
 #, c-format
 msgid "Enable multi queue %s"
 msgstr "Habilitar múltiplas filas %s"
 
-#: ../clients/cli/connections.c:4567
+#: ../clients/cli/connections.c:4571
 #, c-format
 msgid "Error: 'multi-queue': %s.\n"
 msgstr "Erro: 'mode': %s.\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
+#: ../clients/cli/connections.c:4585
 msgid "IP Tunnel"
 msgstr "Túnel IP"
 
-#: ../clients/cli/connections.c:4586
+#: ../clients/cli/connections.c:4590
 msgid "Local endpoint [none]: "
 msgstr "Ponto local [nenhum]: "
 
-#: ../clients/cli/connections.c:4592
+#: ../clients/cli/connections.c:4596
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
 msgstr "Erro: \"local\": \"%s\" não é válido; deve ser um endereço IP\n"
 
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#: ../clients/cli/connections.c:4662 ../clients/cli/connections.c:10188
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Erro: está faltando argumento <definição>.<propriedade>."
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:4667
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Erro: está faltando um valor para \"%s\"."
 
-#: ../clients/cli/connections.c:4681
+#: ../clients/cli/connections.c:4685
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Erro: <definição>.<propriedade> \"%s\" inválida."
 
-#: ../clients/cli/connections.c:4689
+#: ../clients/cli/connections.c:4693
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Erro: definição inválida ou não permitida \"%s\": %s."
 
-#: ../clients/cli/connections.c:4700
+#: ../clients/cli/connections.c:4704
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr "Erro: não sei como criar a definição \"%s\"."
 
-#: ../clients/cli/connections.c:4710
+#: ../clients/cli/connections.c:4714
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Erro: propriedade inválida \"%s\": %s."
 
-#: ../clients/cli/connections.c:4722
+#: ../clients/cli/connections.c:4726
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Erro: falha ao modificar %s.%s: %s."
 
-#: ../clients/cli/connections.c:4741
+#: ../clients/cli/connections.c:4745
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Erro: falha ao remover um valor de %s.%s: %s."
 
-#: ../clients/cli/connections.c:4775
+#: ../clients/cli/connections.c:4779
 #, c-format
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
@@ -2498,326 +2499,326 @@ msgstr ""
 "Aviso: \"type\" é ignorado. Use \"nmcli connection add '%s' ...\" em seu "
 "lugar."
 
-#: ../clients/cli/connections.c:4783
+#: ../clients/cli/connections.c:4787
 msgid "Error: redundant 'master' option."
 msgstr "Erro: opção \"master\" redundante."
 
-#: ../clients/cli/connections.c:4796
+#: ../clients/cli/connections.c:4800
 msgid "Error: 'master' is required."
 msgstr "Erro: é necessário o \"master\"."
 
-#: ../clients/cli/connections.c:4950
+#: ../clients/cli/connections.c:4954
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Erro: \"parent\": não é válido sem \"p-key\"."
 
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:5971
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+#: ../clients/cli/connections.c:5012 ../clients/cli/connections.c:5974
 msgid "Error: 'ssid' is required."
 msgstr "Erro: é necessário o \"ssid\"."
 
-#: ../clients/cli/connections.c:5072
+#: ../clients/cli/connections.c:5076
 msgid "WiMAX NSP name: "
 msgstr "Nome do NSP WiMAX: "
 
-#: ../clients/cli/connections.c:5075
+#: ../clients/cli/connections.c:5079
 msgid "Error: 'nsp' is required."
 msgstr "Erro: é necessário o \"nsp\"."
 
-#: ../clients/cli/connections.c:5127
+#: ../clients/cli/connections.c:5131
 msgid "PPPoE username: "
 msgstr "Nome de usuário do PPPoE: "
 
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+#: ../clients/cli/connections.c:5134 ../clients/cli/connections.c:6041
 msgid "Error: 'username' is required."
 msgstr "Erro: \"nome de usuário\" é necessário."
 
-#: ../clients/cli/connections.c:5199
+#: ../clients/cli/connections.c:5203
 msgid "APN: "
 msgstr "Nome do ponto de acesso (APN): "
 
-#: ../clients/cli/connections.c:5202
+#: ../clients/cli/connections.c:5206
 msgid "Error: 'apn' is required."
 msgstr "Erro: é necessário o \"apn\"."
 
-#: ../clients/cli/connections.c:5260
+#: ../clients/cli/connections.c:5264
 msgid "Bluetooth device address: "
 msgstr "Endereço de dispositivo Bluetooth: "
 
-#: ../clients/cli/connections.c:5263
+#: ../clients/cli/connections.c:5267
 msgid "Error: 'addr' is required."
 msgstr "Erro: é necessário o \"addr\"."
 
-#: ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:5308
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr "Erro: \"bt-type\": \"%s\" não é válido; use [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:5348
+#: ../clients/cli/connections.c:5352
 msgid "VLAN parent device or connection UUID: "
 msgstr "Dispositivo VLAN principal ou conexão UUID: "
 
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+#: ../clients/cli/connections.c:5355 ../clients/cli/connections.c:6112
 msgid "Error: 'dev' is required."
 msgstr "Erro: é necessário o \"dev\"."
 
-#: ../clients/cli/connections.c:5355
+#: ../clients/cli/connections.c:5359
 msgid "VLAN ID <0-4094>: "
 msgstr "ID da VLAN <0-4094>: "
 
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:5362 ../clients/cli/connections.c:6428
 msgid "Error: 'id' is required."
 msgstr "Erro: é necessário o \"id\"."
 
-#: ../clients/cli/connections.c:5364
+#: ../clients/cli/connections.c:5368
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4094>."
 msgstr "Erro: \"id\": \"%s\" não é válido; use <0-4094>."
 
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#: ../clients/cli/connections.c:5378 ../clients/cli/connections.c:6120
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr "Erro: \"dev\": \"%s\" não é um UUID, nome de interface, e nem um MAC."
 
-#: ../clients/cli/connections.c:5506
+#: ../clients/cli/connections.c:5510
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Erro: \"mode\": %s."
 
-#: ../clients/cli/connections.c:5515
+#: ../clients/cli/connections.c:5519
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Erro: \"primary\": \"%s\" não é um nome de interface válido."
 
-#: ../clients/cli/connections.c:5738
+#: ../clients/cli/connections.c:5742
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Erro: \"stp\": %s."
 
-#: ../clients/cli/connections.c:5747
+#: ../clients/cli/connections.c:5751
 #, c-format
 msgid "Error: 'multicast-snooping': %s."
 msgstr "Erro: \"multicast-snooping\": %s."
 
-#: ../clients/cli/connections.c:5866
+#: ../clients/cli/connections.c:5870
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Erro: 'hairpin': %s."
 
-#: ../clients/cli/connections.c:5915
+#: ../clients/cli/connections.c:5919
 msgid "Error: 'vpn-type' is required."
 msgstr "Erro: é necessário o \"vpn-type\"."
 
-#: ../clients/cli/connections.c:5922
+#: ../clients/cli/connections.c:5926
 #, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Aviso: \"vpn-type\": %s desconhecido.\n"
 
-#: ../clients/cli/connections.c:5983
+#: ../clients/cli/connections.c:5987
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Erro: \"channel\": \"%s\" não é válido; use <1-13>."
 
-#: ../clients/cli/connections.c:6034
+#: ../clients/cli/connections.c:6038
 msgid "Username: "
 msgstr "Nome de usuário: "
 
-#: ../clients/cli/connections.c:6043
+#: ../clients/cli/connections.c:6047
 #, c-format
 msgid "Protocol %s"
 msgstr "Protocolo %s"
 
-#: ../clients/cli/connections.c:6046
+#: ../clients/cli/connections.c:6050
 msgid "Error: 'protocol' is required."
 msgstr "Erro: é necessário o \"protocol\"."
 
-#: ../clients/cli/connections.c:6105
+#: ../clients/cli/connections.c:6109
 msgid "MACVLAN parent device or connection UUID: "
 msgstr "Dispositivo MACVLAN pai ou UUID de conexão: "
 
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
+#: ../clients/cli/connections.c:6129 ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:6311
 msgid "Error: 'mode' is required."
 msgstr "Erro: é necessário o \"mode\"."
 
-#: ../clients/cli/connections.c:6131
+#: ../clients/cli/connections.c:6135
 msgid "Error: 'mode' is not valid."
 msgstr "Erro: \"mode\" não é válido."
 
-#: ../clients/cli/connections.c:6144
+#: ../clients/cli/connections.c:6148
 #, c-format
 msgid "Error: 'tap': %s."
 msgstr "Erro: \"tap\": %s."
 
-#: ../clients/cli/connections.c:6230
+#: ../clients/cli/connections.c:6234
 #, c-format
 msgid "Error: 'pi': %s."
 msgstr "Erro: \"pi\": %s."
 
-#: ../clients/cli/connections.c:6241
+#: ../clients/cli/connections.c:6245
 #, c-format
 msgid "Error: 'vnet-hdr': %s."
 msgstr "Erro: \"vnet-hdr\": %s."
 
-#: ../clients/cli/connections.c:6252
+#: ../clients/cli/connections.c:6256
 #, c-format
 msgid "Error: 'multi-queue': %s."
 msgstr "Erro: \"multi-queue\": %s."
 
-#: ../clients/cli/connections.c:6321
+#: ../clients/cli/connections.c:6325
 #, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
 msgstr "Erro: \"mode\": \"%s\" não é um válido, use um de %s"
 
-#: ../clients/cli/connections.c:6327
+#: ../clients/cli/connections.c:6331
 msgid "Remote endpoint: "
 msgstr "Ponto remoto: "
 
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+#: ../clients/cli/connections.c:6334 ../clients/cli/connections.c:6436
 msgid "Error: 'remote' is required."
 msgstr "Erro: é necessário o \"remote\"."
 
-#: ../clients/cli/connections.c:6337
+#: ../clients/cli/connections.c:6341
 #, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
 msgstr "Erro: \"remote\": \"%s\" não é um válido, deve ser um endereço IP"
 
-#: ../clients/cli/connections.c:6351
+#: ../clients/cli/connections.c:6355
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
 msgstr "Erro: \"local\": \"%s\" não é um válido, deve ser um endereço IP"
 
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#: ../clients/cli/connections.c:6364 ../clients/cli/connections.c:6459
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
 msgstr "Erro: \"dev\": \"%s\" não é um UUID nem um nome de interface."
 
-#: ../clients/cli/connections.c:6421
+#: ../clients/cli/connections.c:6425
 msgid "VXLAN ID: "
 msgstr "ID da VXLAN: "
 
-#: ../clients/cli/connections.c:6429
+#: ../clients/cli/connections.c:6433
 msgid "Remote: "
 msgstr "Remote: "
 
-#: ../clients/cli/connections.c:6438
+#: ../clients/cli/connections.c:6442
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
 msgstr "Erro: \"id\": \"%s\" não é válido; use <0-16777215>."
 
-#: ../clients/cli/connections.c:6464
+#: ../clients/cli/connections.c:6468
 #, c-format
 msgid "Error: 'remote': '%s' is not a valid IP address"
 msgstr "Erro: \"remote\": \"%s\" não é um endereço IP válido"
 
-#: ../clients/cli/connections.c:6473
+#: ../clients/cli/connections.c:6477
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address"
 msgstr "Erro: \"local\": \"%s\" não é um endereço IP válido"
 
-#: ../clients/cli/connections.c:6482
+#: ../clients/cli/connections.c:6486
 #, c-format
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
 msgstr "Erro: \"source-port-min\": %s não é válido; use <0-65535>."
 
-#: ../clients/cli/connections.c:6491
+#: ../clients/cli/connections.c:6495
 #, c-format
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
 msgstr "Erro: \"source-port-max\": %s não é válido; use <0-65535>."
 
-#: ../clients/cli/connections.c:6500
+#: ../clients/cli/connections.c:6504
 #, c-format
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
 msgstr "Erro: \"destination-port\": %s não é válido; use <0-65535>."
 
-#: ../clients/cli/connections.c:6540
+#: ../clients/cli/connections.c:6544
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Erro: \"%s\" não é um tipo de conexão válido."
 
-#: ../clients/cli/connections.c:6581
+#: ../clients/cli/connections.c:6585
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr "Erro: gateway IPv4 especificado sem endereços IPv4"
 
-#: ../clients/cli/connections.c:6585
+#: ../clients/cli/connections.c:6589
 #, c-format
 msgid "Error: multiple IPv4 gateways specified"
 msgstr "Erro: múltiplos gateways IPv4 especificados"
 
-#: ../clients/cli/connections.c:6589
+#: ../clients/cli/connections.c:6593
 #, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
 msgstr "Erro: gateway IPv4 \"%s\" inválido"
 
-#: ../clients/cli/connections.c:6614
+#: ../clients/cli/connections.c:6618
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr "Erro: gateway IPv6 especificado sem endereços IPv6"
 
-#: ../clients/cli/connections.c:6618
+#: ../clients/cli/connections.c:6622
 #, c-format
 msgid "Error: multiple IPv6 gateways specified"
 msgstr "Erro: múltiplos gateways IPv6 especificados"
 
-#: ../clients/cli/connections.c:6622
+#: ../clients/cli/connections.c:6626
 #, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
 msgstr "Erro: gateway IPv6 \"%s\" inválido"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:10227
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Erro: falha ao adicionar a conexão \"%s\": %s"
 
-#: ../clients/cli/connections.c:6675
+#: ../clients/cli/connections.c:6679
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "A conexão \"%s\" (%s) foi adicionada com sucesso.\n"
 
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#: ../clients/cli/connections.c:6955 ../clients/cli/connections.c:10682
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Erro: é necessário o argumento \"type\"."
 
-#: ../clients/cli/connections.c:6959
+#: ../clients/cli/connections.c:6963
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Erro: tipo de conexão inválido; %s."
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:6972 ../clients/cli/devices.c:2142
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Erro: \"autoconnect\": %s."
 
-#: ../clients/cli/connections.c:6978
+#: ../clients/cli/connections.c:6982
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Erro: \"save\": %s."
 
-#: ../clients/cli/connections.c:6995
+#: ../clients/cli/connections.c:6999
 msgid "Interface name [*]: "
 msgstr "Nome da interface [*]: "
 
-#: ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:7004
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Erro: é necessário o argumento \"ifname\"."
 
-#: ../clients/cli/connections.c:7002
+#: ../clients/cli/connections.c:7006
 #, c-format
 msgid "Error: mandatory 'ifname' not seen before '%s'."
 msgstr "Erro: \"ifname\" obrigatório não foi encontrado antes de \"%s\"."
 
-#: ../clients/cli/connections.c:7011
+#: ../clients/cli/connections.c:7015
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr "Erro: \"ifname\": \"%s\" não é uma interface válida nem '*'."
 
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:8039
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[valores da definição %s\"]\n"
@@ -2825,7 +2826,7 @@ msgstr "[valores da definição %s\"]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8117
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2858,7 +2859,7 @@ msgstr ""
 "nmcli    <opção-conf> <valor>      :: configuração do nmcli\n"
 "quit                               :: sai do nmcli\n"
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:8148
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2877,7 +2878,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:8155
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -2898,7 +2899,7 @@ msgstr ""
 "Exemplos: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:8162
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2913,7 +2914,7 @@ msgstr ""
 "\n"
 "Exemplo: nmcli> set con.id Minha conexão\n"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:8167
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2926,7 +2927,7 @@ msgstr ""
 "Mostra a descrição da propriedade. Você pode consultar a página do manual de "
 "nm-settings(5) para ver todas as configurações e propriedades do NM.\n"
 
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:8172
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2941,7 +2942,7 @@ msgstr ""
 "\n"
 "Exemplo: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:8177
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2965,7 +2966,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:8186
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2993,7 +2994,7 @@ msgstr ""
 "remover por completo a conexão permanente, o perfil de conexão deve ser\n"
 "excluído.\n"
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:8197
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -3014,7 +3015,7 @@ msgstr ""
 "/<ap>|<nsp>  - ponto de acesso (Wi-Fi) ou provedor de serviço de rede "
 "(WiMAX) (preceda com / quando o <nome-if> não for especificado)\n"
 
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:8204 ../clients/cli/connections.c:8363
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -3023,7 +3024,7 @@ msgstr ""
 "back  :: vai ao nível de menu superior\n"
 "\n"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:8207
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -3032,7 +3033,7 @@ msgstr ""
 "help/? [<command>]  :: ajuda para os comandos do nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:8206
+#: ../clients/cli/connections.c:8210
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -3059,7 +3060,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8232 ../clients/cli/connections.c:8369
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -3072,8 +3073,8 @@ msgstr ""
 "Este comando sai do nmcli. Quando a conexão que está sendo editada não foi "
 "salva, o usuário é solicitado a confirmar a ação.\n"
 
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:8237 ../clients/cli/connections.c:8374
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:9746
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Comando desconhecido: \"%s\"\n"
@@ -3081,7 +3082,7 @@ msgstr "Comando desconhecido: \"%s\"\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8299
+#: ../clients/cli/connections.c:8303
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -3109,7 +3110,7 @@ msgstr ""
 "comando\n"
 "quit                             :: sai do nmcli\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -3120,7 +3121,7 @@ msgstr ""
 "\n"
 "Este comando configura o <valor> fornecido à propriedade\n"
 
-#: ../clients/cli/connections.c:8328
+#: ../clients/cli/connections.c:8332
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -3135,7 +3136,7 @@ msgstr ""
 "propriedade seja um tipo de contêiner. Para propriedades com valores únicos, "
 "isto substitui o valor (semelhante ao \"set\").\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -3146,7 +3147,7 @@ msgstr ""
 "\n"
 "Exibe o valor atual e permite sua edição.\n"
 
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:8342
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3180,7 +3181,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:8353
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3193,7 +3194,7 @@ msgstr ""
 "Mostra a descrição da propriedade. Você pode consultar a página do manual nm-"
 "settings(5) para ver todas as configurações e propriedades do NM.\n"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:8358
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3208,7 +3209,7 @@ msgstr ""
 "Mostra o valor da propriedade. Fornecendo um argumento, você também pode "
 "exibir valores para toda a conexão ou definição.\n"
 
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:8366
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -3217,28 +3218,28 @@ msgstr ""
 "help/? [<comando>]  :: ajuda para os comandos do nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8464
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Erro: Ativação da conexão falhou.\n"
 
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:8547
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Erro: a definição \"%s\" é obrigatória e não pode ser removida.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8561
+#: ../clients/cli/connections.c:8565
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Tipo: %s | Nome: %s | UUID: %s | Impurezas: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8601
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "A conexão não foi salva. Você realmente deseja sair? %s"
 
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:8650
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3247,66 +3248,66 @@ msgstr ""
 "O perfil de conexão foi removido do outro cliente. Você pode digitar \"save"
 "\" no menu principal para recuperá-lo.\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Valores permitidos para a propriedade \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:8679 ../clients/cli/connections.c:9101
+#: ../clients/cli/connections.c:9159
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Digite o valor de \"%s\": "
 
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:8694 ../clients/cli/connections.c:8716
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9164
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Erro: falha ao definir a propriedade \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:8710
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Edite o valor de \"%s\": "
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:8739
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:8745 ../clients/cli/connections.c:9246
+#: ../clients/cli/connections.c:9294
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Erro: falha ao remover valor de \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:8766
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argumento de comando desconhecido: \"%s\"\n"
 
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:8871
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Configurações disponíveis: %s\n"
 
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:8883
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Erro: nome de configuração inválido; %s\n"
 
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:8900
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propriedades disponíveis: %s\n"
 
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:8908
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Erro: propriedade %s\n"
 
-#: ../clients/cli/connections.c:8945
+#: ../clients/cli/connections.c:8949
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -3317,12 +3318,12 @@ msgstr ""
 "ativação imediata da conexão.\n"
 "Você ainda deseja salvar? %s"
 
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Você pode editar as seguintes configurações: %s\n"
 
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:9067
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3331,218 +3332,218 @@ msgstr ""
 "O perfil de conexão foi removido de outro cliente. Você pode digitar \"save"
 "\" para recuperá-lo.\n"
 
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:9109 ../clients/cli/connections.c:9339
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Erro: nenhuma configuração selecionada; as válidas são [%s]\n"
 
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:9110
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "primeiro use \"goto <definição>\" ou \"set <definição>.<propriedade>\"\n"
 
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9273
+#: ../clients/cli/connections.c:9361
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Erro: argumento de configuração \"%s\" inválido; os válidos são [%s]\n"
 
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Erro: falta configuração para a propriedade \"%s\"\n"
 
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:9141
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Erro: propriedade inválida: %s\n"
 
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Erro: definição desconhecida: \"%s\"\n"
 
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:9207
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Você pode editar as seguintes propriedades: %s\n"
 
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:9251
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Erro: nenhum argumento fornecido; os válidos são [%s]\n"
 
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:9270
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "A configuração \"%s\" não está presente na conexão.\n"
 
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:9315
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Erro: propriedades %s, tampouco é um nome de definição.\n"
 
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:9340
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "primeiro use \"goto <definição>\" ou \"describe <definição>.<propriedade>\"\n"
 
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:9389
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Erro: propriedade inválida: %s, tampouco um nome de definição válida.\n"
 
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:9421
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Erro: definição desconhecida: \"%s\"\n"
 
-#: ../clients/cli/connections.c:9422
+#: ../clients/cli/connections.c:9426
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Erro: a definição \"%s\" não está presente na conexão\n"
 
-#: ../clients/cli/connections.c:9450
+#: ../clients/cli/connections.c:9454
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Erro: propriedade inválida: %s%s\n"
 
-#: ../clients/cli/connections.c:9452
+#: ../clients/cli/connections.c:9456
 msgid ", neither a valid setting name"
 msgstr ", tampouco um nome de configuração válido"
 
-#: ../clients/cli/connections.c:9469
+#: ../clients/cli/connections.c:9473
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Opção de verificação inválida: %s\n"
 
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:9481
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Verificar configuração \"%s\": %s\n"
 
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:9496
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verificar conexão: %s\n"
 
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:9499
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "O erro não pode ser corrigido automaticamente.\n"
 
-#: ../clients/cli/connections.c:9512
+#: ../clients/cli/connections.c:9516
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Erro: argumento \"%s\" inválido\n"
 
-#: ../clients/cli/connections.c:9545
+#: ../clients/cli/connections.c:9549
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Erro: Falha ao salvar a conexão \"%s\" (%s): %s\n"
 
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:9556
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "A conexão \"%s\" (%s) foi salva com sucesso.\n"
 
-#: ../clients/cli/connections.c:9553
+#: ../clients/cli/connections.c:9557
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "A conexão \"%s\" (%s) foi atualizada com sucesso.\n"
 
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:9590
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Erro: verificação de conexão falhou: %s\n"
 
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:9591
 msgid "(unknown error)"
 msgstr "(erro desconhecido)"
 
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:9592
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Você pode tentar executar \"verify fix\" para corrigir erros.\n"
 
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Erro: a conexão não foi salva. Primeiro digite \"save\".\n"
 
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:9618
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Erro: a conexão não é válida: %s\n"
 
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:9628
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Erro: Não foi possível ativar conexão: %s.\n"
 
-#: ../clients/cli/connections.c:9634
+#: ../clients/cli/connections.c:9638
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Erro: Falha ao ativar a conexão \"%s\" (%s): %s\n"
 
-#: ../clients/cli/connections.c:9640
+#: ../clients/cli/connections.c:9644
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Monitorando ativação da conexão (pressione qualquer tecla para continuar)\n"
 
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:9682
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Erro: estado da linha (\"status-line\"): %s\n"
 
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:9690
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Erro: salvar confirmação: %s\n"
 
-#: ../clients/cli/connections.c:9694
+#: ../clients/cli/connections.c:9698
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Erro: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:9703
+#: ../clients/cli/connections.c:9707
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "Erro: cor inválida: %s\n"
 
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:9721
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuração atual do nmcli:\n"
 
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:9731
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "A opção de configuração \"%s\" é inválida; é permitido [%s]\n"
 
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:9986
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Erro: apenas um \"id\", uuid, ou \"path\" podem ser fornecidos."
 
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:9998 ../clients/cli/connections.c:10175
+#: ../clients/cli/connections.c:10182 ../clients/cli/connections.c:10310
+#: ../clients/cli/connections.c:10786
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Erro: conexão desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:10016
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Aviso: editando a conexão existente \"%s\"; o argumento \"type\" é ignorado\n"
 
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:10019
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3550,223 +3551,223 @@ msgstr ""
 "Aviso: editando a conexão existente \"%s\"; o argumento \"con-name\" é "
 "ignorado\n"
 
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:10033
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Tipos de conexões válidos: %s\n"
 
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:10035
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Erro: tipo de conexão inválido; %s\n"
 
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:10074
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| editor interativo de conexões do nmcli |==="
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Editando conexão existente \"%s\": \"%s\""
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Adicionando uma nova conexão \"%s\""
 
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:10081
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Digite \"help\" ou \"?\" para comandos disponíveis."
 
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:10083
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Digite \"describe [<definição>.<propriedade>]\" para exibir descrição "
 "detalhada da propriedade."
 
-#: ../clients/cli/connections.c:10117
+#: ../clients/cli/connections.c:10121
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Erro: Falha ao modificar a conexão \"%s\": %s"
 
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:10128
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "A conexão \"%s\" (%s) foi modificada com sucesso.\n"
 
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
+#: ../clients/cli/connections.c:10150 ../clients/cli/connections.c:10266
+#: ../clients/cli/connections.c:10643 ../clients/cli/connections.c:10751
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Erro: nenhum argumento foi fornecido."
 
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
+#: ../clients/cli/connections.c:10169 ../clients/cli/connections.c:10298
+#: ../clients/cli/connections.c:10780
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "Erro: está faltando o ID da conexão."
 
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:10232
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) clonada como %s (%s).\n"
 
-#: ../clients/cli/connections.c:10260
+#: ../clients/cli/connections.c:10264
 msgid "New connection name: "
 msgstr "Nome da nova conexão: "
 
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#: ../clients/cli/connections.c:10285 ../clients/cli/connections.c:10303
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Erro: está faltando o argumento <novo nome>."
 
-#: ../clients/cli/connections.c:10287
+#: ../clients/cli/connections.c:10291
 #, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "Erro: o argumento extra \"%s\" é inesperado."
 
-#: ../clients/cli/connections.c:10356
+#: ../clients/cli/connections.c:10360
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Erro: nem todas as conexões ativas foram excluídas."
 
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:10361
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Erro: a exclusão da conexão falhou: %s"
 
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#: ../clients/cli/connections.c:10423 ../clients/cli/connections.c:10551
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Erro: conexão desconhecida \"%s\"\n"
 
-#: ../clients/cli/connections.c:10433
+#: ../clients/cli/connections.c:10437
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Erro: nenhuma conexão fornecida."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:10462
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Erro: não é possível excluir conexão(ões) desconhecida(s): %s."
 
-#: ../clients/cli/connections.c:10470
+#: ../clients/cli/connections.c:10474
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: perfil de conexão alterada\n"
 
-#: ../clients/cli/connections.c:10496
+#: ../clients/cli/connections.c:10500
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: perfil de conexão criada\n"
 
-#: ../clients/cli/connections.c:10505
+#: ../clients/cli/connections.c:10509
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: perfil de conexão removida\n"
 
-#: ../clients/cli/connections.c:10548
+#: ../clients/cli/connections.c:10552
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Erro: nem todas as conexões foram encontradas."
 
-#: ../clients/cli/connections.c:10571
+#: ../clients/cli/connections.c:10575
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Erro: falha ao recarregar conexões: %s."
 
-#: ../clients/cli/connections.c:10603
+#: ../clients/cli/connections.c:10607
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Erro: falha ao carregar conexão: %s."
 
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:10615
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Não foi possível carregar arquivo \"%s\"\n"
 
-#: ../clients/cli/connections.c:10620
+#: ../clients/cli/connections.c:10624
 msgid "File to import: "
 msgstr "Arquivo a ser importado: "
 
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:10659
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Aviso: \"type\" já especificado, ignorando o extra.\n"
 
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:10670
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Aviso: \"file\" já especificado, ignorando o extra.\n"
 
-#: ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:10672
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Parâmetro desconhecido: %s"
 
-#: ../clients/cli/connections.c:10683
+#: ../clients/cli/connections.c:10687
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Erro: é necessário o argumento \"file\"."
 
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#: ../clients/cli/connections.c:10695 ../clients/cli/connections.c:10802
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Erro: falha ao carregar plug-in VPN: %s."
 
-#: ../clients/cli/connections.c:10699
+#: ../clients/cli/connections.c:10703
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Erro: falha ao importar \"%s\": %s."
 
-#: ../clients/cli/connections.c:10745
+#: ../clients/cli/connections.c:10749
 msgid "Output file name: "
 msgstr "Nome de arquivo de saída: "
 
-#: ../clients/cli/connections.c:10769
+#: ../clients/cli/connections.c:10773
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Erro: argumento extra desconhecida: \"%s\"."
 
-#: ../clients/cli/connections.c:10789
+#: ../clients/cli/connections.c:10793
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Erro: a conexão não é VPN."
 
-#: ../clients/cli/connections.c:10810
+#: ../clients/cli/connections.c:10814
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Erro: falha ao criar o arquivo temporário %s."
 
-#: ../clients/cli/connections.c:10819
+#: ../clients/cli/connections.c:10823
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Erro: falha ao exportar \"%s\": %s."
 
-#: ../clients/cli/connections.c:10830
+#: ../clients/cli/connections.c:10834
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Erro: falha ao ler o arquivo temporário \"%s\": %s."
 
-#: ../clients/cli/connections.c:10976
+#: ../clients/cli/connections.c:10980
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "string incorreta \"%s\" da opção \"--order\""
 
-#: ../clients/cli/connections.c:11002
+#: ../clients/cli/connections.c:11006
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "item incorreto \"%s\" na opção \"--order\""
 
-#: ../clients/cli/connections.c:11089
+#: ../clients/cli/connections.c:11090
 msgid "'--order' argument is missing"
 msgstr "o argumento \"--order\" está faltando"
 
-#: ../clients/cli/connections.c:11154
+#: ../clients/cli/connections.c:11155
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Erro: \"%s\" não é um comando de \"connection\" válido."
@@ -4199,7 +4200,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname> ...\n"
+"  reapply <ifname>\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -4235,7 +4236,7 @@ msgstr ""
 "\n"
 "  connect <nome-if>\n"
 "\n"
-"  reapply <nome-if> ...\n"
+"  reapply <nome-if>\n"
 "\n"
 "  disconnect <nome-if> ...\n"
 "\n"
@@ -4245,13 +4246,13 @@ msgstr ""
 "\n"
 "  wifi [list [ifname <nome-if>] [bssid <BSSID>]]\n"
 "\n"
-"  wifi connect <(B)SSID> [password <senha>] [wep-key-type key|phrase] ["
-"ifname <nome-if>]\n"
-"                         [bssid <BSSID>] [name <nome>] [private yes|no] ["
-"hidden yes|no]\n"
+"  wifi connect <(B)SSID> [password <senha>] [wep-key-type key|phrase] "
+"[ifname <nome-if>]\n"
+"                         [bssid <BSSID>] [name <nome>] [private yes|no] "
+"[hidden yes|no]\n"
 "\n"
-"  wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid <SSID>] [band a|bg]"
-" [channel <canal>] [password <senha>]\n"
+"  wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid <SSID>] [band a|"
+"bg] [channel <canal>] [password <senha>]\n"
 "\n"
 "  wifi rescan [ifname <nome-if>] [[ssid <SSID para buscar>] ...]\n"
 "\n"
@@ -4337,7 +4338,7 @@ msgstr ""
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4345,7 +4346,7 @@ msgid ""
 msgstr ""
 "Uso: nmcli device reapply { ARGUMENTOS | help }\n"
 "\n"
-"ARGUMENTOS := <nome-if> ...\n"
+"ARGUMENTOS := <nome-if>\n"
 "\n"
 "Tenta atualizar o dispositivo com as alterações à conexão atualmente ativa\n"
 "feitas desde a última aplicação.\n"
@@ -4498,13 +4499,13 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [list [ifname <nome-if>] [bssid <BSSID>]]\n"
 "\n"
-"Lista pontos de acesso de Wi-Fi disponíveis. As opções \"ifname\" e \"bssid\""
-"\n"
+"Lista pontos de acesso de Wi-Fi disponíveis. As opções \"ifname\" e \"bssid"
+"\"\n"
 "podem ser usadas para listar APs para uma interface específica, ou com um\n"
 "BSSID específico.\n"
 "\n"
-"ARGUMENTOS := connect <(B)SSID> [password <senha>] [wep-key-type key|phrase]"
-"\n"
+"ARGUMENTOS := connect <(B)SSID> [password <senha>] [wep-key-type key|"
+"phrase]\n"
 "                       [ifname <nome-if>] [bssid <BSSID>] [name <nome>]\n"
 "                       [private yes|no]\n"
 "\n"
@@ -4518,8 +4519,8 @@ msgstr ""
 "WPA-PSK são suportadas no momento. Presume-se também que a configuração IP\n"
 "seja obtida via DHCP.\n"
 "\n"
-"ARGUMENTOS := wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid <SSID>]"
-"\n"
+"ARGUMENTOS := wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid "
+"<SSID>]\n"
 "                           [band a|bg] [channel <canal>] [password <senha>]\n"
 "\n"
 "Cria um hotspot Wi-Fi. Use 'connection down' ou 'device disconnect' para\n"
@@ -4532,8 +4533,8 @@ msgstr ""
 "channel - canal Wi-Fi para usar\n"
 "password - senha para usar para o hotspot\n"
 "\n"
-"ARGUMENTOS := wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid <SSID>]"
-"\n"
+"ARGUMENTOS := wifi hotspot [ifname <nome-if>] [con-name <nome>] [ssid "
+"<SSID>]\n"
 "                           [band a|bg] [channel <canal>] [password <senha>]\n"
 "\n"
 "Requer que o NetworkManager scaneie novamente imediatamente para pontos de\n"
@@ -4563,29 +4564,29 @@ msgstr ""
 "\n"
 "ARGUMENTOS := [list [ifname <nome-if>] [nsp <nome>]]\n"
 "\n"
-"Lista dispositivos vizinhos descobertos por meio de LLDP. A opção \"ifname\""
-"\n"
+"Lista dispositivos vizinhos descobertos por meio de LLDP. A opção \"ifname"
+"\"\n"
 "pode ser usada para listar vizinhos de uma interface específica.\n"
 "\n"
 
 #: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
-#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
-#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1876
+#: ../clients/cli/devices.c:2081 ../clients/cli/devices.c:2088
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Erro: Nenhuma interface especificada."
 
-#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
+#: ../clients/cli/devices.c:547
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Aviso: o argumento \"%s\" está duplicado.\n"
 
-#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#: ../clients/cli/devices.c:549
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Erro: Dispositivo \"%s\" não encontrado.\n"
 
-#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#: ../clients/cli/devices.c:550
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Erro: nenhum todos dispositivos encontrados."
@@ -4660,14 +4661,14 @@ msgstr "Erro: \"device status\": %s"
 msgid "Status of devices"
 msgstr "Status dos dispositivos"
 
-#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3487
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Erro: Argumento extra \"%s\" inválido."
 
 #: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
-#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:2104 ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:3526
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Erro: Dispositivo \"%s\" não localizado."
@@ -4733,7 +4734,7 @@ msgid "Error: extra argument not allowed: '%s'."
 msgstr "Erro: argumento extra não permitido: \"%s\"."
 
 #: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
-#: ../clients/cli/devices.c:1964
+#: ../clients/cli/devices.c:1942
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Dispositivo \"%s\" desconectado com sucesso.\n"
@@ -4745,94 +4746,94 @@ msgstr "Dispositivo \"%s\" removido com sucesso.\n"
 
 #: ../clients/cli/devices.c:1838
 #, c-format
-msgid "Error: not all connections reapplied."
-msgstr "Erro: nem todas as conexões foram reaplicadas."
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
+msgstr "Erro: a reaplicação da conexão no dispositivo \"%s\" (%s) falhou: %s"
 
-#: ../clients/cli/devices.c:1839
-#, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
-msgstr "Erro: a reaplicação da conexão no dispositivo \"%s\" (%s) falhou: %s\n"
-
-#: ../clients/cli/devices.c:1849
+#: ../clients/cli/devices.c:1848
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "Conexão reaplicada com sucesso no dispositivo \"%s\".\n"
 
-#: ../clients/cli/devices.c:1912
+#: ../clients/cli/devices.c:1885
 #, c-format
-msgid "Error: no valid device provided."
-msgstr "Erro: nem todos os dispositivos fornecidos."
+msgid "Error: unsupported argument '%s'."
+msgstr "Erro: argumento \"%s\" sem suporte."
 
-#: ../clients/cli/devices.c:1949
+#: ../clients/cli/devices.c:1899
+#, c-format
+msgid "Error: device '%s' not found."
+msgstr "Erro: dispositivo \"%s\" não localizado."
+
+#: ../clients/cli/devices.c:1927
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Erro: nem todos os dispositivos foram desconectados."
 
-#: ../clients/cli/devices.c:1950
+#: ../clients/cli/devices.c:1928
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Erro: a desconexão do dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:2025
+#: ../clients/cli/devices.c:2003
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Erro: nem todos os dispositivos foram excluídos."
 
-#: ../clients/cli/devices.c:2026
+#: ../clients/cli/devices.c:2004
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Erro: a exclusão do dispositivo \"%s\" (%s) falhou: %s\n"
 
-#: ../clients/cli/devices.c:2132
+#: ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No property specified."
 msgstr "Erro: nenhuma conexão especificada."
 
-#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
+#: ../clients/cli/devices.c:2122 ../clients/cli/devices.c:2137
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Erro: está faltando o argumento %s."
 
-#: ../clients/cli/devices.c:2149
+#: ../clients/cli/devices.c:2127
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Erro: \"managed\": %s."
 
-#: ../clients/cli/devices.c:2174
+#: ../clients/cli/devices.c:2152
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Erro: propriedade \"%s\" não é conhecida."
 
-#: ../clients/cli/devices.c:2220
+#: ../clients/cli/devices.c:2198
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: usando a conexão \"%s\"\n"
 
-#: ../clients/cli/devices.c:2246
+#: ../clients/cli/devices.c:2224
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: dispositivo criado\n"
 
-#: ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2231
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: dispositivo removido\n"
 
-#: ../clients/cli/devices.c:2339
+#: ../clients/cli/devices.c:2317
 msgid "Wi-Fi scan list"
 msgstr "Lista de varredura de redes sem fio (Wi-Fi)"
 
-#: ../clients/cli/devices.c:2377
+#: ../clients/cli/devices.c:2355
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Erro: \"device wifi\": %s"
 
-#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
+#: ../clients/cli/devices.c:2397 ../clients/cli/devices.c:2478
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Erro: Ponto de acesso com bssid \"%s\" não localizado."
 
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2424
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4841,27 +4842,27 @@ msgstr ""
 "Erro: o dispositivo \"%s\" não foi reconhecido como um dispositivo Wi-Fi, "
 "verifique o plug-in Wi-Fi do NetworkManager."
 
-#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
-#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:2426 ../clients/cli/devices.c:2758
+#: ../clients/cli/devices.c:3178 ../clients/cli/devices.c:3327
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Erro: o dispositivo \"%s\" não é um dispositivo Wi-Fi."
 
-#: ../clients/cli/devices.c:2660
+#: ../clients/cli/devices.c:2638
 msgid "SSID or BSSID: "
 msgstr "SSID ou BSSID: "
 
-#: ../clients/cli/devices.c:2665
+#: ../clients/cli/devices.c:2643
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Erro: SSID ou BSSID estão faltando."
 
-#: ../clients/cli/devices.c:2689
+#: ../clients/cli/devices.c:2667
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Erro: o valor do argumento bssid \"%s\" não é um BSSID válido."
 
-#: ../clients/cli/devices.c:2713
+#: ../clients/cli/devices.c:2691
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4869,43 +4870,43 @@ msgstr ""
 "Erro: o valor do argumento wep-key-type \"%s\" é inválido, utilize \"key\" "
 "ou \"phrase\"."
 
-#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
+#: ../clients/cli/devices.c:2711 ../clients/cli/devices.c:2724
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Erro: %s: %s."
 
-#: ../clients/cli/devices.c:2761
+#: ../clients/cli/devices.c:2739
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Erro: BSSID para conectar-se a (%s) é diferente do argumento (%s)."
 
-#: ../clients/cli/devices.c:2767
+#: ../clients/cli/devices.c:2745
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Erro: o parâmetro \"%s\" não é SSID nem BSSID."
 
-#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:2760 ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3329
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Erro: nenhum dispositivo Wi-Fi encontrado."
 
-#: ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:2780
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Erro: falha ao scanear SSID oculto: %s."
 
-#: ../clients/cli/devices.c:2827
+#: ../clients/cli/devices.c:2805
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Erro: nenhuma rede com SSID \"%s\" foi encontrada."
 
-#: ../clients/cli/devices.c:2829
+#: ../clients/cli/devices.c:2807
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Erro: nenhum ponto de acesso com BSSID \"%s\" encontrado."
 
-#: ../clients/cli/devices.c:2871
+#: ../clients/cli/devices.c:2849
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -4913,89 +4914,89 @@ msgstr ""
 "Aviso: \"%s\" deveria ser SSID para APs ocultos, mas ele se parece com um "
 "BSSID.\n"
 
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:2863
 msgid "Password: "
 msgstr "Senha: "
 
-#: ../clients/cli/devices.c:3034
+#: ../clients/cli/devices.c:3012
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "\"%s\" não é um WPA PSK válido"
 
-#: ../clients/cli/devices.c:3051
+#: ../clients/cli/devices.c:3029
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "\"%s\" não é uma chave WEP válida (ele deveria ter 5 ou 13 caracteres ASCII)"
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3045
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Senha do hotspot: %s\n"
 
-#: ../clients/cli/devices.c:3125
+#: ../clients/cli/devices.c:3103
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Erro: ssid grande demais."
 
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3115
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "Erro: o valor do argumento de banda \"%s\" é inválido, utilize \"a\" ou \"bg"
 "\"."
 
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3139
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Erro: parâmetro desconhecido %s."
 
-#: ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3158
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Erro: canal necessita de banda também."
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3164
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Erro: canal \"%s\" não válido para banda \"%s\"."
 
-#: ../clients/cli/devices.c:3214
+#: ../clients/cli/devices.c:3192
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "Erro: o dispositivo \"%s\" não oferece suporte aos modos AP e Ad-Hoc."
 
-#: ../clients/cli/devices.c:3249
+#: ../clients/cli/devices.c:3227
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Erro: \"password\" inválida: %s."
 
-#: ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3296
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Erro: \"%s\" não pode repetir."
 
-#: ../clients/cli/devices.c:3399
+#: ../clients/cli/devices.c:3377
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"device wifi\" não é válido."
 
 #. Main header name
-#: ../clients/cli/devices.c:3425
+#: ../clients/cli/devices.c:3403
 msgid "Device LLDP neighbors"
 msgstr "Vizinhos LLDP do dispositivo"
 
-#: ../clients/cli/devices.c:3528
+#: ../clients/cli/devices.c:3506
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Erro: \"device lldp list\": %s"
 
-#: ../clients/cli/devices.c:3575
+#: ../clients/cli/devices.c:3553
 #, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"device lldp\" não é válido."
 
-#: ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3742
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Erro: comando \"dev %s\" é inválido."
@@ -5374,159 +5375,159 @@ msgstr "completa"
 msgid "Error: only these fields are allowed: %s"
 msgstr "Erro: somente estes campos são permitidos: %s"
 
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:357
 msgid "NetworkManager status"
 msgstr "Status do NetworkManager"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:362
 msgid "running"
 msgstr "executando"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "starting"
 msgstr "iniciando"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "started"
 msgstr "iniciado"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "enabled"
 msgstr "habilitado"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "disabled"
 msgstr "desabilitado"
 
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:443
 msgid "auth"
 msgstr "autenticação"
 
-#: ../clients/cli/general.c:475
+#: ../clients/cli/general.c:472
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Erro: \"general permissions\": %s"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:486
 msgid "NetworkManager permissions"
 msgstr "Permissões do NetworkManager"
 
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:527
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Erro: \"gravação registros gerais\": %s"
 
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:542
 msgid "NetworkManager logging"
 msgstr "Gravação de registros do NetworkManager"
 
-#: ../clients/cli/general.c:567
+#: ../clients/cli/general.c:564
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Erro: falha ao definir nome de máquina: %s"
 
-#: ../clients/cli/general.c:680
+#: ../clients/cli/general.c:677
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Erro: falha ao definir gravação de registros de log: %s"
 
-#: ../clients/cli/general.c:689
+#: ../clients/cli/general.c:686
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"general\" não é válido."
 
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:704
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "Erro: o valor \"%s\" de \"--fields\" não é válido aqui (campos permitidos: "
 "%s)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:729
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Erro: argumento \"%s\" inválido: \"%s\" (use on/off)."
 
-#: ../clients/cli/general.c:743
+#: ../clients/cli/general.c:740
 msgid "Connectivity"
 msgstr "Conectividade"
 
-#: ../clients/cli/general.c:758
+#: ../clients/cli/general.c:755
 msgid "Networking"
 msgstr "Rede"
 
-#: ../clients/cli/general.c:783
+#: ../clients/cli/general.c:780
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"network connectivity\" não é válido."
 
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:796
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"networking\" não é válido."
 
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:825 ../clients/cli/general.c:845
 msgid "Radio switches"
 msgstr "Alternadores de rádio"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:863
 msgid "Wi-Fi radio switch"
 msgstr "Alternador de rádio Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:879
 msgid "WWAN radio switch"
 msgstr "Alternador de rádio WWAN"
 
-#: ../clients/cli/general.c:893
+#: ../clients/cli/general.c:890
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Erro: o comando \"%s\" de \"radio\" não é válido."
 
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:911
 msgid "NetworkManager has started"
 msgstr "NetworkManager foi iniciado"
 
-#: ../clients/cli/general.c:917
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager foi parado"
 
-#: ../clients/cli/general.c:931
+#: ../clients/cli/general.c:928
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Nome de máquina definido para \"%s\"\n"
 
-#: ../clients/cli/general.c:946
+#: ../clients/cli/general.c:943
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "\"%s\" agora é a conexão primária\n"
 
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:945
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Não há conexão primária\n"
 
-#: ../clients/cli/general.c:960
+#: ../clients/cli/general.c:957
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Conectividade agora é \"%s\"\n"
 
-#: ../clients/cli/general.c:973
+#: ../clients/cli/general.c:970
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "NetworkManager não está no estado \"%s\"\n"
 
-#: ../clients/cli/general.c:984
+#: ../clients/cli/general.c:981
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Erro: comando de \"%s\" de \"monitor\" não é válido."
 
-#: ../clients/cli/general.c:998
+#: ../clients/cli/general.c:995
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "NetworkManager não está em execução (espere por ele)\n"
 
@@ -5544,8 +5545,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5572,8 +5571,6 @@ msgstr ""
 "  -f[ields] <campo1,campo2,...>|all|common especifica os campos para saída\n"
 "  -e[scape] yes|no                         descarta separadores de colunas\n"
 "                                            em valores\n"
-"  -n[ocheck]                               não verifica as versões do nmcli\n"
-"                                            e do NetworkManager\n"
 "  -a[sk]                                   questiona sobre os parâmetros "
 "que\n"
 "                                            faltam\n"
@@ -5593,64 +5590,64 @@ msgstr ""
 "  m[onitor]       monitora alterações do NetworkManager\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:143
+#: ../clients/cli/nmcli.c:142
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Erro: Objeto \"%s\" é desconhecido, tente \"nmcli help\"."
 
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:172
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Erro: Opção \"--terse\" especificada pela segunda vez."
 
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:177
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Erro: Opção \"--terse\" é mutualmente exclusiva com \"--pretty\"."
 
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:185
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Erro: Opção \"--pretty\" especificada pela segunda vez."
 
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:190
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Erro: Opção \"--pretty\" é mutualmente exclusiva com \"--terse\"."
 
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216
+#: ../clients/cli/nmcli.c:234 ../clients/cli/nmcli.c:265
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Erro: faltando argumento para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:227
+#: ../clients/cli/nmcli.c:243
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Erro: argumento \"%s\" não é válido para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:250
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Erro: faltando campos para as opções \"%s\"."
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:270
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Erro: \"%s\" não é um tempo de espera válido para a opção \"%s\"."
 
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:277
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "ferramenta nmcli, versão %s\n"
 
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:283
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Erro: Opção \"%s\" é desconhecida, tente \"nmcli -help\"."
 
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#: ../clients/cli/nmcli.c:366 ../clients/cli/nmcli.c:376
 #, c-format
 msgid ""
 "\n"
@@ -5659,22 +5656,22 @@ msgstr ""
 "\n"
 "Erro: nmcli foi finalizado com sinal %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:408
+#: ../clients/cli/nmcli.c:407
 #, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "Falha ao definir máscara do sinal: %d\n"
 
-#: ../clients/cli/nmcli.c:415
+#: ../clients/cli/nmcli.c:414
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "Falha ao criar o segmento de manipulação de sinal: %d\n"
 
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:511 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Erro: não foi possível criar objeto NMClient: %s."
 
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:528
 msgid "Success"
 msgstr "Sucesso"
 
@@ -5835,24 +5832,24 @@ msgstr "modo inválido \"%s\", use um de %s"
 msgid "always"
 msgstr "sempre"
 
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3279
+#: ../clients/cli/settings.c:4471 ../clients/cli/settings.c:4974
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "opção inválida \"%s\", use um de [%s]"
 
-#: ../clients/cli/settings.c:2116
+#: ../clients/cli/settings.c:2109
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Você também deseja definir \"%s\" para \"%s\"? [sim]: "
 
-#: ../clients/cli/settings.c:2118
+#: ../clients/cli/settings.c:2111
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Você também deseja limpar \"%s\"? [sim]: "
 
-#: ../clients/cli/settings.c:2279
+#: ../clients/cli/settings.c:2272
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
@@ -5860,86 +5857,86 @@ msgstr ""
 "Aviso: %s.%s define para \"%s\", mas ele pode ser ignorado no modo "
 "infraestrutura\n"
 
-#: ../clients/cli/settings.c:2298
+#: ../clients/cli/settings.c:2291
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr "Aviso: definição %s.%s requer remover as definições de ipv4 e ipv6\n"
 
-#: ../clients/cli/settings.c:2300
+#: ../clients/cli/settings.c:2293
 msgid "Do you want to remove them? [yes] "
 msgstr "Você deseja removê-las? [sim] "
 
-#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
-#: ../clients/cli/settings.c:5182
+#: ../clients/cli/settings.c:2389 ../clients/cli/settings.c:2784
+#: ../clients/cli/settings.c:5175
 #, c-format
 msgid "'%s' is not valid"
 msgstr "\"%s\" não é válido"
 
-#: ../clients/cli/settings.c:2419
+#: ../clients/cli/settings.c:2412
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "\"%d\" não é válido; use <%d-%d>"
 
-#: ../clients/cli/settings.c:2441
+#: ../clients/cli/settings.c:2434
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "\"%lld\" não é valida; use <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2463
+#: ../clients/cli/settings.c:2456
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "\"%u\" não é valida; use <%u-%u>"
 
-#: ../clients/cli/settings.c:2502
+#: ../clients/cli/settings.c:2495
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "\"%u\" não são sinalizadores válidos; use a combinação de %s"
 
-#: ../clients/cli/settings.c:2569
+#: ../clients/cli/settings.c:2562
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "\"%s\" não é válido; use <opção>=<valor>"
 
-#: ../clients/cli/settings.c:2603
+#: ../clients/cli/settings.c:2596
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "\"%s\" não é um índice válido"
 
-#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
+#: ../clients/cli/settings.c:2601 ../clients/cli/settings.c:2626
 msgid "no item to remove"
 msgstr "nenhum item para remover"
 
-#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
+#: ../clients/cli/settings.c:2605 ../clients/cli/settings.c:2630
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "índice \"%d\" está fora da faixa <0-%d>"
 
-#: ../clients/cli/settings.c:2652
+#: ../clients/cli/settings.c:2645
 #, c-format
 msgid "invalid option '%s'"
 msgstr "A opção \"%s\" é inválida"
 
-#: ../clients/cli/settings.c:2654
+#: ../clients/cli/settings.c:2647
 msgid "missing option"
 msgstr "falta opção"
 
-#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
-#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
+#: ../clients/cli/settings.c:2674 ../clients/cli/settings.c:2694
+#: ../clients/cli/settings.c:2714 ../clients/cli/settings.c:2734
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "\"%s\" não é um valor válido (ou está fora de faixa)"
 
-#: ../clients/cli/settings.c:2775
+#: ../clients/cli/settings.c:2768
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "\"%s\" não é um valor válido; use -1, 0 ou 1"
 
-#: ../clients/cli/settings.c:2807
+#: ../clients/cli/settings.c:2800
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "\"%s\" não é um MAC de porta ethernet válido"
 
-#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2825 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5947,40 +5944,40 @@ msgstr "\"%s\" não é um MAC de porta ethernet válido"
 msgid "'%s' is not a valid interface name"
 msgstr "\"%s\" não é um nome de interface válido"
 
-#: ../clients/cli/settings.c:2856
+#: ../clients/cli/settings.c:2849
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "Erro: \"priority\": \"%s\" não é um número válido <0-%d>"
 
-#: ../clients/cli/settings.c:2868
+#: ../clients/cli/settings.c:2861
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr ""
 "Aviso: soma \"%s\" é maior do que todas os sinalizadores => todos "
 "sinalizadores definidos\n"
 
-#: ../clients/cli/settings.c:2909
+#: ../clients/cli/settings.c:2902
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "\"%s\" não é um caracter hexadecimal válido"
 
-#: ../clients/cli/settings.c:2939
+#: ../clients/cli/settings.c:2932
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "\"%s\" não é um MAC válido"
 
-#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2958 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "\"%s\" não é um UUID válido"
 
-#: ../clients/cli/settings.c:3032
+#: ../clients/cli/settings.c:3025
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "a propriedade não contém a permissão \"%s\""
 
-#: ../clients/cli/settings.c:3044
+#: ../clients/cli/settings.c:3037
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5996,37 +5993,37 @@ msgstr ""
 "\n"
 "Exemplo: alice bob carlos\n"
 
-#: ../clients/cli/settings.c:3063
+#: ../clients/cli/settings.c:3056
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "\"%s\" não é um mestre válido; use nome-if ou UUID da conexão"
 
-#: ../clients/cli/settings.c:3107
+#: ../clients/cli/settings.c:3100
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "Aviso: %s não é um UUID de um perfile de conexão existente\n"
 
-#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#: ../clients/cli/settings.c:3104 ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "\"%s\" não é um perfil de conexão VPN"
 
-#: ../clients/cli/settings.c:3120
+#: ../clients/cli/settings.c:3113
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "\"%s\" não é um nome de um perfil existente"
 
-#: ../clients/cli/settings.c:3154
+#: ../clients/cli/settings.c:3147
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "o valor \"%s\" não é um UUID válido"
 
-#: ../clients/cli/settings.c:3161
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "a propriedade não contém UUID \"%s\""
 
-#: ../clients/cli/settings.c:3173
+#: ../clients/cli/settings.c:3166
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -6046,7 +6043,7 @@ msgstr ""
 "\n"
 "Exemplo: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3240
+#: ../clients/cli/settings.c:3233
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -6060,16 +6057,16 @@ msgstr ""
 "\"false\",\"no\",\"off\" para definir a conexão como não medida\n"
 "\"unknown\" para deixar o NetworkManager escolher usando uma heurística\n"
 
-#: ../clients/cli/settings.c:3364
+#: ../clients/cli/settings.c:3357
 msgid "private key password not provided"
 msgstr "não foi fornecida a senha da chave privada"
 
-#: ../clients/cli/settings.c:3392
+#: ../clients/cli/settings.c:3385
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "a propriedade não contém um método EAP \"%s\""
 
-#: ../clients/cli/settings.c:3409
+#: ../clients/cli/settings.c:3402
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -6085,13 +6082,13 @@ msgstr ""
 "não tratados.\n"
 "Exemplo: /home/cimrman/cert-ca.crt\n"
 
-#: ../clients/cli/settings.c:3428
+#: ../clients/cli/settings.c:3421
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr ""
 "a propriedade não contém um sujeito alternativo correspondente a \"%s\""
 
-#: ../clients/cli/settings.c:3444
+#: ../clients/cli/settings.c:3437
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -6105,7 +6102,7 @@ msgstr ""
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3456
+#: ../clients/cli/settings.c:3449
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6121,14 +6118,14 @@ msgstr ""
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/ac-segunda-fase.crt\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3469
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 "a propriedade não contém um sujeito alternativo de \"phase2\" correspondente "
 "a \"%s\""
 
-#: ../clients/cli/settings.c:3492
+#: ../clients/cli/settings.c:3485
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6137,15 +6134,15 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
-"Insira o caminho do arquivo para um certificado de cliente para autenticação "
-"\n"
+"Insira o caminho do arquivo para um certificado de cliente para "
+"autenticação \n"
 "interna (opcionalmente, prefixado com file://).\n"
 "  [file://]<caminho do arquivo>\n"
 "Note que nmcli não oferece suporte a especificar certificados como dados \n"
 "blob não tratados.\n"
 "Exemplo: /home/cimrman/jara-segunda-fase.crt\n"
 
-#: ../clients/cli/settings.c:3512
+#: ../clients/cli/settings.c:3505
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -6159,7 +6156,7 @@ msgstr ""
 "dados blob não-tratados.\n"
 "Exemplo: /home/fulanodetal/jara-priv-key SenhaSegredo\n"
 
-#: ../clients/cli/settings.c:3583
+#: ../clients/cli/settings.c:3576
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -6181,7 +6178,7 @@ msgstr ""
 "Exemplos: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3704
+#: ../clients/cli/settings.c:3697
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -6212,33 +6209,33 @@ msgstr ""
 "\n"
 "Exemplo: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3735
+#: ../clients/cli/settings.c:3728
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "\"%s\" não é um MAC InfiniBand válido"
 
-#: ../clients/cli/settings.c:3772
+#: ../clients/cli/settings.c:3765
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "\"%s\" não é uma P_Key IBoIP válida"
 
-#: ../clients/cli/settings.c:3803
+#: ../clients/cli/settings.c:3796
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr ""
 "\"%s\" não é válido; (o formato é: ip/[prefixo] [prox-salto] [métrica])"
 
-#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
+#: ../clients/cli/settings.c:3844 ../clients/cli/settings.c:3863
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "\"%s\" não é um endereço IPv4 válido"
 
-#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
+#: ../clients/cli/settings.c:3869 ../clients/cli/settings.c:4177
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "a propriedade não contém o servidor DNS \"%s\""
 
-#: ../clients/cli/settings.c:3888
+#: ../clients/cli/settings.c:3881
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -6248,22 +6245,22 @@ msgstr ""
 "\n"
 "Exemplo: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
+#: ../clients/cli/settings.c:3917 ../clients/cli/settings.c:4231
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "a propriedade não contém um domínio de pesquisa de DNS \"%s\""
 
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#: ../clients/cli/settings.c:3955 ../clients/cli/settings.c:4269
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "a propriedade não contém a opção DNS \"%s\""
 
-#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
+#: ../clients/cli/settings.c:4009 ../clients/cli/settings.c:4322
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "a propriedade não contém o endereço IP \"%s\""
 
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:4022
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6277,17 +6274,17 @@ msgstr ""
 "\n"
 "Exemplo: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#: ../clients/cli/settings.c:4038 ../clients/cli/settings.c:4351
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "endereço de gateway \"%s\" inválido"
 
-#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#: ../clients/cli/settings.c:4093 ../clients/cli/settings.c:4406
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "a propriedade não contém a rota \"%s\""
 
-#: ../clients/cli/settings.c:4113
+#: ../clients/cli/settings.c:4106
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6310,12 +6307,12 @@ msgstr ""
 "Exemplos: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
+#: ../clients/cli/settings.c:4152 ../clients/cli/settings.c:4171
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "\"%s\" não é um endereço IPv6 válido"
 
-#: ../clients/cli/settings.c:4196
+#: ../clients/cli/settings.c:4189
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -6336,7 +6333,7 @@ msgstr ""
 "\n"
 "Exemplo: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4342
+#: ../clients/cli/settings.c:4335
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6350,7 +6347,7 @@ msgstr ""
 "\n"
 "Exemplo: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4426
+#: ../clients/cli/settings.c:4419
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6375,28 +6372,28 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4436 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "%s não é um número"
 
-#: ../clients/cli/settings.c:4450
+#: ../clients/cli/settings.c:4443
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "\"%s\" não é válido; use 0, 1, ou 2"
 
-#: ../clients/cli/settings.c:4497
+#: ../clients/cli/settings.c:4490
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "\"%s\" não é um canal válido; use <1-13>"
 
-#: ../clients/cli/settings.c:4534
+#: ../clients/cli/settings.c:4527
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "\"%s\" não é válido; use [e, o, n]"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4555
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -6410,37 +6407,37 @@ msgstr ""
 "arquivo contendo a configuração. Neste caso, o arquivo é lido e o conteúdo é "
 "colocado nesta propriedade.\n"
 "\n"
-"Exemplos: set team.config { \"device\": \"team0\", \"runner\": {\"name\": \""
-"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
+"Exemplos: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
+"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/minha-união.conf\n"
 
-#: ../clients/cli/settings.c:4602
+#: ../clients/cli/settings.c:4595
 msgid "no priority to remove"
 msgstr "sem prioridade para remover"
 
-#: ../clients/cli/settings.c:4606
+#: ../clients/cli/settings.c:4599
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "índice \"%d\" está fora da faixa de <0-%d>"
 
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4638
 #, c-format
 msgid ""
 "Warning: only one mapping at a time is supported; taking the first one (%s)\n"
 msgstr ""
 "Aviso: há suporte a apenas um mapeamento por vez; tomando o primeiro (%s)\n"
 
-#: ../clients/cli/settings.c:4652
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "a propriedade não contém o mapeamento de \"%s\""
 
-#: ../clients/cli/settings.c:4700
+#: ../clients/cli/settings.c:4693
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "\"%s\" não pode estar vazio"
 
-#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../clients/cli/settings.c:4767 ../clients/cli/settings.c:4934
 #: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
 #: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
 #: ../libnm-util/nm-setting-wireless.c:859
@@ -6449,17 +6446,17 @@ msgstr "\"%s\" não pode estar vazio"
 msgid "'%s' is not a valid MAC address"
 msgstr "\"%s\" não é um endereço MAC válido"
 
-#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4773 ../clients/cli/settings.c:4940
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "a propriedade não contém o endereço MAC \"%s\""
 
-#: ../clients/cli/settings.c:4799
+#: ../clients/cli/settings.c:4792
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "\"%s\" não é válido; 2 ou 3 strings devem ser fornecidas"
 
-#: ../clients/cli/settings.c:4813
+#: ../clients/cli/settings.c:4806
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6469,12 +6466,12 @@ msgstr ""
 "\n"
 "Exemplo: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4835
+#: ../clients/cli/settings.c:4828
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "valor da string \"%s\" deveria consistir em 1 - 199 caracteres"
 
-#: ../clients/cli/settings.c:4867
+#: ../clients/cli/settings.c:4860
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6485,55 +6482,55 @@ msgstr ""
 "  option = <valor>, option = <valor>,... \n"
 "Opções válidas são: %s\n"
 
-#: ../clients/cli/settings.c:4913
+#: ../clients/cli/settings.c:4906
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "\"%s\" não é um canal válido"
 
-#: ../clients/cli/settings.c:4919
+#: ../clients/cli/settings.c:4912
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "\"%ld\" não é um canal válido"
 
-#: ../clients/cli/settings.c:5013
+#: ../clients/cli/settings.c:5006
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "opção \"%s\" inválida, use \"default\", \"never\" ou \"always\""
 
-#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
-#: ../clients/cli/settings.c:5152
+#: ../clients/cli/settings.c:5067 ../clients/cli/settings.c:5106
+#: ../clients/cli/settings.c:5145
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "a propriedade não contém o protocolo \"%s\""
 
-#: ../clients/cli/settings.c:5191
+#: ../clients/cli/settings.c:5184
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr ""
-"\"%s\" não é compatível com %s \"%s\", por favor altere a chave ou defina o %"
-"s correto primeiro."
+"\"%s\" não é compatível com %s \"%s\", por favor altere a chave ou defina o "
+"%s correto primeiro."
 
-#: ../clients/cli/settings.c:5199
+#: ../clients/cli/settings.c:5192
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Supõe-se que a chave WEP seja \"%s\"\n"
 
-#: ../clients/cli/settings.c:5201
+#: ../clients/cli/settings.c:5194
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "Ãndice da chave WEP definida para \"%d\"\n"
 
-#: ../clients/cli/settings.c:5224
+#: ../clients/cli/settings.c:5217
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr ""
 "\"%s\" não está nas proximidades [0 (desconhecido), 1 (chave), 2 (palavra-"
 "chave)]"
 
-#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
-#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
+#: ../clients/cli/settings.c:5233 ../clients/cli/settings.c:5236
+#: ../clients/cli/settings.c:5239 ../clients/cli/settings.c:5242
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6542,7 +6539,7 @@ msgstr ""
 "Aviso: \"%s\" não é compatível com o tipo \"%s\", por favor altere ou exclua "
 "a chave.\n"
 
-#: ../clients/cli/settings.c:5262
+#: ../clients/cli/settings.c:5255
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6551,36 +6548,36 @@ msgstr ""
 "Digite o tipo das chaves WEP. Os valores aceitáveis são: 0 ou unknown, 1 ou "
 "key, e 2 ou passphrase.\n"
 
-#: ../clients/cli/settings.c:5275
+#: ../clients/cli/settings.c:5268
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "\"%s\" não é um PSK válido"
 
-#: ../clients/cli/settings.c:5319
+#: ../clients/cli/settings.c:5312
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' não é uma opção DCB válida"
 
-#: ../clients/cli/settings.c:5342
+#: ../clients/cli/settings.c:5335
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' não é uma prioridade de app de DCB"
 
-#: ../clients/cli/settings.c:5368
+#: ../clients/cli/settings.c:5361
 msgid "must contain 8 comma-separated numbers"
 msgstr "deve conter 8 números separados por vírgulas"
 
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5378
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' não é um número entre 0 e %u (inclusive) ou %u"
 
-#: ../clients/cli/settings.c:5388
+#: ../clients/cli/settings.c:5381
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' não um número entre 0 e %u (inclusive)"
 
-#: ../clients/cli/settings.c:5410
+#: ../clients/cli/settings.c:5403
 #, c-format
 msgid ""
 "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
@@ -6589,42 +6586,42 @@ msgstr ""
 "Aviso: mudanças não tomarão efeito até '%s' incluindo 1 (habilitado)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5463
+#: ../clients/cli/settings.c:5456
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "porcentagem da largura de banda deve totalizar 100%%"
 
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+#: ../clients/cli/settings.c:5542 ../clients/cli/settings.c:5548
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr "ID de operador SIM deve ser um código MCCMNC de 5 ou 6 números"
 
-#: ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5591
 #, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "opção \"%s\" inválida, use \"%s\" ou \"%s\""
 
-#: ../clients/cli/settings.c:7644
+#: ../clients/cli/settings.c:7637
 msgid "don't know how to get the property value"
 msgstr "não há conhecimento de como obter o valor da propriedade"
 
-#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
+#: ../clients/cli/settings.c:7690 ../clients/cli/settings.c:7730
 msgid "the property can't be changed"
 msgstr "a propriedade não pode ser alterada"
 
-#: ../clients/cli/settings.c:7821
+#: ../clients/cli/settings.c:7814
 msgid "(not available)"
 msgstr "(não disponível)"
 
-#: ../clients/cli/settings.c:7846
+#: ../clients/cli/settings.c:7839
 msgid "[NM property description]"
 msgstr "[descrição propriedade NM]"
 
-#: ../clients/cli/settings.c:7851
+#: ../clients/cli/settings.c:7844
 msgid "[nmcli specific description]"
 msgstr "[descrição específica do nmcli]"
 
 #. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:7900
+#: ../clients/cli/settings.c:7893
 msgid "<hidden>"
 msgstr "<oculto>"
 
@@ -6643,81 +6640,53 @@ msgstr "Erro: era esperado o argumento \"%s\", porém foi fornecido \"%s\"."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Erro: o argumento \"%s\" é inesperado"
 
-#: ../clients/cli/utils.c:202
-#, c-format
-msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "Erro ao converter endereço IP4 \"0x%X\" para o formato texto"
-
-#: ../clients/cli/utils.c:230
-#, c-format
-msgid "Error converting IP6 address '%s' to text form"
-msgstr "Erro ao converter endereço IP6 \"%s\" para o formato texto"
-
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "\"%s\" é ambíguo (%s)"
 
-#: ../clients/cli/utils.c:556
+#: ../clients/cli/utils.c:502
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "\"%s\" não é válido; use [%s] ou [%s]"
 
-#: ../clients/cli/utils.c:589
+#: ../clients/cli/utils.c:535
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "\"%s\" não é válido; use [%s], [%s] ou [%s]"
 
-#: ../clients/cli/utils.c:688
+#: ../clients/cli/utils.c:634
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "\"%s\" é ambíguo (%s x %s)"
 
-#: ../clients/cli/utils.c:700
+#: ../clients/cli/utils.c:646
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "nome em falta, tente um de [%s]"
 
-#: ../clients/cli/utils.c:964
+#: ../clients/cli/utils.c:893
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "campo \"%s\" tem que ser um só"
 
-#: ../clients/cli/utils.c:967
+#: ../clients/cli/utils.c:896
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "campo inválido '%s'; campos permitidos: %s"
 
-#: ../clients/cli/utils.c:1024
+#: ../clients/cli/utils.c:953
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opção \"--terse\" requer especificação de \"--fields\""
 
-#: ../clients/cli/utils.c:1028
+#: ../clients/cli/utils.c:957
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opção \"--terse\" requer valores da opção \"--fields\", não \"%s\""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Aviso: As versões do nmcli (%s) e do NetworkManager (%s) não correspondem. "
-"Use --nocheck para omitir este aviso.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Aviso: As versões do nmcli (%s) e do NetworkManager (%s) não correspondem. "
-"Force a execução usando --nocheck, mas os resultados são imprevisíveis."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Uma sessão de autenticação já está ocorrendo."
@@ -6948,7 +6917,7 @@ msgstr "Conexão DSL %d"
 
 #: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
 #: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4190
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Vínculo"
 
@@ -6959,7 +6928,7 @@ msgstr "Conexão vinculada %d"
 
 #: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
 #: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4487
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Ponte"
 
@@ -6970,7 +6939,7 @@ msgstr "Conexão de Ponte %d"
 
 #: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
 #: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4296
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "União"
 
@@ -7977,7 +7946,6 @@ msgid "unknown setting name"
 msgstr "nome de definição desconhecido"
 
 #: ../libnm-core/nm-connection.c:306
-#| msgid "unknown setting name"
 msgid "duplicate setting name"
 msgstr "nome de definição duplicado"
 
@@ -8012,7 +7980,7 @@ msgstr "Falha inesperada ao normalizar a conexão"
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2162
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -8252,7 +8220,7 @@ msgstr "chave privada de phase2 inválida"
 #: ../libnm-core/nm-setting-connection.c:844
 #: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
 #: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8374,7 +8342,7 @@ msgstr "\"%s\" não é um valor válido para \"%s\""
 #: ../libnm-core/nm-setting-bond.c:547 ../libnm-util/nm-setting-bond.c:554
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr "\"%s=%s\" não é compatível com \"%s > 0\""
+msgstr "\"%s=%s\" é incompatível com \"%s > 0\""
 
 #: ../libnm-core/nm-setting-bond.c:560 ../libnm-util/nm-setting-bond.c:567
 #, c-format
@@ -8616,55 +8584,55 @@ msgstr "Endereço IPv4 inválido \"%s\""
 msgid "Invalid IPv6 address '%s'"
 msgstr "Endereço IPv6 inválido \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "Endereço IPv4 com prefixo inválido \"%u\""
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "Endereço IPv6 com prefixo inválido \"%u\""
 
-#: ../libnm-core/nm-setting-ip-config.c:170
+#: ../libnm-core/nm-setting-ip-config.c:168
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "Métrica roteamento inválida \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:2182
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. Endereço de servidor DNS é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2198
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. Endereço IP é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2210
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. Endereço IP possui a propriedade \"label\" com tipo inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2219
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. Endereço IPv4 possui um rótulo \"%s\" inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2233
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "gateway não pode ser definido se não houver endereços configurados"
 
-#: ../libnm-core/nm-setting-ip-config.c:2242
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "gateway é inválido"
 
-#: ../libnm-core/nm-setting-ip-config.c:2256
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d: rota é inválida"
 
-#: ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. rota não pode ser uma rota padrão"
@@ -8744,7 +8712,6 @@ msgid "property is not specified and neither is '%s:%s'"
 msgstr "propriedade não está especificada nem é \"%s=%s\""
 
 #: ../libnm-core/nm-setting-macvlan.c:192
-#| msgid "non promiscuous operation is allowed only in passthru mode'"
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "operação não promíscua é permitida apenas em modo passthru"
 
@@ -8932,19 +8899,16 @@ msgstr ""
 
 #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
 #, c-format
-#| msgid "Error: failed to set '%s' property: %s\n"
 msgid "failed to set property: %s"
 msgstr "falha ao definir a propriedade: %s"
 
 #: ../libnm-core/nm-setting.c:926
 #, c-format
-#| msgid "not a secret property"
 msgid "can not set property: %s"
 msgstr "não foi possível definir propriedade: %s"
 
 #: ../libnm-core/nm-setting.c:942
 #, c-format
-#| msgid "unknown error"
 msgid "unknown property"
 msgstr "propriedade desconhecida"
 
@@ -9006,39 +8970,39 @@ msgstr "Não há suporte a arquivos de libtool (%s)"
 msgid "Could not find \"%s\" binary"
 msgstr "Não foi possível localizar o executável \"%s\""
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:132
+#: ../libnm-core/nm-vpn-editor-plugin.c:142
+#, c-format
+msgid "cannot load plugin \"%s\": %s"
+msgstr "não foi possível carregar plug-in \"%s\": %s"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:153
+#, c-format
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr "falha ao carregar nm_vpn_editor_plugin_factory() de %s (%s)"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:178
 #, c-format
-msgid "cannot load plugin %s"
-msgstr "não foi possível carregar plug-in %s"
+msgid "unknown error initializing plugin %s"
+msgstr "erro desconhecido de inicialização do plug-in %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:160
+#: ../libnm-core/nm-vpn-editor-plugin.c:195
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
 "não foi possível carregar plug-in de VPN em \"%s\": faltando nome do plug-in"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:167
+#: ../libnm-core/nm-vpn-editor-plugin.c:204
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr ""
 "não foi possível carregar plug-in de VPN em \"%s\": nome de serviço inválido"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:183
-#, c-format
-msgid "unknown error initializing plugin %s"
-msgstr "erro desconhecido de inicialização do plug-in %s"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:195
-#, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr "falha ao carregar nm_vpn_editor_plugin_factory() de %s (%s)"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:256
+#: ../libnm-core/nm-vpn-editor-plugin.c:310
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "o plug-in não oferece suporte à capacidade de importação"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:276
+#: ../libnm-core/nm-vpn-editor-plugin.c:330
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "o plug-in não oferece suporte à capacidade de exportação"
@@ -9095,12 +9059,10 @@ msgid "Bluetooth"
 msgstr "Bluetooth"
 
 #: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
-#| msgid "VLAN"
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
 #: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
-#| msgid "IP Tunnel"
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
@@ -9324,7 +9286,8 @@ msgstr "A conexão não era VLAN."
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr "Os identificadores da VLAN do dispositivo e a conexão não correspondem."
+msgstr ""
+"Os identificadores da VLAN do dispositivo e a conexão não correspondem."
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
@@ -9508,17 +9471,17 @@ msgstr ""
 "Políticas de sistema previnem modificação da configuração de DNS global "
 "persistente"
 
-#: ../shared/nm-shared-utils.c:174
+#: ../shared/nm-shared-utils.c:185
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "a classe de objeto \"%s\" não possui uma propriedade chamada \"%s\""
 
-#: ../shared/nm-shared-utils.c:181
+#: ../shared/nm-shared-utils.c:192
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "a propriedade \"%s\" da classe de objeto \"%s\" não pode ser escrita"
 
-#: ../shared/nm-shared-utils.c:188
+#: ../shared/nm-shared-utils.c:199
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -9526,22 +9489,21 @@ msgstr ""
 "a propriedade de construtor \"%s\" para objeto \"%s\" não pode ser definido "
 "após construção"
 
-#: ../shared/nm-shared-utils.c:196
+#: ../shared/nm-shared-utils.c:207
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "\"%s::%s\" não é um nome de propriedade válido; \"%s\" não é um subtipo de "
 "GObject"
 
-#: ../shared/nm-shared-utils.c:205
+#: ../shared/nm-shared-utils.c:216
 #, c-format
-#| msgid "can't set property of type '%s' from value of type '%s'"
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "não foi possível definir a propriedade \"%s\" de tipo \"%s\" a partir do "
 "valor de tipo \"%s\""
 
-#: ../shared/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:227
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9566,25 +9528,25 @@ msgid "Failed to read configuration: %s\n"
 msgstr "Falha ao ler configuração: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:297
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Imprime a versão do NetworkManager e sai"
 
-#: ../src/main.c:235 ../src/nm-iface-helper.c:298
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Não se torna um daemon"
 
-#: ../src/main.c:236 ../src/nm-iface-helper.c:300
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Nível de registro: um dos [%s]"
 
-#: ../src/main.c:238 ../src/nm-iface-helper.c:302
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Domínios de registro separados por \",\": qualquer combinação de [%s]"
 
-#: ../src/main.c:240 ../src/nm-iface-helper.c:304
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Torna todos os avisos fatais"
 
@@ -9612,12 +9574,12 @@ msgstr ""
 "especifique pontos de acesso sem fio os quais cartões sem fio no\n"
 "computador podem ser associados."
 
-#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Por favor, use --help para ver uma lista de opções válidas.\n"
 
-#: ../src/main.c:348 ../src/nm-iface-helper.c:397
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
@@ -9635,7 +9597,7 @@ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "Ignorando domínio(s) de log irreconhecíveis '%s' dos arquivos de config.\n"
 
-#: ../src/main.c:389 ../src/nm-iface-helper.c:407
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Não foi possível tornar um daemon: %s [erro %u]\n"
@@ -9727,8 +9689,8 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Tipo de conexão Bluetooth desconhecida/não manipulada"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../src/devices/nm-device-ethernet.c:1420
+#: ../src/devices/nm-device-infiniband.c:193
 #: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "conexão não corresponde ao dispositivo"
@@ -9741,11 +9703,11 @@ msgstr "Conexão vinculada"
 msgid "Bridge connection"
 msgstr "Conexão de ponte"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "PPPoE connection"
 msgstr "Conexão PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "Wired connection"
 msgstr "Conexão cabeada"
 
@@ -9754,7 +9716,7 @@ msgstr "Conexão cabeada"
 msgid "Wired connection %d"
 msgstr "Conexão cabeada %d"
 
-#: ../src/devices/nm-device-infiniband.c:174
+#: ../src/devices/nm-device-infiniband.c:175
 msgid "InfiniBand connection"
 msgstr "Conexão InfiniBand"
 
@@ -9762,7 +9724,7 @@ msgstr "Conexão InfiniBand"
 msgid "IP tunnel connection"
 msgstr "Conexão de túnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:428
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
 msgstr "Conexão MACVLAN"
 
@@ -9770,7 +9732,7 @@ msgstr "Conexão MACVLAN"
 msgid "TUN connection"
 msgstr "Conexão TUN"
 
-#: ../src/devices/nm-device-vlan.c:447
+#: ../src/devices/nm-device-vlan.c:457
 msgid "VLAN connection"
 msgstr "Conexão VLAN"
 
@@ -9983,7 +9945,7 @@ msgstr "Lista de plug-ins separada por \",\""
 msgid "Quit after initial configuration"
 msgstr "Sair após configuração inicial"
 
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Não se tornar um daemon e registrar à saída padrão de erro (stderr)"
 
@@ -10001,87 +9963,87 @@ msgid "The expected start of the response"
 msgstr "O início esperado da resposta"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "The interface to manage"
 msgstr "A interface para gerenciar"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "eth0"
 msgstr "eth0"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Connection UUID"
 msgstr "UUID de conexão"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Se SLAAC IPv6 deve ser gerenciado"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
 msgstr "Se SLAAC deve ter obtido sucesso"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Usar um endereço de privacidade temporária"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Current DHCPv4 address"
 msgstr "Endereço DHCPv4 atual"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
 msgstr "Se DHCPv4 deve ter obtido sucesso"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "ID de cliente DHCPv4 codificado em Hexa"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
 msgstr "Nome de máquina para enviar ao servidor DHCP"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "barbar"
 msgstr "barrabarra"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN para enviar ao servidor DHCP"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
 msgstr "máquina.domínio.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
 msgstr "Prioridade de rota para IPv4"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "Route priority for IPv6"
 msgstr "Prioridade de rota para IPv6"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
 msgstr "Identificação de interface codificada em hexadecimal"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
 msgstr "modo de geração de endereço SLAAC IPv6"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -10089,7 +10051,7 @@ msgstr ""
 "O valor da configuração do backend de registro de log. Veja logging.backend "
 "no NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -10097,17 +10059,17 @@ msgstr ""
 "nm-iface-helper is é um pequeno processo independente que gerencia uma "
 "interface de rede singular."
 
-#: ../src/nm-iface-helper.c:373
+#: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Um nome de interface e UUID são necessários\n"
 
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Falha em localizar índice de interfaces para %s (%s)\n"
 
-#: ../src/nm-iface-helper.c:441
+#: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): IID %s inválido\n"
@@ -10122,7 +10084,7 @@ msgstr "Nível de registro \"%s\" desconhecido"
 msgid "Unknown log domain '%s'"
 msgstr "Domínio de registro \"%s\" desconhecido"
 
-#: ../src/nm-manager.c:3625
+#: ../src/nm-manager.c:3635
 msgid "VPN connection"
 msgstr "Conexão VPN"
 
@@ -10134,6 +10096,18 @@ msgstr "O NetworkManager precisa desligar as redes"
 msgid "System"
 msgstr "Sistema"
 
+#~ msgid "Error: not all connections reapplied."
+#~ msgstr "Erro: nem todas as conexões foram reaplicadas."
+
+#~ msgid "Error: no valid device provided."
+#~ msgstr "Erro: nem todos os dispositivos fornecidos."
+
+#~ msgid "Error converting IP4 address '0x%X' to text form"
+#~ msgstr "Erro ao converter endereço IP4 \"0x%X\" para o formato texto"
+
+#~ msgid "Error converting IP6 address '%s' to text form"
+#~ msgstr "Erro ao converter endereço IP6 \"%s\" para o formato texto"
+
 #~ msgid "Failed to read configuration: (%d) %s\n"
 #~ msgstr "Falha ao ler configuração: (%d) %s\n"
 
diff --git a/po/ru.po b/po/ru.po
index adad4ba1..f2018bec 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5382,8 +5382,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5410,8 +5408,6 @@ msgstr ""
 "  -f[ields] <поле1,поле2,...>|all|common   Ð¿Ð¾Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð°\n"
 "  -e[scape] yes|no                           иÑпользовать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ "
 "разделителей Ñтолбцов \n"
-"  -n[ocheck]                                 не проверÑть верÑии nmcli и "
-"NetworkManager\n"
 "  -a[sk]                                     запрашивать ввод недоÑтающих "
 "параметров\n"
 "  -w[ait] <Ñекунды>                          Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ "
@@ -6476,24 +6472,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Параметр «--terse» требует определённых значений «--fields», но не «%s»"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Предупреждение: верÑии nmcli (%s) и NetworkManager (%s) не Ñовпадают. "
-"ИÑпользуйте --nocheck Ð´Ð»Ñ Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтого предупреждениÑ.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Ошибка: верÑии nmcli (%s) и NetworkManager (%s) не Ñовпадают. Ð”Ð»Ñ "
-"принудительного запуÑка иÑпользуйте --nocheck, но результаты не предÑказуемы."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/rw.po b/po/rw.po
index 99ee78f9..7ab12004 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -4788,8 +4788,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5763,20 +5761,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index d1b7ea53..29d4523a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4853,8 +4853,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5830,20 +5828,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index e87f2141..1fdd856b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4864,8 +4864,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -4892,8 +4890,6 @@ msgstr ""
 "  -f[ields] <polje1,polje2,...>|all|common   doloÄilo polj odvoda\n"
 "  -e[scape] yes|no                           izpuÅ¡Äanje loÄilnikov "
 "vrednosti\n"
-"  -n[ocheck]                               ne preverjaj razliÄic nmcli in "
-"NetworkManager\n"
 "  -v[ersion]                                 pokaži razliÄico programa\n"
 "  -h[elp]                                    natisni pomoÄ\n"
 "\n"
@@ -5865,24 +5861,6 @@ msgstr "Možnost '--terse' zahteva podan argument '--fields'"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Možnost '--terse' zahteva posebne vrednosti '--polja' in ne '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Opozorilo: razliÄici nmcli (%s) in NetworkManager (%s) se ne ujemata. "
-"Uporabite --nocheck, da onemogoÄite opozorilo.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Napaka: razliÄici nmcli (%s) in NetworkManager (%s) se ne ujemata. Izvajanje "
-"vsilite z --nocheck, rezultati pa niso napovedljivi."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index f7534414..70215d30 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -4768,8 +4768,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5743,20 +5741,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index a590c3e2..a43ebefc 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4870,8 +4870,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5867,20 +5865,6 @@ msgstr "Опција „--terse“ захтева опцију „--fields“"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Опција „--terse“ захтева опцију „--fields“, а не „%s“"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 613218a3..3a2b4d33 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -4871,8 +4871,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5868,20 +5866,6 @@ msgstr "Opcija „--terse“ zahteva opciju „--fields“"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opcija „--terse“ zahteva opciju „--fields“, a ne „%s“"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e4754dbf..8c1b5fd6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
-"POT-Creation-Date: 2016-04-07 13:40+0000\n"
-"PO-Revision-Date: 2016-04-05 22:40+0200\n"
+"POT-Creation-Date: 2016-05-05 14:02+0000\n"
+"PO-Revision-Date: 2016-05-07 00:25+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -106,14 +106,14 @@ msgstr "Fel: Initiering av polkit-agent misslyckades: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli registrerade en polkit-agent.\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
-#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11054
+#: ../clients/cli/devices.c:3644 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:481
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Fel: Nätverkshanteraren är inte igång."
 
-#: ../clients/cli/agent.c:242
+#: ../clients/cli/agent.c:239
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Fel: â€agentâ€-kommandot â€%s†är inte giltigt."
@@ -235,7 +235,7 @@ msgstr "ansluter (startar sekundära anslutningar)"
 msgid "connected"
 msgstr "ansluten"
 
-#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:645
 msgid "deactivating"
 msgstr "inaktiverar"
 
@@ -244,25 +244,25 @@ msgid "connection failed"
 msgstr "anslutningen misslyckades"
 
 #: ../clients/cli/common.c:518 ../clients/cli/common.c:535
-#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
-#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/connections.c:650 ../clients/cli/connections.c:673
+#: ../clients/cli/connections.c:1946 ../clients/cli/devices.c:1024
 #: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
 #: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/general.c:429 ../clients/cli/general.c:445
 #: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
 #: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../clients/cli/settings.c:3198
 #, c-format
 msgid "unknown"
 msgstr "okänd"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:930
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934
+#: ../clients/cli/connections.c:968 ../clients/cli/connections.c:1037
+#: ../clients/cli/connections.c:1038 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:3454 ../clients/cli/connections.c:8567
+#: ../clients/cli/connections.c:8568 ../clients/cli/devices.c:772
 #: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
 #: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
 #: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
@@ -271,15 +271,15 @@ msgstr "okänd"
 #: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
 #: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
 #: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../clients/cli/general.c:439 ../clients/cli/settings.c:3193
 msgid "yes"
 msgstr "ja"
 
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
-#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
-#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:930
+#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:934
+#: ../clients/cli/connections.c:1037 ../clients/cli/connections.c:1038
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:3455
+#: ../clients/cli/connections.c:8567 ../clients/cli/connections.c:8568
 #: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
 #: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
 #: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
@@ -288,8 +288,8 @@ msgstr "ja"
 #: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
 #: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
 #: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
-#: ../clients/cli/settings.c:3202
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:441
+#: ../clients/cli/settings.c:3195
 msgid "no"
 msgstr "nej"
 
@@ -306,7 +306,7 @@ msgid "No reason given"
 msgstr "Ingen anledning angiven"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2980
 #, c-format
 msgid "Unknown error"
 msgstr "Okänt fel"
@@ -776,7 +776,7 @@ msgstr "SPEC-OBJEKT"
 #. 4
 #. Ask for optional 'vpn' arguments.
 #: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/cli/connections.c:4173 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -847,7 +847,7 @@ msgstr "IP6"
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:272
+#: ../clients/cli/connections.c:269
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -924,7 +924,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<utdatafil>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:294
+#: ../clients/cli/connections.c:291
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -971,7 +971,7 @@ msgstr ""
 "räknas. Flaggan --show-secrets kommer dessutom att visa associerade "
 "hemligheter.\n"
 
-#: ../clients/cli/connections.c:315
+#: ../clients/cli/connections.c:312
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1016,7 +1016,7 @@ msgstr ""
 "passwd-file - fil med lösenord som krävs för att aktivera anslutningen\n"
 "\n"
 
-#: ../clients/cli/connections.c:336
+#: ../clients/cli/connections.c:333
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1039,7 +1039,7 @@ msgstr ""
 "UUID eller D-Bus-sökväg.\n"
 "\n"
 
-#: ../clients/cli/connections.c:348
+#: ../clients/cli/connections.c:345
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1324,7 +1324,7 @@ msgstr ""
 "                  [ip6 <IPv6-adress>] [gw6 <IPv6-gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:460
+#: ../clients/cli/connections.c:457
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1374,7 +1374,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:483
+#: ../clients/cli/connections.c:480
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1397,7 +1397,7 @@ msgstr ""
 "id (tillhandahålls av argumentet <nytt namn>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:492
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1424,7 +1424,7 @@ msgstr ""
 "Lägg till en ny anslutningsprofil i en interaktiv redigerare.\n"
 "\n"
 
-#: ../clients/cli/connections.c:510
+#: ../clients/cli/connections.c:507
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1443,7 +1443,7 @@ msgstr ""
 "Profilen identifieras genom dess namn, UUID, och D-Bus-sökväg.\n"
 "\n"
 
-#: ../clients/cli/connections.c:521
+#: ../clients/cli/connections.c:518
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -1465,7 +1465,7 @@ msgstr ""
 "Övervakar alla anslutningsprofiler om ingen har angivits.\n"
 "\n"
 
-#: ../clients/cli/connections.c:533
+#: ../clients/cli/connections.c:530
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1478,7 +1478,7 @@ msgstr ""
 "Läs om alla anslutningsfiler från disk.\n"
 "\n"
 
-#: ../clients/cli/connections.c:541
+#: ../clients/cli/connections.c:538
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1502,7 +1502,7 @@ msgstr ""
 "tillstånd.\n"
 "\n"
 
-#: ../clients/cli/connections.c:553
+#: ../clients/cli/connections.c:550
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1527,7 +1527,7 @@ msgstr ""
 "importeras av Nätverkshanterarens VPN-insticksmoduler.\n"
 "\n"
 
-#: ../clients/cli/connections.c:566
+#: ../clients/cli/connections.c:563
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -1546,197 +1546,197 @@ msgstr ""
 "Data dirigeras till standard ut eller till en fil om ett namn anges.\n"
 "\n"
 
-#: ../clients/cli/connections.c:644
+#: ../clients/cli/connections.c:641
 msgid "activating"
 msgstr "aktiverar"
 
-#: ../clients/cli/connections.c:646
+#: ../clients/cli/connections.c:643
 msgid "activated"
 msgstr "aktiverad"
 
-#: ../clients/cli/connections.c:650
+#: ../clients/cli/connections.c:647
 msgid "deactivated"
 msgstr "inaktiverad"
 
-#: ../clients/cli/connections.c:662
+#: ../clients/cli/connections.c:659
 msgid "VPN connecting (prepare)"
 msgstr "VPN ansluter (förbereder)"
 
-#: ../clients/cli/connections.c:664
+#: ../clients/cli/connections.c:661
 msgid "VPN connecting (need authentication)"
 msgstr "VPN ansluter (behöver autentisering)"
 
-#: ../clients/cli/connections.c:666
+#: ../clients/cli/connections.c:663
 msgid "VPN connecting"
 msgstr "VPN ansluter"
 
-#: ../clients/cli/connections.c:668
+#: ../clients/cli/connections.c:665
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN ansluter (hämtar IP-konfiguration)"
 
-#: ../clients/cli/connections.c:670
+#: ../clients/cli/connections.c:667
 msgid "VPN connected"
 msgstr "VPN ansluten"
 
-#: ../clients/cli/connections.c:672
+#: ../clients/cli/connections.c:669
 msgid "VPN connection failed"
 msgstr "VPN-anslutning misslyckades"
 
-#: ../clients/cli/connections.c:674
+#: ../clients/cli/connections.c:671
 msgid "VPN disconnected"
 msgstr "VPN frånkopplad"
 
-#: ../clients/cli/connections.c:744
+#: ../clients/cli/connections.c:741
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Fel vid uppdatering av hemligheterna för %s: %s\n"
 
-#: ../clients/cli/connections.c:764
+#: ../clients/cli/connections.c:761
 msgid "Connection profile details"
 msgstr "Detaljer för anslutningsprofil"
 
-#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
+#: ../clients/cli/connections.c:773 ../clients/cli/connections.c:1166
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Fel: â€connection showâ€: %s"
 
-#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
+#: ../clients/cli/connections.c:929 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "aldrig"
 
-#: ../clients/cli/connections.c:1157
+#: ../clients/cli/connections.c:1154
 msgid "Activate connection details"
 msgstr "Aktivera anslutningsdetaljer"
 
-#: ../clients/cli/connections.c:1393
+#: ../clients/cli/connections.c:1390
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "ogiltigt fält â€%sâ€; tillÃ¥tna fält: %s och %s, eller %s, %s"
 
-#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
+#: ../clients/cli/connections.c:1405 ../clients/cli/connections.c:1413
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "â€%s†mÃ¥ste vara ensamt"
 
 #. Add headers
-#: ../clients/cli/connections.c:1634
+#: ../clients/cli/connections.c:1631
 msgid "NetworkManager active profiles"
 msgstr "Aktiva profiler för Nätverkshanteraren"
 
-#: ../clients/cli/connections.c:1635
+#: ../clients/cli/connections.c:1632
 msgid "NetworkManager connection profiles"
 msgstr "Anslutningsprofiler för Nätverkshanteraren"
 
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
-#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
-#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
-#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
-#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
-#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
-#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
-#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
-#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
-#: ../clients/cli/devices.c:3503
+#: ../clients/cli/connections.c:1678 ../clients/cli/connections.c:2393
+#: ../clients/cli/connections.c:2415 ../clients/cli/connections.c:2424
+#: ../clients/cli/connections.c:2433 ../clients/cli/connections.c:2592
+#: ../clients/cli/connections.c:10160 ../clients/cli/connections.c:10277
+#: ../clients/cli/connections.c:10409 ../clients/cli/connections.c:10542
+#: ../clients/cli/connections.c:10652 ../clients/cli/connections.c:10663
+#: ../clients/cli/connections.c:10762 ../clients/cli/devices.c:2322
+#: ../clients/cli/devices.c:2330 ../clients/cli/devices.c:2653
+#: ../clients/cli/devices.c:2660 ../clients/cli/devices.c:2674
+#: ../clients/cli/devices.c:2681 ../clients/cli/devices.c:2698
+#: ../clients/cli/devices.c:2706 ../clients/cli/devices.c:2719
+#: ../clients/cli/devices.c:3083 ../clients/cli/devices.c:3090
+#: ../clients/cli/devices.c:3097 ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3122 ../clients/cli/devices.c:3129
+#: ../clients/cli/devices.c:3301 ../clients/cli/devices.c:3308
+#: ../clients/cli/devices.c:3481
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Fel: %s-argument saknas."
 
-#: ../clients/cli/connections.c:1696
+#: ../clients/cli/connections.c:1693
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Fel: %s - inga sådana anslutningsprofiler."
 
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../clients/cli/connections.c:1752 ../clients/cli/connections.c:2456
+#: ../clients/cli/connections.c:11163 ../clients/cli/devices.c:3270
+#: ../clients/cli/devices.c:3751 ../clients/cli/general.c:536
+#: ../clients/cli/general.c:585 ../clients/cli/general.c:602
+#: ../clients/cli/general.c:641 ../clients/cli/general.c:655
+#: ../clients/cli/general.c:773 ../clients/cli/general.c:820
+#: ../clients/cli/general.c:840
 #, c-format
 msgid "Error: %s."
 msgstr "Fel: %s."
 
-#: ../clients/cli/connections.c:1851
+#: ../clients/cli/connections.c:1848
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "ingen aktiv anslutning pÃ¥ enheten â€%sâ€"
 
-#: ../clients/cli/connections.c:1859
+#: ../clients/cli/connections.c:1856
 msgid "no active connection or device"
 msgstr "ingen aktiv anslutning eller enhet"
 
-#: ../clients/cli/connections.c:1910
+#: ../clients/cli/connections.c:1907
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "enheten â€%s†är inte kompatibel med anslutningen â€%sâ€"
 
-#: ../clients/cli/connections.c:1913
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "ingen enhet hittades för anslutningen â€%sâ€"
 
-#: ../clients/cli/connections.c:1925
+#: ../clients/cli/connections.c:1922
 msgid "unknown reason"
 msgstr "okänd anledning"
 
-#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
+#: ../clients/cli/connections.c:1924 ../clients/cli/general.c:277
 msgid "none"
 msgstr "ingen"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:1926
 msgid "the user was disconnected"
 msgstr "användaren kopplades från"
 
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:1928
 msgid "the base network connection was interrupted"
 msgstr "basnätverksanslutningen avbröts"
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:1930
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN-tjänsten stoppades oväntat"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:1932
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN-tjänsten returnerade en ogiltig konfiguration"
 
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:1934
 msgid "the connection attempt timed out"
 msgstr "anslutningsförsöket översteg tidsgränsen"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:1936
 msgid "the VPN service did not start in time"
 msgstr "VPN-tjänsten startade inte i tid"
 
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:1938
 msgid "the VPN service failed to start"
 msgstr "VPN-tjänsten misslyckades med att starta"
 
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:1940
 msgid "no valid VPN secrets"
 msgstr "inga giltiga VPN-hemligheter"
 
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:1942
 msgid "invalid VPN secrets"
 msgstr "ogiltiga VPN-hemligheter"
 
-#: ../clients/cli/connections.c:1947
+#: ../clients/cli/connections.c:1944
 msgid "the connection was removed"
 msgstr "anslutningen togs bort"
 
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:1966 ../clients/cli/connections.c:2001
+#: ../clients/cli/connections.c:2162 ../clients/cli/connections.c:8458
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Anslutning aktiverades (aktiv sökväg för D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:1976
+#: ../clients/cli/connections.c:1974
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1745,203 +1745,204 @@ msgstr ""
 "Anslutning aktiverades (master väntar på slavar) (aktiv sökväg för D-Bus: "
 "%s)\n"
 
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:1981 ../clients/cli/connections.c:1984
+#: ../clients/cli/connections.c:2006
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Fel: Aktivering av anslutning misslyckades."
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2057
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN-anslutning aktiverad (aktiv sökväg för D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2061
+#: ../clients/cli/connections.c:2065
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Fel: Aktivering av anslutning misslyckades: %s."
 
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
+#: ../clients/cli/connections.c:2084 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Fel: Tidsgränsen %d sekunder gick ut."
 
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2144
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Fel: Aktivering av anslutning misslyckades: %s"
 
-#: ../clients/cli/connections.c:2225
+#: ../clients/cli/connections.c:2229
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "misslyckades med att läsa lösenordsfilen â€%sâ€: %s"
 
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2241
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "saknar kolon i â€passwordâ€-posten â€%sâ€"
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2249
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "saknar punkt i â€passwordâ€-posten â€%sâ€"
 
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2262
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "ogiltig inställning i â€passwordâ€-posten â€%sâ€"
 
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2318
 #, c-format
 msgid "unknown device '%s'."
 msgstr "okänd enhet â€%sâ€."
 
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2323
 msgid "neither a valid connection nor device given"
 msgstr "ingen aktiv anslutning eller enhet angiven"
 
-#: ../clients/cli/connections.c:2402
+#: ../clients/cli/connections.c:2406
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Fel: anslutningen â€%s†finns inte."
 
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
-#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
-#: ../clients/cli/devices.c:3336
+#: ../clients/cli/connections.c:2441 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2336 ../clients/cli/devices.c:2730
+#: ../clients/cli/devices.c:3314
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Okänd parameter: %s\n"
 
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2466
 msgid "preparing"
 msgstr "förbereder"
 
-#: ../clients/cli/connections.c:2483
+#: ../clients/cli/connections.c:2487
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Anslutningen â€%s†(%s) togs bort.\n"
 
-#: ../clients/cli/connections.c:2499
+#: ../clients/cli/connections.c:2503
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "Anslutningen â€%s†inaktiverades (aktiv sökväg för D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2574 ../clients/cli/connections.c:10395
+#: ../clients/cli/connections.c:10594
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Fel: Ingen anslutning angiven."
 
-#: ../clients/cli/connections.c:2602
+#: ../clients/cli/connections.c:2606
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Fel: â€%s†är inte en aktiv anslutning.\n"
 
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
+#: ../clients/cli/connections.c:2607 ../clients/cli/connections.c:10424
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Fel: hittade inte alla aktiva anslutningar."
 
-#: ../clients/cli/connections.c:2612
+#: ../clients/cli/connections.c:2616
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Fel: inga aktiva anslutningar tillhandahållna."
 
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:2959 ../clients/cli/utils.c:648
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "â€%s†inte bland [%s]"
 
-#: ../clients/cli/connections.c:3032
+#: ../clients/cli/connections.c:3036
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Fel: â€%sâ€: â€%s†är inte en giltig %s-MAC-adress."
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/cli/connections.c:3037 ../clients/cli/connections.c:3569
 #: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
 #: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../clients/cli/connections.c:3037 ../clients/tui/nm-editor-utils.c:146
 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3053
+#: ../clients/cli/connections.c:3057
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Fel: â€mtuâ€: â€%s†är inte ett giltigt MTU."
 
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3073
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Fel: â€parentâ€: â€%s†är inte ett giltigt gränssnittsnamn."
 
-#: ../clients/cli/connections.c:3090
+#: ../clients/cli/connections.c:3094
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Fel: â€p-keyâ€: â€%s†är inte en giltig InfiniBand P_KEY."
 
-#: ../clients/cli/connections.c:3105
+#: ../clients/cli/connections.c:3109
 #, c-format
 msgid "Error: '%s' is not a valid UID/GID."
 msgstr "Fel: â€%s†är inte ett giltigt UID/GID."
 
-#: ../clients/cli/connections.c:3149
+#: ../clients/cli/connections.c:3153
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
 msgstr "Fel: â€%sâ€: â€%s†är inte en giltig %s %s."
 
-#: ../clients/cli/connections.c:3162
+#: ../clients/cli/connections.c:3166
 msgid "Wi-Fi mode"
 msgstr "Wi-Fi-läge"
 
-#: ../clients/cli/connections.c:3171
+#: ../clients/cli/connections.c:3175
 msgid "InfiniBand transport mode"
 msgstr "InfiniBand transportläge"
 
-#: ../clients/cli/connections.c:3183
+#: ../clients/cli/connections.c:3187
 msgid "ADSL protocol"
 msgstr "ADSL-protokoll"
 
-#: ../clients/cli/connections.c:3194
+#: ../clients/cli/connections.c:3198
 msgid "ADSL encapsulation"
 msgstr "ADSL-inkapsling"
 
-#: ../clients/cli/connections.c:3203
+#: ../clients/cli/connections.c:3207
 msgid "TUN device mode"
 msgstr "TUN-enhetsläge"
 
-#: ../clients/cli/connections.c:3216
+#: ../clients/cli/connections.c:3220
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Fel: â€flagsâ€: â€%s†är inte giltig; använd <0-7>."
 
-#: ../clients/cli/connections.c:3238
+#: ../clients/cli/connections.c:3242
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Fel: â€%sâ€: â€%s†är inte giltig; %s "
 
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:3420
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "Varning: master=â€%s†hänvisar inte till nÃ¥gon befintlig profil.\n"
 
-#: ../clients/cli/connections.c:3441
+#: ../clients/cli/connections.c:3445
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Fel: â€%sâ€: â€%s†är inte giltig; använd <%u-%u>."
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
+#: ../clients/cli/connections.c:3501
 #, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
 msgstr[0] "Det finns %d valfritt argument för anslutningstypen  â€%sâ€.\n"
 msgstr[1] "Det finns %d valfria argument för anslutningstypen  â€%sâ€.\n"
 
-#: ../clients/cli/connections.c:3500
+#: ../clients/cli/connections.c:3504
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1949,879 +1950,879 @@ msgstr[0] "Vill du tillhandahålla det? %s"
 msgstr[1] "Vill du tillhandahålla dem? %s"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
+#: ../clients/cli/connections.c:3521
 msgid "ethernet"
 msgstr "ethernet"
 
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+#: ../clients/cli/connections.c:3526 ../clients/cli/connections.c:3574
+#: ../clients/cli/connections.c:3708 ../clients/cli/connections.c:3787
 msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
+#: ../clients/cli/connections.c:3537 ../clients/cli/connections.c:3585
+#: ../clients/cli/connections.c:3680 ../clients/cli/connections.c:3719
+#: ../clients/cli/connections.c:4105
 msgid "MAC [none]: "
 msgstr "MAC [ingen]: "
 
-#: ../clients/cli/connections.c:3544
+#: ../clients/cli/connections.c:3548
 msgid "Cloned MAC [none]: "
 msgstr "Klonad MAC [ingen]: "
 
-#: ../clients/cli/connections.c:3592
+#: ../clients/cli/connections.c:3596
 #, c-format
 msgid "Transport mode %s"
 msgstr "Transportläge %s"
 
-#: ../clients/cli/connections.c:3605
+#: ../clients/cli/connections.c:3609
 msgid "Parent interface [none]: "
 msgstr "Överordnat gränssnitt [inget]: "
 
-#: ../clients/cli/connections.c:3616
+#: ../clients/cli/connections.c:3620
 msgid "P_KEY [none]: "
 msgstr "P_KEY [ingen]: "
 
-#: ../clients/cli/connections.c:3626
+#: ../clients/cli/connections.c:3630
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Fel: â€p-key†är obligatoriskt när â€parent†är angett.\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../clients/cli/connections.c:3647 ../clients/tui/nm-editor-utils.c:154
 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
+#: ../clients/cli/connections.c:3655 ../clients/cli/connections.c:6203
 #, c-format
 msgid "Mode %s"
 msgstr "Läge %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../clients/cli/connections.c:3675 ../libnm-glib/nm-device.c:1857
 #: ../libnm/nm-device.c:1808
 msgid "WiMAX"
 msgstr "WiMAX"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
+#: ../clients/cli/connections.c:3698
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
+#: ../clients/cli/connections.c:3702 ../clients/cli/connections.c:3740
+#: ../clients/cli/connections.c:4227
 msgid "Password [none]: "
 msgstr "Lösenord [inget]: "
 
-#: ../clients/cli/connections.c:3700
+#: ../clients/cli/connections.c:3704
 msgid "Service [none]: "
 msgstr "Tjänst [ingen]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
+#: ../clients/cli/connections.c:3734
 msgid "mobile broadband"
 msgstr "mobilt bredband"
 
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+#: ../clients/cli/connections.c:3738 ../clients/cli/connections.c:4177
 msgid "Username [none]: "
 msgstr "Användarnamn [inget]: "
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
+#: ../clients/cli/connections.c:3753
 msgid "bluetooth"
 msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:3756
+#: ../clients/cli/connections.c:3760
 #, c-format
 msgid "Bluetooth type %s"
 msgstr "Bluetooth-typen %s"
 
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:3766
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Fel: â€bt-typeâ€: â€%s†är inte en giltig Bluetoothtyp.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/cli/connections.c:3782 ../clients/cli/devices.c:239
 #: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
 #: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
 #: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/cli/connections.c:3794
+#: ../clients/cli/connections.c:3798
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN-flaggor (<0-7>) [inga]: "
 
-#: ../clients/cli/connections.c:3805
+#: ../clients/cli/connections.c:3809
 msgid "Ingress priority maps [none]: "
 msgstr "Inträdesprioritetshash [ingen]: "
 
-#: ../clients/cli/connections.c:3816
+#: ../clients/cli/connections.c:3820
 msgid "Egress priority maps [none]: "
 msgstr "Utträdesprioritetshash [ingen]: "
 
-#: ../clients/cli/connections.c:3827
+#: ../clients/cli/connections.c:3831
 msgid "Bonding mode [balance-rr]: "
 msgstr "Kombineringsläge [balance-rr]: "
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
+#: ../clients/cli/connections.c:3847
 msgid "bond"
 msgstr "kombinera"
 
-#: ../clients/cli/connections.c:3865
+#: ../clients/cli/connections.c:3869
 msgid "Bonding primary interface [none]: "
 msgstr "Primärt kombineringsgränssnitt [inget]: "
 
-#: ../clients/cli/connections.c:3868
+#: ../clients/cli/connections.c:3872
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Fel: â€primaryâ€: â€%s†är inte ett giltigt gränssnittsnamn.\n"
 
-#: ../clients/cli/connections.c:3876
+#: ../clients/cli/connections.c:3880
 #, c-format
 msgid "Bonding monitoring mode %s"
 msgstr "Övervakningsläge %s för kombinering"
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3886
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Fel: â€%sâ€:  är inte ett giltigt övervakningsläge; använd â€%s†eller â€%sâ€.\n"
 
-#: ../clients/cli/connections.c:3891
+#: ../clients/cli/connections.c:3895
 msgid "Bonding miimon [100]: "
 msgstr "Kombinerings-miimon [100]: "
 
-#: ../clients/cli/connections.c:3894
+#: ../clients/cli/connections.c:3898
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fel: â€miimon†:  â€%s†är inte ett giltigt nummer <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3902
+#: ../clients/cli/connections.c:3906
 msgid "Bonding downdelay [0]: "
 msgstr "Nedfördröjning för kombinering [0]: "
 
-#: ../clients/cli/connections.c:3905
+#: ../clients/cli/connections.c:3909
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fel: â€downdelayâ€:  â€%s†är inte ett giltigt nummer <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3913
+#: ../clients/cli/connections.c:3917
 msgid "Bonding updelay [0]: "
 msgstr "Uppfördröjning för kombinering [0]: "
 
-#: ../clients/cli/connections.c:3916
+#: ../clients/cli/connections.c:3920
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fel: â€updelayâ€:  â€%s†är inte ett giltigt nummer <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3925
+#: ../clients/cli/connections.c:3929
 msgid "Bonding arp-interval [0]: "
 msgstr "arp-intervall för kombinering [0]: "
 
-#: ../clients/cli/connections.c:3928
+#: ../clients/cli/connections.c:3932
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fel: â€arp-intervalâ€:  â€%s†är inte ett giltigt nummer <0-%u>.\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
+#: ../clients/cli/connections.c:3940
 msgid "Bonding arp-ip-target [none]: "
 msgstr "arp-ip-target för kombinering [inget]: "
 
-#: ../clients/cli/connections.c:3943
+#: ../clients/cli/connections.c:3947
 msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "LACP-hastighet (\"slow\" eller \"fast\") [slow]: "
 
-#: ../clients/cli/connections.c:3949
+#: ../clients/cli/connections.c:3953
 #, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
 msgstr "Fel: â€lacp-rateâ€: â€%s†är ogiltig (â€slow†eller â€fastâ€).\n"
 
-#: ../clients/cli/connections.c:3972
+#: ../clients/cli/connections.c:3976
 msgid "Team JSON configuration [none]: "
 msgstr "JSON-konfiguration för grupp [ingen]: "
 
-#: ../clients/cli/connections.c:3989
+#: ../clients/cli/connections.c:3993
 msgid "team"
 msgstr "grupp"
 
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:3999
 msgid "team-slave"
 msgstr "grupp-slav"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
+#: ../clients/cli/connections.c:4011
 msgid "bridge"
 msgstr "brygga"
 
-#: ../clients/cli/connections.c:4013
+#: ../clients/cli/connections.c:4017
 #, c-format
 msgid "Enable STP %s"
 msgstr "Aktivera STP %s"
 
-#: ../clients/cli/connections.c:4018
+#: ../clients/cli/connections.c:4022
 #, c-format
 msgid "Error: 'stp': %s.\n"
 msgstr "Fel: â€stpâ€: %s.\n"
 
-#: ../clients/cli/connections.c:4026
+#: ../clients/cli/connections.c:4030
 msgid "STP priority [32768]: "
 msgstr "STP-prioritet [32768]: "
 
-#: ../clients/cli/connections.c:4030
+#: ../clients/cli/connections.c:4034
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Fel: â€priorityâ€:  â€%s†är inte ett giltigt nummer <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4042
 msgid "Forward delay [15]: "
 msgstr "Framåtfördröjning [15]: "
 
-#: ../clients/cli/connections.c:4042
+#: ../clients/cli/connections.c:4046
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Fel: â€forward-delayâ€:  â€%s†är inte ett giltigt nummer <2-30>.\n"
 
-#: ../clients/cli/connections.c:4051
+#: ../clients/cli/connections.c:4055
 msgid "Hello time [2]: "
 msgstr "Hallå-tid [2]: "
 
-#: ../clients/cli/connections.c:4055
+#: ../clients/cli/connections.c:4059
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Fel: â€hello-timeâ€:  â€%s†är inte ett giltigt nummer <1-10>.\n"
 
-#: ../clients/cli/connections.c:4063
+#: ../clients/cli/connections.c:4067
 msgid "Max age [20]: "
 msgstr "Max ålder [20]: "
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:4071
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Fel: â€max-ageâ€:  â€%s†är inte ett giltig nummer <6-40>.\n"
 
-#: ../clients/cli/connections.c:4075
+#: ../clients/cli/connections.c:4079
 msgid "MAC address ageing time [300]: "
 msgstr "Livstid för MAC-adress [300]: "
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:4083
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Fel: â€ageing-timeâ€:  â€%s†är inte ett giltig nummer <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4088
+#: ../clients/cli/connections.c:4092
 #, c-format
 msgid "Enable IGMP snooping %s"
 msgstr "Aktivera IGMP-avlyssning %s"
 
-#: ../clients/cli/connections.c:4093
+#: ../clients/cli/connections.c:4097
 #, c-format
 msgid "Error: 'multicast-snooping': %s.\n"
 msgstr "Fel: â€multicast-avlyssningâ€: %s.\n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
+#: ../clients/cli/connections.c:4124
 msgid "bridge-slave"
 msgstr "brygga-slav"
 
-#: ../clients/cli/connections.c:4125
+#: ../clients/cli/connections.c:4129
 msgid "Bridge port priority [32]: "
 msgstr "Prioritet för bryggport [32]: "
 
-#: ../clients/cli/connections.c:4138
+#: ../clients/cli/connections.c:4142
 msgid "Bridge port STP path cost [100]: "
 msgstr "STP-sökvägskostnad för bryggport [100]: "
 
-#: ../clients/cli/connections.c:4152
+#: ../clients/cli/connections.c:4156
 #, c-format
 msgid "Hairpin %s"
 msgstr "Hårnål %s"
 
-#: ../clients/cli/connections.c:4157
+#: ../clients/cli/connections.c:4161
 #, c-format
 msgid "Error: 'hairpin': %s.\n"
 msgstr "Fel: â€hairpinâ€: %s.\n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../clients/cli/connections.c:4188 ../libnm-glib/nm-device.c:1855
 #: ../libnm/nm-device.c:1806
 msgid "OLPC Mesh"
 msgstr "OLPC-mesh"
 
-#: ../clients/cli/connections.c:4189
+#: ../clients/cli/connections.c:4193
 msgid "OLPC Mesh channel [1]: "
 msgstr "OLPC-meshkanal [1]: "
 
-#: ../clients/cli/connections.c:4192
+#: ../clients/cli/connections.c:4196
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Fel: â€channelâ€: â€%s†är inte ett giltigt nummer <1-13>.\n"
 
-#: ../clients/cli/connections.c:4200
+#: ../clients/cli/connections.c:4204
 msgid "DHCP anycast MAC address [none]: "
 msgstr "DHCP-anycast MAC-adress [ingen]: "
 
 #. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../clients/cli/connections.c:4223 ../libnm-glib/nm-device.c:1871
 #: ../libnm/nm-device.c:1822
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4227
+#: ../clients/cli/connections.c:4231
 #, c-format
 msgid "ADSL encapsulation %s"
 msgstr "ADSL-inkapsling %s"
 
 #. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
+#: ../clients/cli/connections.c:4249
 msgid "macvlan"
 msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4251
+#: ../clients/cli/connections.c:4255
 #, c-format
 msgid "Tap %s"
 msgstr "Tap %s"
 
-#: ../clients/cli/connections.c:4256
+#: ../clients/cli/connections.c:4260
 #, c-format
 msgid "Error: 'tap': %s.\n"
 msgstr "Fel: â€tapâ€: %s.\n"
 
 #. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../clients/cli/connections.c:4276 ../libnm-glib/nm-device.c:1875
 #: ../libnm/nm-device.c:1826
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
+#: ../clients/cli/connections.c:4281 ../clients/cli/connections.c:4605
 msgid "Parent device [none]: "
 msgstr "Överordnad enhet [ingen]: "
 
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#: ../clients/cli/connections.c:4286 ../clients/cli/connections.c:4610
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
 msgstr "Fel: â€devâ€: â€%s†är varken UUID eller gränssnittsnamn.\n"
 
-#: ../clients/cli/connections.c:4291
+#: ../clients/cli/connections.c:4295
 msgid "Local address [none]: "
 msgstr "Lokal adress [ingen]: "
 
-#: ../clients/cli/connections.c:4296
+#: ../clients/cli/connections.c:4300
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
 msgstr "Fel: â€localâ€: â€%s†är inte en giltig IP-adress.\n"
 
-#: ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4309
 msgid "Minimum source port [0]: "
 msgstr "Lägsta källport [0]: "
 
-#: ../clients/cli/connections.c:4309
+#: ../clients/cli/connections.c:4313
 #, c-format
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
 msgstr "Fel: â€source-port-minâ€:  â€%s†är inte ett giltigt nummer <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4318
+#: ../clients/cli/connections.c:4322
 msgid "Maximum source port [0]: "
 msgstr "Högsta källport [0]: "
 
-#: ../clients/cli/connections.c:4322
+#: ../clients/cli/connections.c:4326
 #, c-format
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
 msgstr "Fel: â€source-port-maxâ€:  â€%s†är inte ett giltigt nummer <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4331
+#: ../clients/cli/connections.c:4335
 msgid "Destination port [8472]: "
 msgstr "Destinationsport [8472]: "
 
-#: ../clients/cli/connections.c:4335
+#: ../clients/cli/connections.c:4339
 #, c-format
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
 msgstr ""
 "Fel: â€destination-port†:  â€%s†är inte ett giltigt nummer <0-65535>.\n"
 
-#: ../clients/cli/connections.c:4374
+#: ../clients/cli/connections.c:4378
 msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "IPv4-adress (IP[/plen]) [ingen]: "
 
-#: ../clients/cli/connections.c:4376
+#: ../clients/cli/connections.c:4380
 msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "IPv6-adress (IP[/plen]) [ingen]: "
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4394
 #, c-format
 msgid "  Address successfully added: %s\n"
 msgstr "  Adress lades till: %s\n"
 
-#: ../clients/cli/connections.c:4392
+#: ../clients/cli/connections.c:4396
 #, c-format
 msgid "  Warning: address already present: %s\n"
 msgstr "  Varning: adressen finns redan: %s\n"
 
-#: ../clients/cli/connections.c:4394
+#: ../clients/cli/connections.c:4398
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Varning: ignorerar skräp pÃ¥ slutet: â€%sâ€\n"
 
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
+#: ../clients/cli/connections.c:4400 ../clients/cli/connections.c:5609
+#: ../clients/cli/connections.c:5656 ../clients/cli/connections.c:6573
+#: ../clients/cli/connections.c:6606
 msgid "Error: "
 msgstr "Fel: "
 
-#: ../clients/cli/connections.c:4416
+#: ../clients/cli/connections.c:4420
 msgid "IPv4 gateway [none]: "
 msgstr "IPv4-gateway [ingen]: "
 
-#: ../clients/cli/connections.c:4419
+#: ../clients/cli/connections.c:4423
 msgid "IPv6 gateway [none]: "
 msgstr "IPv6-gateway [ingen]: "
 
-#: ../clients/cli/connections.c:4439
+#: ../clients/cli/connections.c:4443
 #, c-format
 msgid "Error: invalid gateway address '%s'\n"
 msgstr "Fel: ogiltig gateway-adress â€%sâ€\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
+#: ../clients/cli/connections.c:4456
 #, c-format
 msgid "Do you want to add IP addresses? %s"
 msgstr "Vill du lägga till IP-adresser? %s"
 
-#: ../clients/cli/connections.c:4460
+#: ../clients/cli/connections.c:4464
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
 msgstr "Tryck <Retur> för att sluta lägga till adresser.\n"
 
 #. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../clients/cli/connections.c:4508 ../libnm-glib/nm-device.c:1879
 #: ../libnm/nm-device.c:1830
 msgid "Tun"
 msgstr "Tun"
 
-#: ../clients/cli/connections.c:4509
+#: ../clients/cli/connections.c:4513
 msgid "User ID [none]: "
 msgstr "Användar-ID [inget]: "
 
-#: ../clients/cli/connections.c:4522
+#: ../clients/cli/connections.c:4526
 msgid "Group ID [none]: "
 msgstr "Grupp-ID [inget]: "
 
-#: ../clients/cli/connections.c:4536
+#: ../clients/cli/connections.c:4540
 #, c-format
 msgid "Enable PI %s"
 msgstr "Aktivera PI %s"
 
-#: ../clients/cli/connections.c:4541
+#: ../clients/cli/connections.c:4545
 #, c-format
 msgid "Error: 'pi': %s.\n"
 msgstr "Fel: â€piâ€: %s.\n"
 
-#: ../clients/cli/connections.c:4549
+#: ../clients/cli/connections.c:4553
 #, c-format
 msgid "Enable VNET header %s"
 msgstr "Aktivera VNET-huvud %s"
 
-#: ../clients/cli/connections.c:4554
+#: ../clients/cli/connections.c:4558
 #, c-format
 msgid "Error: 'vnet-hdr': %s.\n"
 msgstr "Fel: â€vnet-hdrâ€: %s.\n"
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:4566
 #, c-format
 msgid "Enable multi queue %s"
 msgstr "Aktivera multikö %s"
 
-#: ../clients/cli/connections.c:4567
+#: ../clients/cli/connections.c:4571
 #, c-format
 msgid "Error: 'multi-queue': %s.\n"
 msgstr "Fel: â€multi-queueâ€: %s.\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
+#: ../clients/cli/connections.c:4585
 msgid "IP Tunnel"
 msgstr "IP-tunnel"
 
-#: ../clients/cli/connections.c:4586
+#: ../clients/cli/connections.c:4590
 msgid "Local endpoint [none]: "
 msgstr "Lokal ändpunkt [ingen]: "
 
-#: ../clients/cli/connections.c:4592
+#: ../clients/cli/connections.c:4596
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
 msgstr "Fel: â€localâ€: â€%s†är inte giltig, mÃ¥ste vara en IP-adress\n"
 
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#: ../clients/cli/connections.c:4662 ../clients/cli/connections.c:10188
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Fel: <inställning>.<egenskap>-argument saknas."
 
-#: ../clients/cli/connections.c:4663
+#: ../clients/cli/connections.c:4667
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Fel: värdet för â€%s†saknas."
 
-#: ../clients/cli/connections.c:4681
+#: ../clients/cli/connections.c:4685
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Fel: ogiltig <inställning>.<egenskap> â€%sâ€."
 
-#: ../clients/cli/connections.c:4689
+#: ../clients/cli/connections.c:4693
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Fel: ogiltig eller ej tillÃ¥ten inställning: â€%sâ€: %s."
 
-#: ../clients/cli/connections.c:4700
+#: ../clients/cli/connections.c:4704
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr "Fel: vet inte hur man skapar en â€%sâ€-inställning."
 
-#: ../clients/cli/connections.c:4710
+#: ../clients/cli/connections.c:4714
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Fel: ogiltig egenskap â€%sâ€: %s."
 
-#: ../clients/cli/connections.c:4722
+#: ../clients/cli/connections.c:4726
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Fel: misslyckades med att ändra %s.%s: %s."
 
-#: ../clients/cli/connections.c:4741
+#: ../clients/cli/connections.c:4745
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Fel: misslyckades att ta bort ett värde från %s.%s: %s."
 
-#: ../clients/cli/connections.c:4775
+#: ../clients/cli/connections.c:4779
 #, c-format
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
 msgstr ""
 "Varning: â€type†ignoreras. Använd â€nmcli connection add \"%s\"…†istället."
 
-#: ../clients/cli/connections.c:4783
+#: ../clients/cli/connections.c:4787
 msgid "Error: redundant 'master' option."
 msgstr "Fel: redundant â€masterâ€-flagga."
 
-#: ../clients/cli/connections.c:4796
+#: ../clients/cli/connections.c:4800
 msgid "Error: 'master' is required."
 msgstr "Fel: â€master†krävs."
 
-#: ../clients/cli/connections.c:4950
+#: ../clients/cli/connections.c:4954
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Fel: â€parentâ€: inte giltig utan â€p-keyâ€."
 
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:5009 ../clients/cli/connections.c:5971
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+#: ../clients/cli/connections.c:5012 ../clients/cli/connections.c:5974
 msgid "Error: 'ssid' is required."
 msgstr "Fel: â€ssid†krävs."
 
-#: ../clients/cli/connections.c:5072
+#: ../clients/cli/connections.c:5076
 msgid "WiMAX NSP name: "
 msgstr "WiMAX NSP-lista: "
 
-#: ../clients/cli/connections.c:5075
+#: ../clients/cli/connections.c:5079
 msgid "Error: 'nsp' is required."
 msgstr "Fel: â€nsp†krävs."
 
-#: ../clients/cli/connections.c:5127
+#: ../clients/cli/connections.c:5131
 msgid "PPPoE username: "
 msgstr "PPPoE-användarnamn: "
 
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+#: ../clients/cli/connections.c:5134 ../clients/cli/connections.c:6041
 msgid "Error: 'username' is required."
 msgstr "Fel: â€username†krävs."
 
-#: ../clients/cli/connections.c:5199
+#: ../clients/cli/connections.c:5203
 msgid "APN: "
 msgstr "APN: "
 
-#: ../clients/cli/connections.c:5202
+#: ../clients/cli/connections.c:5206
 msgid "Error: 'apn' is required."
 msgstr "Fel: â€apn†krävs."
 
-#: ../clients/cli/connections.c:5260
+#: ../clients/cli/connections.c:5264
 msgid "Bluetooth device address: "
 msgstr "Adress för Bluetooth-enhet: "
 
-#: ../clients/cli/connections.c:5263
+#: ../clients/cli/connections.c:5267
 msgid "Error: 'addr' is required."
 msgstr "Fel: â€addr†krävs."
 
-#: ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:5308
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr "Fel: â€bt-typeâ€: â€%s†inte giltig; använd [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:5348
+#: ../clients/cli/connections.c:5352
 msgid "VLAN parent device or connection UUID: "
 msgstr "Överordnad VLAN-enhet eller anslutnings-UUID: "
 
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+#: ../clients/cli/connections.c:5355 ../clients/cli/connections.c:6112
 msgid "Error: 'dev' is required."
 msgstr "Fel: â€dev†krävs."
 
-#: ../clients/cli/connections.c:5355
+#: ../clients/cli/connections.c:5359
 msgid "VLAN ID <0-4094>: "
 msgstr "VLAN-ID <0-4094>: "
 
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:5362 ../clients/cli/connections.c:6428
 msgid "Error: 'id' is required."
 msgstr "Fel: â€id†krävs."
 
-#: ../clients/cli/connections.c:5364
+#: ../clients/cli/connections.c:5368
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4094>."
 msgstr "Fel: â€idâ€: â€%s†är inte giltigt: använd <0-4094>."
 
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#: ../clients/cli/connections.c:5378 ../clients/cli/connections.c:6120
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr "Fel: â€devâ€: â€%s†är varken UUID, gränssnittsnamn eller MAC."
 
-#: ../clients/cli/connections.c:5506
+#: ../clients/cli/connections.c:5510
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Fel: â€modeâ€: %s."
 
-#: ../clients/cli/connections.c:5515
+#: ../clients/cli/connections.c:5519
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Fel: â€primaryâ€: â€%s†är inte ett giltigt gränssnittsnamn."
 
-#: ../clients/cli/connections.c:5738
+#: ../clients/cli/connections.c:5742
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Fel: â€stpâ€: %s."
 
-#: ../clients/cli/connections.c:5747
+#: ../clients/cli/connections.c:5751
 #, c-format
 msgid "Error: 'multicast-snooping': %s."
 msgstr "Fel: â€multicast-avlyssningâ€: %s."
 
-#: ../clients/cli/connections.c:5866
+#: ../clients/cli/connections.c:5870
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Fel: â€hairpinâ€: %s."
 
-#: ../clients/cli/connections.c:5915
+#: ../clients/cli/connections.c:5919
 msgid "Error: 'vpn-type' is required."
 msgstr "Fel: â€vpn-type†krävs."
 
-#: ../clients/cli/connections.c:5922
+#: ../clients/cli/connections.c:5926
 #, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Varning: â€vpn-typeâ€: %s okänd.\n"
 
-#: ../clients/cli/connections.c:5983
+#: ../clients/cli/connections.c:5987
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Fel: â€channelâ€: â€%s†är inte giltigt; använd <1-13>."
 
-#: ../clients/cli/connections.c:6034
+#: ../clients/cli/connections.c:6038
 msgid "Username: "
 msgstr "Användarnamn: "
 
-#: ../clients/cli/connections.c:6043
+#: ../clients/cli/connections.c:6047
 #, c-format
 msgid "Protocol %s"
 msgstr "Protokoll %s"
 
-#: ../clients/cli/connections.c:6046
+#: ../clients/cli/connections.c:6050
 msgid "Error: 'protocol' is required."
 msgstr "Fel: â€protocol†krävs."
 
-#: ../clients/cli/connections.c:6105
+#: ../clients/cli/connections.c:6109
 msgid "MACVLAN parent device or connection UUID: "
 msgstr "Överordnad MACVLAN-enhet eller anslutnings-UUID: "
 
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
+#: ../clients/cli/connections.c:6129 ../clients/cli/connections.c:6209
+#: ../clients/cli/connections.c:6311
 msgid "Error: 'mode' is required."
 msgstr "Fel: â€mode†krävs."
 
-#: ../clients/cli/connections.c:6131
+#: ../clients/cli/connections.c:6135
 msgid "Error: 'mode' is not valid."
 msgstr "Fel: â€mode†är inte giltigt."
 
-#: ../clients/cli/connections.c:6144
+#: ../clients/cli/connections.c:6148
 #, c-format
 msgid "Error: 'tap': %s."
 msgstr "Fel: â€tapâ€: %s."
 
-#: ../clients/cli/connections.c:6230
+#: ../clients/cli/connections.c:6234
 #, c-format
 msgid "Error: 'pi': %s."
 msgstr "Fel: â€piâ€: %s."
 
-#: ../clients/cli/connections.c:6241
+#: ../clients/cli/connections.c:6245
 #, c-format
 msgid "Error: 'vnet-hdr': %s."
 msgstr "Fel: â€vnet-hdrâ€: %s."
 
-#: ../clients/cli/connections.c:6252
+#: ../clients/cli/connections.c:6256
 #, c-format
 msgid "Error: 'multi-queue': %s."
 msgstr "Fel: â€multi-queueâ€: %s."
 
-#: ../clients/cli/connections.c:6321
+#: ../clients/cli/connections.c:6325
 #, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
 msgstr "Fel: â€modeâ€: â€%s†är inte giltigt, använd ett av %s"
 
-#: ../clients/cli/connections.c:6327
+#: ../clients/cli/connections.c:6331
 msgid "Remote endpoint: "
 msgstr "Fjärrändpunkt: "
 
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
+#: ../clients/cli/connections.c:6334 ../clients/cli/connections.c:6436
 msgid "Error: 'remote' is required."
 msgstr "Fel: â€remote†krävs."
 
-#: ../clients/cli/connections.c:6337
+#: ../clients/cli/connections.c:6341
 #, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
 msgstr "Fel: â€remoteâ€: â€%s†är inte giltig, mÃ¥ste vara en IP-adress"
 
-#: ../clients/cli/connections.c:6351
+#: ../clients/cli/connections.c:6355
 #, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
 msgstr "Fel: â€localâ€: â€%s†är inte giltig, mÃ¥ste vara en IP-adress"
 
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
+#: ../clients/cli/connections.c:6364 ../clients/cli/connections.c:6459
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
 msgstr "Fel: â€devâ€: â€%s†är varken UUID eller gränssnittsnamn."
 
-#: ../clients/cli/connections.c:6421
+#: ../clients/cli/connections.c:6425
 msgid "VXLAN ID: "
 msgstr "VXLAN-ID: "
 
-#: ../clients/cli/connections.c:6429
+#: ../clients/cli/connections.c:6433
 msgid "Remote: "
 msgstr "Fjärr: "
 
-#: ../clients/cli/connections.c:6438
+#: ../clients/cli/connections.c:6442
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
 msgstr "Fel: â€idâ€: â€%s†är inte giltigt: använd <0-16777215>."
 
-#: ../clients/cli/connections.c:6464
+#: ../clients/cli/connections.c:6468
 #, c-format
 msgid "Error: 'remote': '%s' is not a valid IP address"
 msgstr "Fel: â€remoteâ€: â€%s†är inte en giltig IP-adress"
 
-#: ../clients/cli/connections.c:6473
+#: ../clients/cli/connections.c:6477
 #, c-format
 msgid "Error: 'local': '%s' is not a valid IP address"
 msgstr "Fel: â€localâ€: â€%s†är inte en giltig IP-adress"
 
-#: ../clients/cli/connections.c:6482
+#: ../clients/cli/connections.c:6486
 #, c-format
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
 msgstr "Fel: â€source-port-minâ€: %s är inte giltig; använd <0-65535>."
 
-#: ../clients/cli/connections.c:6491
+#: ../clients/cli/connections.c:6495
 #, c-format
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
 msgstr "Fel: â€source-port-maxâ€: %s är inte giltig; använd <0-65535>."
 
-#: ../clients/cli/connections.c:6500
+#: ../clients/cli/connections.c:6504
 #, c-format
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
 msgstr "Fel: â€destination-portâ€: %s är inte giltig: använd <0-65535>."
 
-#: ../clients/cli/connections.c:6540
+#: ../clients/cli/connections.c:6544
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Fel: â€%s†är inte en giltig anslutningstyp."
 
-#: ../clients/cli/connections.c:6581
+#: ../clients/cli/connections.c:6585
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr "Fel: IPv4-gateway angiven utan IPv4-adresser"
 
-#: ../clients/cli/connections.c:6585
+#: ../clients/cli/connections.c:6589
 #, c-format
 msgid "Error: multiple IPv4 gateways specified"
 msgstr "Fel: flera IPv4-gateways angivna"
 
-#: ../clients/cli/connections.c:6589
+#: ../clients/cli/connections.c:6593
 #, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
 msgstr "Fel: ogiltig IPv4-gateway â€%sâ€"
 
-#: ../clients/cli/connections.c:6614
+#: ../clients/cli/connections.c:6618
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr "Fel: IPv6-gateway angiven utan IPv6-adresser"
 
-#: ../clients/cli/connections.c:6618
+#: ../clients/cli/connections.c:6622
 #, c-format
 msgid "Error: multiple IPv6 gateways specified"
 msgstr "Fel: flera IPv6-gateways angivna"
 
-#: ../clients/cli/connections.c:6622
+#: ../clients/cli/connections.c:6626
 #, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
 msgstr "Fel: ogiltig IPv6-gateway â€%sâ€"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:10227
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Fel: Misslyckades med att lägga till â€%sâ€-anslutning: %s"
 
-#: ../clients/cli/connections.c:6675
+#: ../clients/cli/connections.c:6679
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Anslutning â€%s†(%s) lades till.\n"
 
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#: ../clients/cli/connections.c:6955 ../clients/cli/connections.c:10682
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Fel: â€typeâ€-argument saknas."
 
-#: ../clients/cli/connections.c:6959
+#: ../clients/cli/connections.c:6963
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Fel: ogiltig anslutningstyp; %s."
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:6972 ../clients/cli/devices.c:2142
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Fel: â€autoconnectâ€: %s."
 
-#: ../clients/cli/connections.c:6978
+#: ../clients/cli/connections.c:6982
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Fel: â€saveâ€: %s."
 
-#: ../clients/cli/connections.c:6995
+#: ../clients/cli/connections.c:6999
 msgid "Interface name [*]: "
 msgstr "Gränssnittsnamn [*]: "
 
-#: ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:7004
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Fel: â€ifnameâ€-argument krävs."
 
-#: ../clients/cli/connections.c:7002
+#: ../clients/cli/connections.c:7006
 #, c-format
 msgid "Error: mandatory 'ifname' not seen before '%s'."
 msgstr "Fel: obligatoriskt â€ifname†inte sett innan â€%sâ€."
 
-#: ../clients/cli/connections.c:7011
+#: ../clients/cli/connections.c:7015
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr ""
 "Fel: â€ifnameâ€: â€%s†är inte ett giltigt gränssnittsnamn, inte heller â€*â€."
 
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:8039
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[â€%sâ€-inställningsvärden]\n"
@@ -2829,7 +2830,7 @@ msgstr "[â€%sâ€-inställningsvärden]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8117
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2863,7 +2864,7 @@ msgstr ""
 "nmcli    <konf-flagga> <value>       :: nmcli-konfiguration\n"
 "quit                                 :: avsluta nmcli\n"
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:8148
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2883,7 +2884,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:8155
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -2905,7 +2906,7 @@ msgstr ""
 "Exempel: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:8162
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2920,7 +2921,7 @@ msgstr ""
 "\n"
 "Exempel: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:8167
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2933,7 +2934,7 @@ msgstr ""
 "Visar egenskapsbeskrivning. Du kan titta i handboken för nm-settings(5) för "
 "att se alla NH-inställningar och egenskaper.\n"
 
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:8172
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2948,7 +2949,7 @@ msgstr ""
 "\n"
 "Exempel: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8173
+#: ../clients/cli/connections.c:8177
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2974,7 +2975,7 @@ msgstr ""
 "         nmcli> verify fix\n"
 "         nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:8186
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -3000,7 +3001,7 @@ msgstr ""
 "Om du vill ta bort den sparade anslutningen helt\n"
 "måste profilen tas bort.\n"
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:8197
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -3021,7 +3022,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) eller NSP (WiMAX) (lägg till / i början när "
 "<grnamn> inte anges)\n"
 
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:8204 ../clients/cli/connections.c:8363
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -3030,7 +3031,7 @@ msgstr ""
 "back  :: gå upp en menynivå\n"
 "\n"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:8207
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -3039,7 +3040,7 @@ msgstr ""
 "help/? [<kommando>]  :: hjälp för nmcli-kommandot\n"
 "\n"
 
-#: ../clients/cli/connections.c:8206
+#: ../clients/cli/connections.c:8210
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -3066,7 +3067,7 @@ msgstr ""
 "         nmcli> nmcli save-confirmation no\n"
 "         nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8232 ../clients/cli/connections.c:8369
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -3079,8 +3080,8 @@ msgstr ""
 "Kommandot avslutar nmcli. När anslutningen som redigerats inte sparas frågas "
 "användaren om att bekräfta åtgärden.\n"
 
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:8237 ../clients/cli/connections.c:8374
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:9746
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Okänt kommando: â€%sâ€\n"
@@ -3088,7 +3089,7 @@ msgstr "Okänt kommando: â€%sâ€\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8299
+#: ../clients/cli/connections.c:8303
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -3117,7 +3118,7 @@ msgstr ""
 "kommandobeskrivning\n"
 "quit                             :: avsluta nmcli\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:8328
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -3128,7 +3129,7 @@ msgstr ""
 "\n"
 "Detta kommando sätter angivet <värde> till denna egenskap\n"
 
-#: ../clients/cli/connections.c:8328
+#: ../clients/cli/connections.c:8332
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -3143,7 +3144,7 @@ msgstr ""
 "egenskapen är av en behållartyp. För egenskaper med ett värde ersätts "
 "egenskapsvärdet (samma som â€setâ€).\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -3154,7 +3155,7 @@ msgstr ""
 "\n"
 "Visar aktuellt värde och tillåter redigering av det.\n"
 
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:8342
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3189,7 +3190,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:8353
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3202,7 +3203,7 @@ msgstr ""
 "Visar egenskapsbeskrivning. Se nm-settings(5)-handboken för att se alla NH-"
 "inställningar och egenskaper.\n"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:8358
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3217,7 +3218,7 @@ msgstr ""
 "Visar egenskapsvärdet. Med argument kan du också visa värden för hela "
 "inställningen eller anslutningen.\n"
 
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:8366
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -3226,28 +3227,28 @@ msgstr ""
 "help/? [<kommando>]  :: hjälp för nmcli-kommandon\n"
 "\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8464
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Fel: Aktivering av anslutning misslyckades.\n"
 
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:8547
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Fel: inställningen â€%s†är obligatorisk och kan inte tas bort.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8561
+#: ../clients/cli/connections.c:8565
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Typ: %s | Namn: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8601
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "Anslutningen sparas inte. Vill du verkligen avsluta? %s"
 
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:8650
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3256,66 +3257,66 @@ msgstr ""
 "Anslutningsprofilen har tagits bort från en annan klient. Du kan skriva "
 "â€save†i huvudmenyn för att Ã¥terställa den.\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Tillgängliga värden för â€%sâ€-egenskapen: %s\n"
 
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:8679 ../clients/cli/connections.c:9101
+#: ../clients/cli/connections.c:9159
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Ange â€%sâ€-värde: "
 
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:8694 ../clients/cli/connections.c:8716
+#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9164
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Fel: misslyckades med att sätta â€%sâ€-egenskapen: %s\n"
 
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:8710
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Redigera â€%sâ€-värde: "
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:8739
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:8745 ../clients/cli/connections.c:9246
+#: ../clients/cli/connections.c:9294
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Fel: misslyckades med att ta bort värdet â€%sâ€: %s\n"
 
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:8766
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Okänt kommandoargument: â€%sâ€\n"
 
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:8871
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Tillgängliga inställningar: %s\n"
 
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:8883
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Fel: ogiltigt namn på inställning; %s\n"
 
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:8900
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Tillgängliga egenskaper: %s\n"
 
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:8908
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Fel: egenskapen %s\n"
 
-#: ../clients/cli/connections.c:8945
+#: ../clients/cli/connections.c:8949
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -3326,12 +3327,12 @@ msgstr ""
 "anslutningen aktiveras omedelbart.\n"
 "Vill du fortfarande spara? %s"
 
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Du kan redigera följande inställningar: %s\n"
 
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:9067
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -3340,219 +3341,219 @@ msgstr ""
 "Anslutningsprofilen har tagits bort från en annan klient. Du kan skriva "
 "â€save†för att Ã¥terställa den.\n"
 
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:9109 ../clients/cli/connections.c:9339
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Fel: ingen inställning vald; giltiga är [%s]\n"
 
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:9110
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "använd â€goto <inställning>†först eller â€set <inställning>.<egenskap>â€\n"
 
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9273
+#: ../clients/cli/connections.c:9361
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Fel: ogiltigt argument för inställningen â€%sâ€; giltiga är [%s]\n"
 
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Fel: saknar inställning för egenskapen â€%sâ€\n"
 
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:9141
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Fel: ogiltig egenskap: %s\n"
 
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Fel: Okänd inställning: â€%sâ€\n"
 
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:9207
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Du kan redigera följande egenskaper: %s\n"
 
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:9251
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Fel: inga argument givna; giltiga är [%s]\n"
 
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:9270
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Inställningen â€%s†finns inte i anslutningen.\n"
 
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:9315
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Fel: %s-egenskaper, inte heller ett inställningsnamn.\n"
 
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:9340
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "använd â€goto <inställning>†först, eller â€describe <inställning>."
 "<egenskap>â€\n"
 
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:9389
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr ""
 "Fel: ogiltig egenskap: %s, och inte heller ett giltigt inställningsnamn.\n"
 
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:9421
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Fel: okänd inställning: â€%sâ€\n"
 
-#: ../clients/cli/connections.c:9422
+#: ../clients/cli/connections.c:9426
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Fel: inställningen â€%s†finns inte i anslutningen\n"
 
-#: ../clients/cli/connections.c:9450
+#: ../clients/cli/connections.c:9454
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Fel: ogiltig egenskap: %s%s\n"
 
-#: ../clients/cli/connections.c:9452
+#: ../clients/cli/connections.c:9456
 msgid ", neither a valid setting name"
 msgstr ", inte heller ett giltigt inställningsnamn"
 
-#: ../clients/cli/connections.c:9469
+#: ../clients/cli/connections.c:9473
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Ogiltigt verify-argument â€%sâ€\n"
 
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:9481
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Verifiera inställningen â€%sâ€: %s\n"
 
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:9496
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verifiera anslutningen: %s\n"
 
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:9499
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "Felet kan inte lagas automatiskt.\n"
 
-#: ../clients/cli/connections.c:9512
+#: ../clients/cli/connections.c:9516
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Fel: ogiltigt argument â€%sâ€\n"
 
-#: ../clients/cli/connections.c:9545
+#: ../clients/cli/connections.c:9549
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Fel: Misslyckades med att spara â€%s†(%s)-anslutning %s\n"
 
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:9556
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Anslutningen â€%s†(%s) sparades.\n"
 
-#: ../clients/cli/connections.c:9553
+#: ../clients/cli/connections.c:9557
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Anslutningen â€%s†(%s) uppdaterades.\n"
 
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:9590
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Fel: verifiering av anslutning misslyckades: %s\n"
 
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:9591
 msgid "(unknown error)"
 msgstr "(okänt fel)"
 
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:9592
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Du kan prova att köra â€verify fix†för att laga fel.\n"
 
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:9614
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Fel: anslutningen sparas ej. Skriv â€save†först.\n"
 
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:9618
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Fel: anslutningen är inte giltig: %s\n"
 
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:9628
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Fel: Kan inte aktivera anslutningen: %s.\n"
 
-#: ../clients/cli/connections.c:9634
+#: ../clients/cli/connections.c:9638
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Fel: Misslyckades med att aktivera â€%s†(%s)-anslutning: %s\n"
 
-#: ../clients/cli/connections.c:9640
+#: ../clients/cli/connections.c:9644
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Övervakar anslutningsaktivering (tryck valfri tangent för att fortsätta)\n"
 
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:9682
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Fel: status-line: %s\n"
 
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:9690
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Fel: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:9694
+#: ../clients/cli/connections.c:9698
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Fel: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:9703
+#: ../clients/cli/connections.c:9707
 #, c-format
 msgid "Error: bad color: %s\n"
 msgstr "Fel: dålig färg: %s\n"
 
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:9721
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Aktuell nmcli-konfiguration:\n"
 
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:9731
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Ogiltigt konfigurationsalternativ â€%sâ€; tillÃ¥tet [%s]\n"
 
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:9986
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Fel: endast en av â€idâ€, uuid eller â€path†kan ges."
 
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:9998 ../clients/cli/connections.c:10175
+#: ../clients/cli/connections.c:10182 ../clients/cli/connections.c:10310
+#: ../clients/cli/connections.c:10786
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Fel: Okänd anslutning: â€%sâ€."
 
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:10016
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Varning: redigerar befintliga anslutningen â€%sâ€; â€typeâ€-argument ignoreras\n"
 
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:10019
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -3560,223 +3561,223 @@ msgstr ""
 "Varning: redigerar befintliga anslutningen â€%sâ€; â€con-nameâ€-argument "
 "ignoreras\n"
 
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:10033
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Giltiga anslutningstyper: %s\n"
 
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:10035
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Fel: ogiltig anslutningstyp: %s\n"
 
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:10074
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli interaktiv anslutningsredigerare |==="
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Redigerar befintlig â€%sâ€-anslutning: â€%sâ€"
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:10079
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Lägger till en ny â€%sâ€-anslutning"
 
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:10081
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Skriv â€help†eller â€?†för tillgängliga kommandon."
 
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:10083
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Skriv â€describe [<inställning>.<egenskap>]†för en detaljerad "
 "egenskapsbeskrivning."
 
-#: ../clients/cli/connections.c:10117
+#: ../clients/cli/connections.c:10121
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Fel: Misslyckades med att ändra anslutningen â€%sâ€: %s"
 
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:10128
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Anslutningen â€%s†(%s) ändrades.\n"
 
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
+#: ../clients/cli/connections.c:10150 ../clients/cli/connections.c:10266
+#: ../clients/cli/connections.c:10643 ../clients/cli/connections.c:10751
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Fel:  Inga argument angavs."
 
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
+#: ../clients/cli/connections.c:10169 ../clients/cli/connections.c:10298
+#: ../clients/cli/connections.c:10780
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "Fel: anslutnings-ID saknas."
 
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:10232
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) klonad som %s (%s).\n"
 
-#: ../clients/cli/connections.c:10260
+#: ../clients/cli/connections.c:10264
 msgid "New connection name: "
 msgstr "Nytt anslutningsnamn: "
 
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
+#: ../clients/cli/connections.c:10285 ../clients/cli/connections.c:10303
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Fel: <nytt namn>-argument saknas."
 
-#: ../clients/cli/connections.c:10287
+#: ../clients/cli/connections.c:10291
 #, c-format
 msgid "Error: unexpected extra argument '%s'."
 msgstr "Fel: oväntat extra argument â€%sâ€."
 
-#: ../clients/cli/connections.c:10356
+#: ../clients/cli/connections.c:10360
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Fel: alla anslutningar är inte borttagna."
 
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:10361
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Fel: Borttagning av anslutningen misslyckades: %s"
 
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
+#: ../clients/cli/connections.c:10423 ../clients/cli/connections.c:10551
 #, c-format
 msgid "Error: unknown connection '%s'\n"
 msgstr "Fel: Okänd anslutning: â€%sâ€\n"
 
-#: ../clients/cli/connections.c:10433
+#: ../clients/cli/connections.c:10437
 #, c-format
 msgid "Error: no connection provided."
 msgstr "Fel: ingen anslutning tillhandahållen."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:10462
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Fel: kan inte ta bort okänd(a) anslutning(ar): %s."
 
-#: ../clients/cli/connections.c:10470
+#: ../clients/cli/connections.c:10474
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: anslutningsprofil ändrad\n"
 
-#: ../clients/cli/connections.c:10496
+#: ../clients/cli/connections.c:10500
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: anslutningsprofil skapad\n"
 
-#: ../clients/cli/connections.c:10505
+#: ../clients/cli/connections.c:10509
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: anslutningsprofil borttagen\n"
 
-#: ../clients/cli/connections.c:10548
+#: ../clients/cli/connections.c:10552
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Fel: hittade inte alla anslutningar."
 
-#: ../clients/cli/connections.c:10571
+#: ../clients/cli/connections.c:10575
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Fel: Misslyckades med att läsa om anslutningar: %s."
 
-#: ../clients/cli/connections.c:10603
+#: ../clients/cli/connections.c:10607
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Fel: misslyckades med att läsa in anslutningen: %s."
 
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:10615
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Kunde inte läsa in filen: â€%sâ€\n"
 
-#: ../clients/cli/connections.c:10620
+#: ../clients/cli/connections.c:10624
 msgid "File to import: "
 msgstr "Fil att importera: "
 
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:10659
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Varning: â€type†redan angiven, ignorerar extra förekomst.\n"
 
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:10670
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Varning: â€file†redan angiven, ignorerar extra förekomst.\n"
 
-#: ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:10672
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "Okänd parameter: %s"
 
-#: ../clients/cli/connections.c:10683
+#: ../clients/cli/connections.c:10687
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Fel: â€fileâ€-argument krävs."
 
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
+#: ../clients/cli/connections.c:10695 ../clients/cli/connections.c:10802
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Fel: misslyckades med att läsa in VPN-insticksmodul: %s."
 
-#: ../clients/cli/connections.c:10699
+#: ../clients/cli/connections.c:10703
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Fel: misslyckades med att importera â€%sâ€: %s."
 
-#: ../clients/cli/connections.c:10745
+#: ../clients/cli/connections.c:10749
 msgid "Output file name: "
 msgstr "Utdatafilnamn: "
 
-#: ../clients/cli/connections.c:10769
+#: ../clients/cli/connections.c:10773
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Fel: okänt extra argument: â€%sâ€."
 
-#: ../clients/cli/connections.c:10789
+#: ../clients/cli/connections.c:10793
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Fel: anslutningen är inte VPN."
 
-#: ../clients/cli/connections.c:10810
+#: ../clients/cli/connections.c:10814
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Fel: misslyckades med att skapa temporära filen %s."
 
-#: ../clients/cli/connections.c:10819
+#: ../clients/cli/connections.c:10823
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Fel: misslyckades med att exportera â€%sâ€: %s"
 
-#: ../clients/cli/connections.c:10830
+#: ../clients/cli/connections.c:10834
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Fel: misslyckades med att läsa temporära filen â€%sâ€: %s."
 
-#: ../clients/cli/connections.c:10976
+#: ../clients/cli/connections.c:10980
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "fel sträng â€%s†för flaggan â€--orderâ€"
 
-#: ../clients/cli/connections.c:11002
+#: ../clients/cli/connections.c:11006
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "fel objekt â€%s†i flaggan â€--orderâ€"
 
-#: ../clients/cli/connections.c:11089
+#: ../clients/cli/connections.c:11090
 msgid "'--order' argument is missing"
 msgstr "â€--orderâ€-argumentet saknas"
 
-#: ../clients/cli/connections.c:11154
+#: ../clients/cli/connections.c:11155
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Fel: â€%s†är inte ett giltigt â€connectionâ€-kommando."
@@ -4209,7 +4210,7 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  reapply <ifname> ...\n"
+"  reapply <ifname>\n"
 "\n"
 "  disconnect <ifname> ...\n"
 "\n"
@@ -4245,7 +4246,7 @@ msgstr ""
 "\n"
 "  connect <grnamn>\n"
 "\n"
-"  reapply <grnamn> …\n"
+"  reapply <grnamn>\n"
 "\n"
 "  disconnect <grnamn> …\n"
 "\n"
@@ -4346,7 +4347,7 @@ msgstr ""
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname> ...\n"
+"ARGUMENTS := <ifname>\n"
 "\n"
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
@@ -4354,7 +4355,7 @@ msgid ""
 msgstr ""
 "Användning: nmcli device reapply { ARGUMENT | help }\n"
 "\n"
-"ARGUMENT := <grnamn> …\n"
+"ARGUMENT := <grnamn>\n"
 "\n"
 "Försöker uppdatera enhet med ändringar till den aktuellt aktiva "
 "anslutningen\n"
@@ -4580,23 +4581,23 @@ msgstr ""
 "\n"
 
 #: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
-#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1879
-#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
+#: ../clients/cli/devices.c:1685 ../clients/cli/devices.c:1876
+#: ../clients/cli/devices.c:2081 ../clients/cli/devices.c:2088
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Fel: Inget gränssnitt angivet."
 
-#: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
+#: ../clients/cli/devices.c:547
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Varning: argumentet â€%s†är duplicerat.\n"
 
-#: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
+#: ../clients/cli/devices.c:549
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Fel: Enheten â€%s†hittades inte.\n"
 
-#: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
+#: ../clients/cli/devices.c:550
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Fel: hittade inte alla enheter."
@@ -4671,14 +4672,14 @@ msgstr "Fel: â€device statusâ€: %s"
 msgid "Status of devices"
 msgstr "Status för enheter"
 
-#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
+#: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3487
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Fel: ogiltigt extra argument: â€%sâ€."
 
 #: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
-#: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
-#: ../clients/cli/devices.c:3548
+#: ../clients/cli/devices.c:2104 ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:3526
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Fel: Enheten â€%s†hittades inte."
@@ -4744,7 +4745,7 @@ msgid "Error: extra argument not allowed: '%s'."
 msgstr "Fel: extra argument saknas: â€%sâ€."
 
 #: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
-#: ../clients/cli/devices.c:1964
+#: ../clients/cli/devices.c:1942
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Lyckades: Enheten â€%s†kopplades frÃ¥n.\n"
@@ -4756,95 +4757,94 @@ msgstr "Enheten â€%s†togs bort.\n"
 
 #: ../clients/cli/devices.c:1838
 #, c-format
-msgid "Error: not all connections reapplied."
-msgstr "Fel: alla anslutningar har inte uppdaterats."
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
+msgstr "Fel: Uppdatering av anslutning till enheten â€%s†(%s) misslyckades: %s"
 
-#: ../clients/cli/devices.c:1839
-#, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
-msgstr ""
-"Fel: Uppdatering av anslutning till enheten â€%s†(%s) misslyckades: %s\n"
-
-#: ../clients/cli/devices.c:1849
+#: ../clients/cli/devices.c:1848
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "Anslutning uppdaterades till enheten â€%sâ€.\n"
 
-#: ../clients/cli/devices.c:1912
+#: ../clients/cli/devices.c:1885
+#, c-format
+msgid "Error: unsupported argument '%s'."
+msgstr "Fel: argument â€%s†stöds inte."
+
+#: ../clients/cli/devices.c:1899
 #, c-format
-msgid "Error: no valid device provided."
-msgstr "Fel: ingen giltig enhet tillhandahållen."
+msgid "Error: device '%s' not found."
+msgstr "Fel: enheten â€%s†hittades inte."
 
-#: ../clients/cli/devices.c:1949
+#: ../clients/cli/devices.c:1927
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Fel: alla anslutningar inte frånkopplade."
 
-#: ../clients/cli/devices.c:1950
+#: ../clients/cli/devices.c:1928
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Fel: FrÃ¥nkoppling av enheten â€%s†(%s) misslyckades: %s\n"
 
-#: ../clients/cli/devices.c:2025
+#: ../clients/cli/devices.c:2003
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Fel: alla enheter inte borttagna."
 
-#: ../clients/cli/devices.c:2026
+#: ../clients/cli/devices.c:2004
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Fel: Borttagning av enheten â€%s†(%s) misslyckades: %s\n"
 
-#: ../clients/cli/devices.c:2132
+#: ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No property specified."
 msgstr "Fel: Ingen egenskap angiven."
 
-#: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
+#: ../clients/cli/devices.c:2122 ../clients/cli/devices.c:2137
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Fel: â€%sâ€-argument saknas."
 
-#: ../clients/cli/devices.c:2149
+#: ../clients/cli/devices.c:2127
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Fel: â€managedâ€: %s."
 
-#: ../clients/cli/devices.c:2174
+#: ../clients/cli/devices.c:2152
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Fel: egenskapen â€%s†är okänd."
 
-#: ../clients/cli/devices.c:2220
+#: ../clients/cli/devices.c:2198
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: använder anslutningen â€%sâ€\n"
 
-#: ../clients/cli/devices.c:2246
+#: ../clients/cli/devices.c:2224
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: enhet skapad\n"
 
-#: ../clients/cli/devices.c:2253
+#: ../clients/cli/devices.c:2231
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: enhet borttagen\n"
 
-#: ../clients/cli/devices.c:2339
+#: ../clients/cli/devices.c:2317
 msgid "Wi-Fi scan list"
 msgstr "Trådlös avsökningslista"
 
-#: ../clients/cli/devices.c:2377
+#: ../clients/cli/devices.c:2355
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Fel: â€device wifiâ€: %s"
 
-#: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
+#: ../clients/cli/devices.c:2397 ../clients/cli/devices.c:2478
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Fel: Accesspunkt med bssid â€%s†hittades inte."
 
-#: ../clients/cli/devices.c:2446
+#: ../clients/cli/devices.c:2424
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -4853,27 +4853,27 @@ msgstr ""
 "Fel: Enheten â€%s†kändes inte igen som en trÃ¥dlös enhet, kontrollera "
 "insticksmodulen NetworkManager Wi-Fi."
 
-#: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
-#: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:2426 ../clients/cli/devices.c:2758
+#: ../clients/cli/devices.c:3178 ../clients/cli/devices.c:3327
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Fel: Enheten â€%s†är inte en trÃ¥dlös enhet."
 
-#: ../clients/cli/devices.c:2660
+#: ../clients/cli/devices.c:2638
 msgid "SSID or BSSID: "
 msgstr "SSID eller BSSID: "
 
-#: ../clients/cli/devices.c:2665
+#: ../clients/cli/devices.c:2643
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Fel: SSID eller BSSID saknas."
 
-#: ../clients/cli/devices.c:2689
+#: ../clients/cli/devices.c:2667
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Fel: bssid-argumentvärdet â€%s†är inte ett giltigt BSSID."
 
-#: ../clients/cli/devices.c:2713
+#: ../clients/cli/devices.c:2691
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -4881,44 +4881,44 @@ msgstr ""
 "Fel: wep-key-type-argumentvärdet â€%s†är ogiltigt, använd â€key†eller "
 "â€phraseâ€."
 
-#: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
+#: ../clients/cli/devices.c:2711 ../clients/cli/devices.c:2724
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Fel: %s %s."
 
-#: ../clients/cli/devices.c:2761
+#: ../clients/cli/devices.c:2739
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "Fel: BSSID att ansluta till (%s) skiljer sig från bssid-argumentet (%s)."
 
-#: ../clients/cli/devices.c:2767
+#: ../clients/cli/devices.c:2745
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Fel: Parameter â€%s†är varken SSID eller BSSID."
 
-#: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
-#: ../clients/cli/devices.c:3351
+#: ../clients/cli/devices.c:2760 ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3329
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Fel: Ingen trådlös enhet hittades."
 
-#: ../clients/cli/devices.c:2802
+#: ../clients/cli/devices.c:2780
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Fel: Misslyckades att söka av dolt SSID: %s."
 
-#: ../clients/cli/devices.c:2827
+#: ../clients/cli/devices.c:2805
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Fel: Inget nätverk med SSID â€%s†hittades."
 
-#: ../clients/cli/devices.c:2829
+#: ../clients/cli/devices.c:2807
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Fel: Ingen accesspunkt med BSSID â€%s†hittades."
 
-#: ../clients/cli/devices.c:2871
+#: ../clients/cli/devices.c:2849
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
@@ -4926,87 +4926,87 @@ msgstr ""
 "Varning: â€%s†borde vara SSID för dolda accesspunkter, men det ser ut som "
 "ett BSSID.\n"
 
-#: ../clients/cli/devices.c:2885
+#: ../clients/cli/devices.c:2863
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: ../clients/cli/devices.c:3034
+#: ../clients/cli/devices.c:3012
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "â€%s†inte giltig WPA PSK"
 
-#: ../clients/cli/devices.c:3051
+#: ../clients/cli/devices.c:3029
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr "â€%s†är inte en giltig WEP-nyckel (ska vara 5 eller 13 ASCII-tecken)"
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3045
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Lösenord för surfzon: %s\n"
 
-#: ../clients/cli/devices.c:3125
+#: ../clients/cli/devices.c:3103
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Fel: ssid är för långt."
 
-#: ../clients/cli/devices.c:3137
+#: ../clients/cli/devices.c:3115
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr "Fel: argumentvärdet â€%s†för band är ogiltigt, använd â€a†eller â€bgâ€."
 
-#: ../clients/cli/devices.c:3161
+#: ../clients/cli/devices.c:3139
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "Fel: Okänd parameter %s."
 
-#: ../clients/cli/devices.c:3180
+#: ../clients/cli/devices.c:3158
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Fel: kanal kräver även band."
 
-#: ../clients/cli/devices.c:3186
+#: ../clients/cli/devices.c:3164
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Fel: kanal â€%s†är inte giltig för bandet â€%sâ€."
 
-#: ../clients/cli/devices.c:3214
+#: ../clients/cli/devices.c:3192
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "Fel: Enheten â€%s†stöder varken accesspunkts- eller Ad-Hoc-läge."
 
-#: ../clients/cli/devices.c:3249
+#: ../clients/cli/devices.c:3227
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Fel: ogiltigt â€passwordâ€: %s."
 
 # flaggan "ssid" kan upprepas
-#: ../clients/cli/devices.c:3318
+#: ../clients/cli/devices.c:3296
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Fel: â€%s†kan inte upprepas."
 
-#: ../clients/cli/devices.c:3399
+#: ../clients/cli/devices.c:3377
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Fel: â€device wifiâ€-kommandot â€%s†är inte giltigt."
 
 #. Main header name
-#: ../clients/cli/devices.c:3425
+#: ../clients/cli/devices.c:3403
 msgid "Device LLDP neighbors"
 msgstr "LLDP-grannar för enhet"
 
-#: ../clients/cli/devices.c:3528
+#: ../clients/cli/devices.c:3506
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Fel: â€device lldp listâ€: %s"
 
-#: ../clients/cli/devices.c:3575
+#: ../clients/cli/devices.c:3553
 #, c-format
 msgid "Error: 'device lldp' command '%s' is not valid."
 msgstr "Fel: â€device lldpâ€-kommandot â€%s†är inte giltigt."
 
-#: ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3742
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Fel: â€devâ€-kommandot â€%s†är inte giltigt."
@@ -5382,158 +5382,158 @@ msgstr "full"
 msgid "Error: only these fields are allowed: %s"
 msgstr "Fel: endast dessa fält är tillåtna: %s"
 
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:357
 msgid "NetworkManager status"
 msgstr "Status för Nätverkshanteraren"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:362
 msgid "running"
 msgstr "kör"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "starting"
 msgstr "startar"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "started"
 msgstr "startad"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "enabled"
 msgstr "aktiverad"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:443
 msgid "auth"
 msgstr "aute"
 
-#: ../clients/cli/general.c:475
+#: ../clients/cli/general.c:472
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Fel: â€general permissionsâ€: %s"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:486
 msgid "NetworkManager permissions"
 msgstr "Rättigheter för Nätverkshanteraren"
 
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:527
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Fel: â€general loggingâ€: %s"
 
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:542
 msgid "NetworkManager logging"
 msgstr "Loggning för Nätverkshanteraren"
 
-#: ../clients/cli/general.c:567
+#: ../clients/cli/general.c:564
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Fel: misslyckades med att sätta värdnamn: %s"
 
-#: ../clients/cli/general.c:680
+#: ../clients/cli/general.c:677
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Fel: misslyckades att sätta loggning: %s"
 
-#: ../clients/cli/general.c:689
+#: ../clients/cli/general.c:686
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Fel: â€generalâ€-kommandot â€%s†är inte giltigt."
 
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:704
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "Fel: värdet â€%s†för â€--fields†är inte giltigt här (tillÃ¥tna fält: %s)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:729
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Fel: ogiltigt â€%sâ€-argument: â€%s†(använd pÃ¥/av)."
 
-#: ../clients/cli/general.c:743
+#: ../clients/cli/general.c:740
 msgid "Connectivity"
 msgstr "Anslutning"
 
-#: ../clients/cli/general.c:758
+#: ../clients/cli/general.c:755
 msgid "Networking"
 msgstr "Nätverk"
 
-#: ../clients/cli/general.c:783
+#: ../clients/cli/general.c:780
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Fel: â€networking connectivityâ€-kommandot â€%s†är inte giltigt."
 
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:796
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Fel: â€networkingâ€-kommandot â€%s†är inte giltigt."
 
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:825 ../clients/cli/general.c:845
 msgid "Radio switches"
 msgstr "Radioväxlar"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:863
 msgid "Wi-Fi radio switch"
 msgstr "Trådlös radioväxel"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:879
 msgid "WWAN radio switch"
 msgstr "WWAN radioväxel"
 
-#: ../clients/cli/general.c:893
+#: ../clients/cli/general.c:890
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Fel: â€radioâ€-kommandot â€%s†är inte giltigt."
 
-#: ../clients/cli/general.c:914
+#: ../clients/cli/general.c:911
 msgid "NetworkManager has started"
 msgstr "Nätverkshanteraren har startats"
 
-#: ../clients/cli/general.c:917
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has stopped"
 msgstr "Nätverkshanteraren har stoppats"
 
-#: ../clients/cli/general.c:931
+#: ../clients/cli/general.c:928
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Värdnamnet sattes till â€%sâ€\n"
 
-#: ../clients/cli/general.c:946
+#: ../clients/cli/general.c:943
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "â€%s†är nu den primära anslutningen\n"
 
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:945
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Det finns ingen primär anslutning\n"
 
-#: ../clients/cli/general.c:960
+#: ../clients/cli/general.c:957
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "Anslutbarhet är nu â€%sâ€\n"
 
-#: ../clients/cli/general.c:973
+#: ../clients/cli/general.c:970
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Nätverkshanteraren är nu i tillstÃ¥ndet â€%sâ€\n"
 
-#: ../clients/cli/general.c:984
+#: ../clients/cli/general.c:981
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Fel: â€monitorâ€-kommandot â€%s†är inte giltigt."
 
-#: ../clients/cli/general.c:998
+#: ../clients/cli/general.c:995
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Nätverkshanteraren är inte startad (väntar på den)\n"
 
@@ -5551,8 +5551,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5581,8 +5579,6 @@ msgstr ""
 "  -f[ields] <field1,field2,…>|all|common     ange fält för utdata\n"
 "  -e[scape] yes|no                           omge kolumnseparatorer i värden "
 "med säker sträng\n"
-"  -n[ocheck]                                 kontrollera inte nmcli och "
-"Nätverkshanterarens versioner\n"
 "  -a[sk]                                     fråga efter saknade parametrar\n"
 "  -s[how-secrets]                            tillåt att lösenord visas\n"
 "  -w[ait] <seconds>                          sätt en tidsgräns för åtgärder\n"
@@ -5599,64 +5595,64 @@ msgstr ""
 "  m[onitor]       övervaka ändringar för Nätverkshanteraren\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:143
+#: ../clients/cli/nmcli.c:142
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Fel: Objektet â€%s†är okänt, prova â€nmcli helpâ€."
 
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:172
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Fel: Flaggan â€--terse†har angivits en andra gÃ¥ng."
 
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:177
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Fel: Flaggan â€--terse†är ömsesidigt uteslutande med â€--prettyâ€."
 
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:185
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Fel: Flaggan â€--pretty†har angivits en andra gÃ¥ng."
 
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:190
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Fel: Flaggan â€--pretty†är ömsesidigt uteslutande med â€--terseâ€."
 
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216
+#: ../clients/cli/nmcli.c:234 ../clients/cli/nmcli.c:265
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Fel: argument för flaggan â€%s†saknas."
 
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:227
+#: ../clients/cli/nmcli.c:243
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Fel: â€%s†är inte ett giltigt argument för flaggan â€%sâ€."
 
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:250
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Fel: fält för â€%sâ€-flaggor saknas."
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:270
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Fel: â€%s†är inte en giltig tidsgräns för flaggan â€%sâ€."
 
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:277
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli-verktyg, version %s\n"
 
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:283
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Fel: Flaggan â€%s†är okänd, prova â€nmcli -helpâ€."
 
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
+#: ../clients/cli/nmcli.c:366 ../clients/cli/nmcli.c:376
 #, c-format
 msgid ""
 "\n"
@@ -5665,22 +5661,22 @@ msgstr ""
 "\n"
 "Fel: nmcli dödad av signalen %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:408
+#: ../clients/cli/nmcli.c:407
 #, c-format
 msgid "Failed to set signal mask: %d\n"
 msgstr "Misslyckades med att sätta signalmasken: %d\n"
 
-#: ../clients/cli/nmcli.c:415
+#: ../clients/cli/nmcli.c:414
 #, c-format
 msgid "Failed to create signal handling thread: %d\n"
 msgstr "Misslyckades med att skapa signalhanteringstråd: %d\n"
 
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
+#: ../clients/cli/nmcli.c:511 ../clients/nm-online.c:193
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Fel: Kunde inte skapa NMClient-objektet: %s."
 
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:528
 msgid "Success"
 msgstr "Lyckades"
 
@@ -5841,112 +5837,112 @@ msgstr "ogiltigt läge â€%sâ€, använd en av %s"
 msgid "always"
 msgstr "alltid"
 
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3279
+#: ../clients/cli/settings.c:4471 ../clients/cli/settings.c:4974
 #: ../libnm-core/nm-keyfile-reader.c:573
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "ogiltig flagga â€%sâ€, använd en av [%s]"
 
-#: ../clients/cli/settings.c:2116
+#: ../clients/cli/settings.c:2109
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Vill du ocksÃ¥ sätta â€%s†till â€%sâ€? [yes]: "
 
-#: ../clients/cli/settings.c:2118
+#: ../clients/cli/settings.c:2111
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Vill du ocksÃ¥ rensa â€%sâ€? [yes]: "
 
-#: ../clients/cli/settings.c:2279
+#: ../clients/cli/settings.c:2272
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr ""
 "Varning: %s.%s sätts till â€%sâ€, men kan ignoreras i infrastrukturläge\n"
 
-#: ../clients/cli/settings.c:2298
+#: ../clients/cli/settings.c:2291
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr ""
 "Varning: inställningen %s.%s kräver att inställningar för ipv4 och ipv6 tas "
 "bort\n"
 
-#: ../clients/cli/settings.c:2300
+#: ../clients/cli/settings.c:2293
 msgid "Do you want to remove them? [yes] "
 msgstr "Vill du ta bort dem? [ja] "
 
-#: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
-#: ../clients/cli/settings.c:5182
+#: ../clients/cli/settings.c:2389 ../clients/cli/settings.c:2784
+#: ../clients/cli/settings.c:5175
 #, c-format
 msgid "'%s' is not valid"
 msgstr "â€%s†är inte giltigt"
 
-#: ../clients/cli/settings.c:2419
+#: ../clients/cli/settings.c:2412
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "â€%d†är inte giltigt; använd <%d-%d>"
 
-#: ../clients/cli/settings.c:2441
+#: ../clients/cli/settings.c:2434
 #, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
 msgstr "â€%lld†är inte giltigt; använd <%lld-%lld>"
 
-#: ../clients/cli/settings.c:2463
+#: ../clients/cli/settings.c:2456
 #, c-format
 msgid "'%u' is not valid; use <%u-%u>"
 msgstr "â€%u†är inte giltigt; använd <%u-%u>"
 
-#: ../clients/cli/settings.c:2502
+#: ../clients/cli/settings.c:2495
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "â€%uâ€-flaggor är inte giltiga; använd en kombination av %s"
 
-#: ../clients/cli/settings.c:2569
+#: ../clients/cli/settings.c:2562
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "â€%s†är inte giltigt; använd <flagga>=<värde>"
 
-#: ../clients/cli/settings.c:2603
+#: ../clients/cli/settings.c:2596
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "indexet â€%s†är inte giltigt"
 
-#: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
+#: ../clients/cli/settings.c:2601 ../clients/cli/settings.c:2626
 msgid "no item to remove"
 msgstr "inget objekt att ta bort"
 
-#: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
+#: ../clients/cli/settings.c:2605 ../clients/cli/settings.c:2630
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "index â€%d†är inte i intervallet <0-%d>"
 
-#: ../clients/cli/settings.c:2652
+#: ../clients/cli/settings.c:2645
 #, c-format
 msgid "invalid option '%s'"
 msgstr "ogiltig flagga â€%sâ€"
 
-#: ../clients/cli/settings.c:2654
+#: ../clients/cli/settings.c:2647
 msgid "missing option"
 msgstr "saknad flagga"
 
-#: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701
-#: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
+#: ../clients/cli/settings.c:2674 ../clients/cli/settings.c:2694
+#: ../clients/cli/settings.c:2714 ../clients/cli/settings.c:2734
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "â€%s†är inte ett giltigt nummer (eller utanför intervallet)"
 
-#: ../clients/cli/settings.c:2775
+#: ../clients/cli/settings.c:2768
 #, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
 msgstr "â€%s†är inte ett giltigt värde; använd -1, 0 eller 1"
 
-#: ../clients/cli/settings.c:2807
+#: ../clients/cli/settings.c:2800
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "â€%s†är inte en giltig Ethernet MAC"
 
-#: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
+#: ../clients/cli/settings.c:2825 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
 #: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
@@ -5954,38 +5950,38 @@ msgstr "â€%s†är inte en giltig Ethernet MAC"
 msgid "'%s' is not a valid interface name"
 msgstr "â€%s†är inte ett giltigt gränssnittsnamn"
 
-#: ../clients/cli/settings.c:2856
+#: ../clients/cli/settings.c:2849
 #, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
 msgstr "â€%s†är inte ett giltigt flaggnummer; använd <0-%d>"
 
-#: ../clients/cli/settings.c:2868
+#: ../clients/cli/settings.c:2861
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
 msgstr "Varning: â€%sâ€-summan är högre än alla flaggor => alla flaggor satta\n"
 
-#: ../clients/cli/settings.c:2909
+#: ../clients/cli/settings.c:2902
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "â€%s†är inte ett giltigt hextecken"
 
-#: ../clients/cli/settings.c:2939
+#: ../clients/cli/settings.c:2932
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "â€%s†är inte ett giltigt MAC"
 
-#: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
+#: ../clients/cli/settings.c:2958 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "â€%s†är inte ett giltigt UUID"
 
-#: ../clients/cli/settings.c:3032
+#: ../clients/cli/settings.c:3025
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "egenskapen innehÃ¥ller inte rättigheten â€%sâ€"
 
-#: ../clients/cli/settings.c:3044
+#: ../clients/cli/settings.c:3037
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -6001,37 +5997,37 @@ msgstr ""
 "\n"
 "Exempel: anders maria sebastian\n"
 
-#: ../clients/cli/settings.c:3063
+#: ../clients/cli/settings.c:3056
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "â€%s†är inte en giltig master; använd grnamn eller anslutnings-UUID"
 
-#: ../clients/cli/settings.c:3107
+#: ../clients/cli/settings.c:3100
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "Varning: %s är inte ett UUID på någon befintlig anslutningsprofil\n"
 
-#: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
+#: ../clients/cli/settings.c:3104 ../clients/cli/settings.c:3120
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "â€%s†är inte en giltig VPN-anslutningsprofil"
 
-#: ../clients/cli/settings.c:3120
+#: ../clients/cli/settings.c:3113
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "â€%s†är inte ett namn pÃ¥ nÃ¥gon befintlig profil"
 
-#: ../clients/cli/settings.c:3154
+#: ../clients/cli/settings.c:3147
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "värdet â€%s†är inte ett giltigt UUID"
 
-#: ../clients/cli/settings.c:3161
+#: ../clients/cli/settings.c:3154
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "egenskapen innehÃ¥ller inte UUID â€%sâ€"
 
-#: ../clients/cli/settings.c:3173
+#: ../clients/cli/settings.c:3166
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -6052,7 +6048,7 @@ msgstr ""
 "\n"
 "Exempel: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/cli/settings.c:3240
+#: ../clients/cli/settings.c:3233
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -6068,16 +6064,16 @@ msgstr ""
 "â€unknown†för att lÃ¥ta Nätverkshanteraren välja ett värde enligt nÃ¥gon "
 "heuristik\n"
 
-#: ../clients/cli/settings.c:3364
+#: ../clients/cli/settings.c:3357
 msgid "private key password not provided"
 msgstr "lösenord för privat nyckel inte angivet"
 
-#: ../clients/cli/settings.c:3392
+#: ../clients/cli/settings.c:3385
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "egenskapen innehÃ¥ller inte EAP-metoden â€%sâ€"
 
-#: ../clients/cli/settings.c:3409
+#: ../clients/cli/settings.c:3402
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -6089,12 +6085,12 @@ msgstr ""
 "Observera att nmcli inte stödjer att ange certifikat som rå blob-data.\n"
 "Exempel: /home/cimrman/cacert.crt\n"
 
-#: ../clients/cli/settings.c:3428
+#: ../clients/cli/settings.c:3421
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "egenskapen innehÃ¥ller inte alternativa ämnesmatchningen â€%sâ€"
 
-#: ../clients/cli/settings.c:3444
+#: ../clients/cli/settings.c:3437
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -6106,7 +6102,7 @@ msgstr ""
 "Observera att nmcli inte stödjer att ange certifikat som rå blob-data.\n"
 "Exempel: /home/cimrman/jara.crt\n"
 
-#: ../clients/cli/settings.c:3456
+#: ../clients/cli/settings.c:3449
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6122,12 +6118,12 @@ msgstr ""
 "Observera att nmcli inte stödjer att ange certifikat som rå blob-data.\n"
 "Exempel: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3476
+#: ../clients/cli/settings.c:3469
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr "egenskapen innehÃ¥ller inte â€phase2â€-alternativa ämnesmatchningen â€%sâ€"
 
-#: ../clients/cli/settings.c:3492
+#: ../clients/cli/settings.c:3485
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -6143,7 +6139,7 @@ msgstr ""
 "Observera att nmcli inte stödjer att ange certifikat som rå blob-data.\n"
 "Exempel:  /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/cli/settings.c:3512
+#: ../clients/cli/settings.c:3505
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -6156,7 +6152,7 @@ msgstr ""
 "Observera att nmcli inte stödjer att ange privat nyckel som rå blob-data.\n"
 "Exempel: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/cli/settings.c:3583
+#: ../clients/cli/settings.c:3576
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -6178,7 +6174,7 @@ msgstr ""
 "Exempel: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/cli/settings.c:3704
+#: ../clients/cli/settings.c:3697
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -6209,32 +6205,32 @@ msgstr ""
 "\n"
 "Exempel: mode=2,miimon=120\n"
 
-#: ../clients/cli/settings.c:3735
+#: ../clients/cli/settings.c:3728
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "â€%s†är inte en giltig InfiniBand MAC"
 
-#: ../clients/cli/settings.c:3772
+#: ../clients/cli/settings.c:3765
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "â€%s†är inte en giltig IBoIP P_Key"
 
-#: ../clients/cli/settings.c:3803
+#: ../clients/cli/settings.c:3796
 #, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
 msgstr "â€%s†är inte giltigt (formatet är: ip[/prefix] [next-hop] [metric])"
 
-#: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
+#: ../clients/cli/settings.c:3844 ../clients/cli/settings.c:3863
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "ogiltig IPv4-adress â€%sâ€"
 
-#: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
+#: ../clients/cli/settings.c:3869 ../clients/cli/settings.c:4177
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "egenskapen innehÃ¥ller inte DNS-servern â€%sâ€"
 
-#: ../clients/cli/settings.c:3888
+#: ../clients/cli/settings.c:3881
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -6244,22 +6240,22 @@ msgstr ""
 "\n"
 "Exempel: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
+#: ../clients/cli/settings.c:3917 ../clients/cli/settings.c:4231
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "egenskapen innehÃ¥ller inte DNS-sökdomänen â€%sâ€"
 
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#: ../clients/cli/settings.c:3955 ../clients/cli/settings.c:4269
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "egenskapen stöder inte DNS-alternativet â€%sâ€"
 
-#: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
+#: ../clients/cli/settings.c:4009 ../clients/cli/settings.c:4322
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "egenskapen innehÃ¥ller inte IP-adressen â€%sâ€"
 
-#: ../clients/cli/settings.c:4029
+#: ../clients/cli/settings.c:4022
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6273,17 +6269,17 @@ msgstr ""
 "\n"
 "Exempel: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
+#: ../clients/cli/settings.c:4038 ../clients/cli/settings.c:4351
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "ogiltig gateway-adress â€%sâ€"
 
-#: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
+#: ../clients/cli/settings.c:4093 ../clients/cli/settings.c:4406
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "egenskapen innehÃ¥ller inte rutten â€%sâ€"
 
-#: ../clients/cli/settings.c:4113
+#: ../clients/cli/settings.c:4106
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6306,12 +6302,12 @@ msgstr ""
 "Exempel: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
+#: ../clients/cli/settings.c:4152 ../clients/cli/settings.c:4171
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "ogiltig IPv6-adress â€%sâ€"
 
-#: ../clients/cli/settings.c:4196
+#: ../clients/cli/settings.c:4189
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -6331,7 +6327,7 @@ msgstr ""
 "\n"
 "Exempel: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/cli/settings.c:4342
+#: ../clients/cli/settings.c:4335
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6346,7 +6342,7 @@ msgstr ""
 "Exempel: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
 "1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/cli/settings.c:4426
+#: ../clients/cli/settings.c:4419
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6370,28 +6366,28 @@ msgstr ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
+#: ../clients/cli/settings.c:4436 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
 msgstr "â€%s†är inte ett nummer"
 
-#: ../clients/cli/settings.c:4450
+#: ../clients/cli/settings.c:4443
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "â€%s†är inte giltig; använd 0, 1 eller 2"
 
-#: ../clients/cli/settings.c:4497
+#: ../clients/cli/settings.c:4490
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "â€%s†är inte en giltig kanal; använd <1-13>"
 
-#: ../clients/cli/settings.c:4534
+#: ../clients/cli/settings.c:4527
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "â€%s†är inte giltig; använd [e, o, n]"
 
-#: ../clients/cli/settings.c:4562
+#: ../clients/cli/settings.c:4555
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -6409,32 +6405,32 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/cli/settings.c:4602
+#: ../clients/cli/settings.c:4595
 msgid "no priority to remove"
 msgstr "ingen prioritet att ta bort"
 
-#: ../clients/cli/settings.c:4606
+#: ../clients/cli/settings.c:4599
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "index â€%d†är inte i intervallet för <0-%d>"
 
-#: ../clients/cli/settings.c:4645
+#: ../clients/cli/settings.c:4638
 #, c-format
 msgid ""
 "Warning: only one mapping at a time is supported; taking the first one (%s)\n"
 msgstr "Varning: endast en mappning åt gången stöds; tar den första (%s)\n"
 
-#: ../clients/cli/settings.c:4652
+#: ../clients/cli/settings.c:4645
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "egenskapen stöder inte mappningen â€%sâ€"
 
-#: ../clients/cli/settings.c:4700
+#: ../clients/cli/settings.c:4693
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "â€%s†kan inte vara tomt"
 
-#: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
+#: ../clients/cli/settings.c:4767 ../clients/cli/settings.c:4934
 #: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
 #: ../libnm-core/nm-setting-wireless.c:832 ../libnm-util/nm-setting-wired.c:646
 #: ../libnm-util/nm-setting-wireless.c:859
@@ -6443,17 +6439,17 @@ msgstr "â€%s†kan inte vara tomt"
 msgid "'%s' is not a valid MAC address"
 msgstr "â€%s†är inte en giltig MAC-adress"
 
-#: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
+#: ../clients/cli/settings.c:4773 ../clients/cli/settings.c:4940
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "egenskapen innehÃ¥ller inte MAC-adress â€%sâ€"
 
-#: ../clients/cli/settings.c:4799
+#: ../clients/cli/settings.c:4792
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "â€%s†är ogiltig; TvÃ¥ eller tre strängar ska anges"
 
-#: ../clients/cli/settings.c:4813
+#: ../clients/cli/settings.c:4806
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -6463,12 +6459,12 @@ msgstr ""
 "\n"
 "Exempel: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/cli/settings.c:4835
+#: ../clients/cli/settings.c:4828
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "â€%sâ€-strängvärde ska bestÃ¥ av 1 - 199 tecken"
 
-#: ../clients/cli/settings.c:4867
+#: ../clients/cli/settings.c:4860
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -6479,28 +6475,28 @@ msgstr ""
 "  option = <värde>, option = <värde>,…\n"
 "Giltiga val är: %s\n"
 
-#: ../clients/cli/settings.c:4913
+#: ../clients/cli/settings.c:4906
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "â€%s†är inte en giltig kanal"
 
-#: ../clients/cli/settings.c:4919
+#: ../clients/cli/settings.c:4912
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "â€%ld†är en ogiltig kanal"
 
-#: ../clients/cli/settings.c:5013
+#: ../clients/cli/settings.c:5006
 #, c-format
 msgid "invalid option '%s', use 'default', 'never' or 'always'"
 msgstr "ogiltig flagga â€%sâ€, använd â€defaultâ€, â€never†eller â€alwaysâ€"
 
-#: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
-#: ../clients/cli/settings.c:5152
+#: ../clients/cli/settings.c:5067 ../clients/cli/settings.c:5106
+#: ../clients/cli/settings.c:5145
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "egenskapen innehÃ¥ller inte protokollet â€%sâ€"
 
-#: ../clients/cli/settings.c:5191
+#: ../clients/cli/settings.c:5184
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -6508,23 +6504,23 @@ msgid ""
 msgstr ""
 "â€%s†är inte kompatibel med %s  â€%sâ€, ändra nyckeln eller sätt rätt %s först."
 
-#: ../clients/cli/settings.c:5199
+#: ../clients/cli/settings.c:5192
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "WEP-nyckel antas vara â€%sâ€\n"
 
-#: ../clients/cli/settings.c:5201
+#: ../clients/cli/settings.c:5194
 #, c-format
 msgid "WEP key index set to '%d'\n"
 msgstr "index för WEP-nyckel satt till â€%dâ€\n"
 
-#: ../clients/cli/settings.c:5224
+#: ../clients/cli/settings.c:5217
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "â€%s†inte bland [0 (okänd), 1 (nyckel), 2 (lösenfras)]"
 
-#: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
-#: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
+#: ../clients/cli/settings.c:5233 ../clients/cli/settings.c:5236
+#: ../clients/cli/settings.c:5239 ../clients/cli/settings.c:5242
 #, c-format
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
@@ -6532,7 +6528,7 @@ msgid ""
 msgstr ""
 "Varning:â€%s†är inte kompatibel med â€%sâ€-typ, ändra eller ta bort nyckeln.\n"
 
-#: ../clients/cli/settings.c:5262
+#: ../clients/cli/settings.c:5255
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -6541,36 +6537,36 @@ msgstr ""
 "Ange typ på WEP-nycklarna. Accepterade värden är: 0 eller okänd, 1 eller "
 "nyckel, 2 eller lösenfras.\n"
 
-#: ../clients/cli/settings.c:5275
+#: ../clients/cli/settings.c:5268
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "â€%s†inte en giltig PSK"
 
-#: ../clients/cli/settings.c:5319
+#: ../clients/cli/settings.c:5312
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "â€%s†är inte en giltig DCB-flagga"
 
-#: ../clients/cli/settings.c:5342
+#: ../clients/cli/settings.c:5335
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "â€%s†är inte en giltig DCB-programprioritet"
 
-#: ../clients/cli/settings.c:5368
+#: ../clients/cli/settings.c:5361
 msgid "must contain 8 comma-separated numbers"
 msgstr "måste innehålla 8 kommaseparerade siffror"
 
-#: ../clients/cli/settings.c:5385
+#: ../clients/cli/settings.c:5378
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "â€%s†inte en siffra mellan 0 och %u (inklusive) eller %u"
 
-#: ../clients/cli/settings.c:5388
+#: ../clients/cli/settings.c:5381
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "â€%s†inte en siffra mellan 0 och %u (inklusive)"
 
-#: ../clients/cli/settings.c:5410
+#: ../clients/cli/settings.c:5403
 #, c-format
 msgid ""
 "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
@@ -6580,42 +6576,42 @@ msgstr ""
 "(aktiverad)\n"
 "\n"
 
-#: ../clients/cli/settings.c:5463
+#: ../clients/cli/settings.c:5456
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "summan för bandbreddsprocenten måste vara 100%%"
 
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+#: ../clients/cli/settings.c:5542 ../clients/cli/settings.c:5548
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr "SIM-operatörs-ID måste vara en 5- eller 6-siffrig MCCMNC-kod"
 
-#: ../clients/cli/settings.c:5598
+#: ../clients/cli/settings.c:5591
 #, c-format
 msgid "invalid option '%s', use '%s' or '%s'"
 msgstr "ogiltig flagga â€%sâ€, använd â€%s†eller â€%sâ€"
 
-#: ../clients/cli/settings.c:7644
+#: ../clients/cli/settings.c:7637
 msgid "don't know how to get the property value"
 msgstr "vet inte hur egenskapsvärdet ska hämtas"
 
-#: ../clients/cli/settings.c:7697 ../clients/cli/settings.c:7737
+#: ../clients/cli/settings.c:7690 ../clients/cli/settings.c:7730
 msgid "the property can't be changed"
 msgstr "egenskapen kan inte ändras"
 
-#: ../clients/cli/settings.c:7821
+#: ../clients/cli/settings.c:7814
 msgid "(not available)"
 msgstr "(ej tillgänglig)"
 
-#: ../clients/cli/settings.c:7846
+#: ../clients/cli/settings.c:7839
 msgid "[NM property description]"
 msgstr "[NH egenskapsbeskrivning]"
 
-#: ../clients/cli/settings.c:7851
+#: ../clients/cli/settings.c:7844
 msgid "[nmcli specific description]"
 msgstr "[nmcli specifik beskrivning]"
 
 #. ----------------------------------------------------------------------------
-#: ../clients/cli/settings.c:7900
+#: ../clients/cli/settings.c:7893
 msgid "<hidden>"
 msgstr "<dold>"
 
@@ -6634,82 +6630,54 @@ msgstr "Fel: Förväntade argumentet â€%s†men gavs â€%sâ€."
 msgid "Error: Unexpected argument '%s'"
 msgstr "Fel: Oväntat argument â€%sâ€"
 
-#: ../clients/cli/utils.c:202
-#, c-format
-msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "Fel vid konvertering av IP4-adress â€0x%X†till textformat"
-
-#: ../clients/cli/utils.c:230
-#, c-format
-msgid "Error converting IP6 address '%s' to text form"
-msgstr "Fel vid konvertering av IP6-adress â€%s†till textformat"
-
 #. Translators: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#: ../clients/cli/utils.c:492 ../clients/cli/utils.c:523
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "â€%s†är dubbeltydig (%s)"
 
-#: ../clients/cli/utils.c:556
+#: ../clients/cli/utils.c:502
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "â€%s†är inte giltig; använd [%s] eller [%s]"
 
-#: ../clients/cli/utils.c:589
+#: ../clients/cli/utils.c:535
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "â€%s†är inte giltig; använd [%s], [%s] eller [%s]"
 
-#: ../clients/cli/utils.c:688
+#: ../clients/cli/utils.c:634
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "â€%s†är dubbeltydig (%s x %s)"
 
-#: ../clients/cli/utils.c:700
+#: ../clients/cli/utils.c:646
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "saknat namn, prova en av [%s]"
 
-#: ../clients/cli/utils.c:964
+#: ../clients/cli/utils.c:893
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "fältet â€%s†mÃ¥ste vara ensamt"
 
-#: ../clients/cli/utils.c:967
+#: ../clients/cli/utils.c:896
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "ogiltigt fält â€%sâ€; tillÃ¥tna fält: %s"
 
-#: ../clients/cli/utils.c:1024
+#: ../clients/cli/utils.c:953
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Flaggan â€--terse†kräver att â€--fields†anges"
 
-#: ../clients/cli/utils.c:1028
+#: ../clients/cli/utils.c:957
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Flaggan â€--terse†kräver angivna värden för â€--fieldsâ€-flaggan , inte â€%sâ€"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Varning: versionerna för nmcli (%s) och NetworkManager (%s) stämmer inte "
-"överens. Använd --nocheck för att inte visa varningen.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Fel: versionerna för nmcli (%s) och NetworkManager (%s) matchar inte. Tvinga "
-"körning med --nocheck, men resultatet är inte förutsägbart."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "En autentiseringssession är redan igång."
@@ -6733,7 +6701,8 @@ msgstr "Användarnamn"
 #: ../clients/common/nm-secret-agent-simple.c:525
 #: ../clients/common/nm-vpn-helpers.c:101
 #: ../clients/common/nm-vpn-helpers.c:102
-#: ../clients/common/nm-vpn-helpers.c:105 ../clients/tui/nmt-page-dsl.c:75
+#: ../clients/common/nm-vpn-helpers.c:106
+#: ../clients/common/nm-vpn-helpers.c:109 ../clients/tui/nmt-page-dsl.c:75
 #: ../clients/tui/nmt-page-wifi.c:277 ../clients/tui/nmt-page-wifi.c:308
 #: ../clients/tui/nmt-page-wifi.c:341
 msgid "Password"
@@ -6817,20 +6786,28 @@ msgid "could not get VPN plugin info"
 msgstr "kunde inte hämta VPN-insticksinfo"
 
 #: ../clients/common/nm-vpn-helpers.c:103
-#: ../clients/common/nm-vpn-helpers.c:106
+msgid "Certificate password"
+msgstr "Certifikatlösenord"
+
+#: ../clients/common/nm-vpn-helpers.c:104
+msgid "HTTP proxy password"
+msgstr "HTTP-proxylösenord"
+
+#: ../clients/common/nm-vpn-helpers.c:107
+#: ../clients/common/nm-vpn-helpers.c:110
 msgid "Group password"
 msgstr "Grupplösenord"
 
-#: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
+#: ../clients/common/nm-vpn-helpers.c:112 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../clients/common/nm-vpn-helpers.c:109
+#: ../clients/common/nm-vpn-helpers.c:113
 msgid "Cookie"
 msgstr "Kaka"
 
-#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:114
 msgid "Gateway certificate hash"
 msgstr "Certifikathash för gateway"
 
@@ -6937,7 +6914,7 @@ msgstr "DSL-anslutning %d"
 
 #: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
 #: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4190
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182
 msgid "Bond"
 msgstr "Kombinera"
 
@@ -6948,7 +6925,7 @@ msgstr "Kombinationsanslutning %d"
 
 #: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
 #: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4487
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479
 msgid "Bridge"
 msgstr "Brygga"
 
@@ -6959,7 +6936,7 @@ msgstr "Brygganslutning %d"
 
 #: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
 #: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4296
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288
 msgid "Team"
 msgstr "Grupp"
 
@@ -8001,7 +7978,7 @@ msgstr "Oväntat misslyckande med att normalisera anslutningen"
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2162
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -8239,7 +8216,7 @@ msgstr "ogiltig privat nyckel för phase2"
 #: ../libnm-core/nm-setting-connection.c:844
 #: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
 #: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8602,55 +8579,55 @@ msgstr "Ogiltig IPv4-adress â€%sâ€"
 msgid "Invalid IPv6 address '%s'"
 msgstr "Ogiltig IPv6-adress â€%sâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "Ogiltig IPv4-adressprefix â€%uâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
+#: ../libnm-core/nm-setting-ip-config.c:153
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "Ogiltigt IPv6-adressprefix â€%uâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:170
+#: ../libnm-core/nm-setting-ip-config.c:168
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "Ogiltigt ruttmätvärde â€%sâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:2182
+#: ../libnm-core/nm-setting-ip-config.c:2187
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS-serveradressen är ogiltig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2198
+#: ../libnm-core/nm-setting-ip-config.c:2203
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP-adressen är ogiltig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2210
+#: ../libnm-core/nm-setting-ip-config.c:2215
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP-adressen har â€labelâ€-egenskap med ogiltig typ"
 
-#: ../libnm-core/nm-setting-ip-config.c:2219
+#: ../libnm-core/nm-setting-ip-config.c:2224
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP-adressen har ogiltig etikett â€%sâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:2233
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "gateway kan inte bestämmas om det inte finns adresser konfigurerade"
 
-#: ../libnm-core/nm-setting-ip-config.c:2242
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
 msgstr "ogiltig gateway"
 
-#: ../libnm-core/nm-setting-ip-config.c:2256
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d.-rutt ogiltig"
 
-#: ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. rutt kan inte vara en standardrutt"
@@ -8985,39 +8962,39 @@ msgstr "libtool-arkiv stöds inte (%s)"
 msgid "Could not find \"%s\" binary"
 msgstr "Kunde inte hitta binären â€%sâ€"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:132
+#: ../libnm-core/nm-vpn-editor-plugin.c:142
 #, c-format
-msgid "cannot load plugin %s"
-msgstr "kan inte läsa in insticksmodulen %s"
+msgid "cannot load plugin \"%s\": %s"
+msgstr "kan inte läsa in insticksmodulen â€%sâ€: %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:160
+#: ../libnm-core/nm-vpn-editor-plugin.c:153
 #, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr ""
-"kan inte läsa in VPN-insticksmodul i â€%sâ€: saknar namn pÃ¥ insticksmodul"
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:167
-#, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr "kan inte läsa in VPN-insticksmodul i â€%sâ€: ogiltigt namn pÃ¥ tjänst"
+"misslyckades med att läsa in nm_vpn_editor_plugin_factory() från %s (%s)"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:183
+#: ../libnm-core/nm-vpn-editor-plugin.c:178
 #, c-format
 msgid "unknown error initializing plugin %s"
 msgstr "okänt fel vid initiering av insticksmodulen %s"
 
 #: ../libnm-core/nm-vpn-editor-plugin.c:195
 #, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr ""
-"misslyckades med att läsa in nm_vpn_editor_plugin_factory() från %s (%s)"
+"kan inte läsa in VPN-insticksmodul i â€%sâ€: saknar namn pÃ¥ insticksmodul"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:256
+#: ../libnm-core/nm-vpn-editor-plugin.c:204
+#, c-format
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr "kan inte läsa in VPN-insticksmodul i â€%sâ€: ogiltigt namn pÃ¥ tjänst"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:310
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "insticksmodulen stöder inte importförmåga"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:276
+#: ../libnm-core/nm-vpn-editor-plugin.c:330
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "insticksmodulen stöder inte exportförmåga"
@@ -9483,17 +9460,17 @@ msgid ""
 msgstr ""
 "Systemets policy förhindrar ändring av bestående global DNS-konfiguration"
 
-#: ../shared/nm-shared-utils.c:174
+#: ../shared/nm-shared-utils.c:185
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "objektklassen â€%s†har ingen egenskap med namnet â€%sâ€"
 
-#: ../shared/nm-shared-utils.c:181
+#: ../shared/nm-shared-utils.c:192
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "egenskapen â€%s†för objektklassen â€%s†är inte skrivbar"
 
-#: ../shared/nm-shared-utils.c:188
+#: ../shared/nm-shared-utils.c:199
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -9501,19 +9478,19 @@ msgstr ""
 "konstruktionsegenskap â€%s†för objektet â€%s†kan inte ställas in efter att "
 "det skapats"
 
-#: ../shared/nm-shared-utils.c:196
+#: ../shared/nm-shared-utils.c:207
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "â€%s::%s†är inte ett giltigt egenskapsnamn; â€%s†är inte en undertyp till "
 "GObject"
 
-#: ../shared/nm-shared-utils.c:205
+#: ../shared/nm-shared-utils.c:216
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "kan inte sätta egenskapen â€%s†av typen â€%s†frÃ¥n värdet av typen â€%sâ€"
 
-#: ../shared/nm-shared-utils.c:216
+#: ../shared/nm-shared-utils.c:227
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -9538,25 +9515,25 @@ msgid "Failed to read configuration: %s\n"
 msgstr "Misslyckades med att läsa konfiguration: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:297
+#: ../src/main.c:234 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
 msgstr "Skriv ut version för Nätverkshanteraren och avsluta"
 
-#: ../src/main.c:235 ../src/nm-iface-helper.c:298
+#: ../src/main.c:235 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
 msgstr "Bli inte en demon"
 
-#: ../src/main.c:236 ../src/nm-iface-helper.c:300
+#: ../src/main.c:236 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Loggnivå: en av [%s]"
 
-#: ../src/main.c:238 ../src/nm-iface-helper.c:302
+#: ../src/main.c:238 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Logga domäner separerade med â€,â€: vilken kombination som helst av [%s]"
 
-#: ../src/main.c:240 ../src/nm-iface-helper.c:304
+#: ../src/main.c:240 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
 msgstr "Gör alla varningar till ödesdigra"
 
@@ -9584,12 +9561,12 @@ msgstr ""
 "att användaren anger trådlösa accesspunkter som trådlösa nätverks-\n"
 "kort i datorn ska associeras med."
 
-#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392
+#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s.  Använd --help för att se en lista över giltiga flaggor.\n"
 
-#: ../src/main.c:348 ../src/nm-iface-helper.c:397
+#: ../src/main.c:348 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "Ignorerar okända loggdomän(en|er) â€%s†given via kommandoraden.\n"
@@ -9604,7 +9581,7 @@ msgstr "Fel i konfigurationsfilen: %s.\n"
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr "Ignorerar okända loggdomän(en|er) â€%s†frÃ¥n konfigurationsfiler.\n"
 
-#: ../src/main.c:389 ../src/nm-iface-helper.c:407
+#: ../src/main.c:389 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Kunde inte bli demon: %s [fel %u]\n"
@@ -9697,8 +9674,8 @@ msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Okänd/ohanterad Bluetooth-anslutningstyp"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../src/devices/nm-device-ethernet.c:1420
+#: ../src/devices/nm-device-infiniband.c:193
 #: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "anslutning matchar inte enhet"
@@ -9711,11 +9688,11 @@ msgstr "Kombinationsanslutning"
 msgid "Bridge connection"
 msgstr "Brygganslutning"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "PPPoE connection"
 msgstr "PPPoE-anslutning"
 
-#: ../src/devices/nm-device-ethernet.c:1396
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "Wired connection"
 msgstr "Trådbunden anslutning"
 
@@ -9724,7 +9701,7 @@ msgstr "Trådbunden anslutning"
 msgid "Wired connection %d"
 msgstr "Trådbunden anslutning %d"
 
-#: ../src/devices/nm-device-infiniband.c:174
+#: ../src/devices/nm-device-infiniband.c:175
 msgid "InfiniBand connection"
 msgstr "InfiniBand-anslutning"
 
@@ -9732,7 +9709,7 @@ msgstr "InfiniBand-anslutning"
 msgid "IP tunnel connection"
 msgstr "IP-tunnelanslutning"
 
-#: ../src/devices/nm-device-macvlan.c:428
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
 msgstr "MACVLAN-anslutning"
 
@@ -9740,7 +9717,7 @@ msgstr "MACVLAN-anslutning"
 msgid "TUN connection"
 msgstr "TUN-anslutning"
 
-#: ../src/devices/nm-device-vlan.c:447
+#: ../src/devices/nm-device-vlan.c:457
 msgid "VLAN connection"
 msgstr "VLAN-anslutning"
 
@@ -9953,7 +9930,7 @@ msgstr "Lista över insticksmoduler separerade med â€,â€"
 msgid "Quit after initial configuration"
 msgstr "Avsluta efter initial konfiguration"
 
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Bli inte en demon, och logga till stderr"
 
@@ -9971,94 +9948,94 @@ msgid "The expected start of the response"
 msgstr "Den förväntade starten på svaret"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "The interface to manage"
 msgstr "Gränssnittet att hantera"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "eth0"
 msgstr "eth0"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Connection UUID"
 msgstr "UUID för anslutning"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Huruvida IPv6 SLAAC ska hanteras"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
 msgstr "Huruvida SLAAC måste lyckas"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Använd en temporär IPv6-adress för sekretess"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Current DHCPv4 address"
 msgstr "Aktuell DCHPv4-adress"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
 msgstr "Huruvida DHCPv4 måste lyckas"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "Hexkodat DHCPv4 klient-ID"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
 msgstr "Värdnamn att skicka till DHCP-server"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN att skicka till DHCP-server"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
 msgstr "Ruttprioritet för IPv4"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "Route priority for IPv6"
 msgstr "Ruttprioritet för IPv6"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid "Hex-encoded Interface Identifier"
 msgstr "Hexkodad gränssnittsidentifierare"
 
-#: ../src/nm-iface-helper.c:293
+#: ../src/nm-iface-helper.c:294
 msgid "IPv6 SLAAC address generation mode"
 msgstr "SLAAC-adressgenereringsläge för IPv6"
 
-#: ../src/nm-iface-helper.c:294
+#: ../src/nm-iface-helper.c:295
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr ""
 "Loggbakändens konfigurationsvärde. Se logging.backend i NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -10066,17 +10043,17 @@ msgstr ""
 "nm-iface-helper är en liten fristående process som hanterar ett enstaka "
 "nätverksgränssnitt."
 
-#: ../src/nm-iface-helper.c:373
+#: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "Kräver ett gränssnittsnamn och UUID\n"
 
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "Misslyckades med att hitta gränssnittsindex för %s (%s)\n"
 
-#: ../src/nm-iface-helper.c:441
+#: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): Ogiltig IID %s\n"
@@ -10091,7 +10068,7 @@ msgstr "Okänd loggnivÃ¥ â€%sâ€"
 msgid "Unknown log domain '%s'"
 msgstr "Okänd loggdomän â€%sâ€"
 
-#: ../src/nm-manager.c:3625
+#: ../src/nm-manager.c:3635
 msgid "VPN connection"
 msgstr "VPN-anslutning"
 
@@ -10103,6 +10080,18 @@ msgstr "Nätverkshanteraren behöver stänga av nätverk"
 msgid "System"
 msgstr "System"
 
+#~ msgid "Error: not all connections reapplied."
+#~ msgstr "Fel: alla anslutningar har inte uppdaterats."
+
+#~ msgid "Error: no valid device provided."
+#~ msgstr "Fel: ingen giltig enhet tillhandahållen."
+
+#~ msgid "Error converting IP4 address '0x%X' to text form"
+#~ msgstr "Fel vid konvertering av IP4-adress â€0x%X†till textformat"
+
+#~ msgid "Error converting IP6 address '%s' to text form"
+#~ msgstr "Fel vid konvertering av IP6-adress â€%s†till textformat"
+
 #~ msgid "Error: unknown parameter: %s"
 #~ msgstr "Fel: okänd parameter: %s"
 
diff --git a/po/ta.po b/po/ta.po
index b6eff707..40336b1f 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5469,8 +5469,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5498,8 +5496,6 @@ msgstr ""
 "கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯\n"
 "  -e[scape] yes|no                           மதிபà¯à®ªà¯à®•ளில௠உளà¯à®³ நெடà¯à®µà®°à®¿à®šà¯ˆ "
 "பிரிபà¯à®ªà®¾à®©à¯à®•ளைத௠தவிரà¯\n"
-"  -n[ocheck]                                 nmcli மறà¯à®±à¯à®®à¯ NetworkManager "
-"பதிபà¯à®ªà¯à®•ளைச௠சோதிகà¯à®• வேணà¯à®Ÿà¯à®®à¯\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6583,25 +6579,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "விரà¯à®ªà¯à®ªà®®à¯ '--terse'கà¯à®•௠கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®Ÿ '--fields' விரà¯à®ªà¯à®ª மதிபà¯à®ªà¯à®•ள௠தேவை, '%s' அலà¯à®²"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"எசà¯à®šà®°à®¿à®•à¯à®•ை: nmcli (%s) மறà¯à®±à¯à®®à¯ NetworkManager (%s) பதிபà¯à®ªà¯ ஆகியவை பொரà¯à®¨à¯à®¤à®µà®¿à®²à¯à®²à¯ˆ. "
-"எசà¯à®šà®°à®¿à®•à¯à®•ையைத௠தவிரà¯à®•à¯à®• --nocheck கடà¯à®Ÿà®³à¯ˆà®¯à¯ˆà®ªà¯ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"பிழை: nmcli (%s) மறà¯à®±à¯à®®à¯ NetworkManager (%s) பதிபà¯à®ªà¯ பொரà¯à®¨à¯à®¤à®µà®¿à®²à¯à®²à¯ˆ. --nocheck "
-"கடà¯à®Ÿà®³à¯ˆà®¯à¯ˆà®ªà¯ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿ கடà¯à®Ÿà®¾à®¯à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿ செயலà¯à®ªà®Ÿà®µà¯ˆà®•à¯à®•லாமà¯, ஆனால௠விளைவ௠எபà¯à®ªà®Ÿà®¿ இரà¯à®•à¯à®•à¯à®®à¯ என "
-"கணிகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "à®à®±à¯à®•னவே ஒர௠அஙà¯à®•ீகரிபà¯à®ªà¯ அமரà¯à®µà¯ நடைபெறà¯à®±à¯à®•à¯à®•ொணà¯à®Ÿà¯à®³à¯à®³à®¤à¯."
diff --git a/po/te.po b/po/te.po
index 0baa4ea4..da224b09 100644
--- a/po/te.po
+++ b/po/te.po
@@ -5392,8 +5392,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5420,8 +5418,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6497,24 +6493,6 @@ msgstr "à°à°šà±à°šà°¿à°•మౠ'--terse' à°•à± '--fields' తెలà±à°ªà±à
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "à°à°šà±à°šà°¿à°•మౠ'--terse' à°•à± à°ªà±à°°à°¤à±à°¯à±‡à°•à°¿à°‚à°šà°¿ '--fields' à°à°šà±à°šà°¿à°•మౠవిలà±à°µà°²à± అవసరమౠ, '%s' కాదà±"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"హెచà±à°šà°°à°¿à°•: nmcli (%s) మరియౠనెటà±à°µà°°à±à°•à±à°®à±‡à°¨à±‡à°œà°°à± (%s) వరà±à°·à°¨à±à°²à± సరిపోలటంలేదà±. హెచà±à°šà°°à°¿à°•నౠఅరికటà±à°Ÿà±à°Ÿà°•à± --"
-"nocheck à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà±.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"దోషం: nmcli (%s) మరియౠనెటà±à°µà°°à±à°•à±à°®à±‡à°¨à±‡à°œà°°à± (%s) వరà±à°·à°¨à±à°²à± సరిపోలడంలేదà±. --nocheck à°µà±à°ªà°¯à±‹à°—à°¿à°‚à°šà°¿ "
-"బలవంతపౠనిరà±à°µà°°à±à°¤à°¨,  అయితే ఫలితాలౠఊహించనివిధంగా à°µà±à°‚టాయి."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 533e46b9..b4c9bf94 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4806,8 +4806,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5783,20 +5781,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 015b0a95..970a148c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5449,8 +5449,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5478,8 +5476,6 @@ msgstr ""
 "  -f[ields] <alan1,alan2,...>|all|common   çıktısı olacak alanları belirler\n"
 "  -e[scape] yes|no                           değerlerdeki kaçış sütunları "
 "ayırıcıları\n"
-"  -n[ocheck]                                 nmcli ve NetworkManager "
-"sürümlerini kontrol etmez\n"
 "  -a[sk]                                     eksik parametreleri sorar\n"
 "  -w[ait] <seconds>                          biten işlemler için zaman aşımı "
 "ayarlar\n"
@@ -6588,24 +6584,6 @@ msgstr ""
 "'--terse' seçeneği özel '--fields' seçeneği değerlerini gerektirir, '%s' "
 "deÄŸil"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Uyarı: nmcli (%s) ve NetworkManager (%s) sürümleri uyuşmuyor. Uyarıyı "
-"bastırmak için --nocheck seçeneğini kullanın.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Hata: nmcli (%s) ve NetworkManager (%s) sürümleri uyuşmuyor. --nocheck "
-"seçeneğini kullanarak işlemi zorlayabilirsiniz, fakat sonuçlar öngörülemez."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Bir kimlik doÄŸrulama oturu zaten var. "
diff --git a/po/uk.po b/po/uk.po
index dc8cc6ee..8be16bda 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5606,8 +5606,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5636,8 +5634,6 @@ msgstr ""
 "  -f[ields] <поле1,поле2,...>|all|common     вказати Ð¿Ð¾Ð»Ñ Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ\n"
 "  -e[scape] yes|no                           вилучати роздільники Ñтовпчиків "
 "у значеннÑÑ…\n"
-"  -n[ocheck]                                 не перевірÑти верÑÑ–Ñ— nmcli Ñ– "
-"NetworkManager\n"
 "  -a[sk]                                     проÑити вказати параметри, Ñких "
 "не виÑтачає\n"
 "  -s[how-secrets]                            дозволити показ паролів\n"
@@ -6779,26 +6775,6 @@ msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 "Параметр «--terse» потребує певних значень параметра «--fields», а не «%s»"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"Увага: верÑÑ–Ñ— nmcli (%s) Ñ– NetworkManager (%s) не збігаютьÑÑ. СкориÑтайтеÑÑ "
-"параметром --nocheck Ð´Ð»Ñ Ð²Ð¸Ð¼Ð¸ÐºÐ°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ попередженнÑ.\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"Помилка: верÑÑ–Ñ— nmcli (%s) Ñ– NetworkManager (%s) не збігаютьÑÑ. Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑку "
-"у примуÑовому режимі ÑкориÑтайтеÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --nocheck, але результати "
-"можуть бути непередбачуваними.\n"
-"."
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr "Ð¡ÐµÐ°Ð½Ñ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð²Ð°Ð½Ð½Ñ Ð²Ð¶Ðµ триває."
diff --git a/po/vi.po b/po/vi.po
index 11c44e13..10539a71 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4756,8 +4756,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5731,20 +5729,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index b5eadf8a..fd835180 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -4770,8 +4770,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5745,20 +5743,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 02010cc4..8fab8621 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,27 +1,33 @@
-# translation of zh_CN.po to Wei Liu
-# Simplified Chinese translation to NetworkManager
+# Simplified Chinese translation for NetworkManager
 # Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the NetworkManager package.
 #
 # Funda Wang <fundawang@linux.net.cn>, 2004.
 # Leah Liu <lliu@redhat.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Leah Liu <lliu@redhat.com>, 2013. #zanata
-# Leah Liu <lliu@redhat.com>, 2014. #zanata
+# tuhaihe <1132321739qq@gmail.com>, 2012, 2013.
+# Wylmer Wang <wantinghard@gmail.com>, 2013.
+# Luo Lei <luolei@ubuntukylin.com>, 2014.
+# Dingzhong Chen <wsxy162@gmail.com>, 2016.
+# Ian Li <https://launchpad.net/~ian.li>, 2016.
+# shijing <jingshi@ubuntukylin.com>, 2016.
+# Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2016.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 15:00+0200\n"
-"PO-Revision-Date: 2014-02-19 12:16-0500\n"
-"Last-Translator: Leah Liu <lliu@redhat.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh-CN\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
+"POT-Creation-Date: 2016-04-29 13:42+0000\n"
+"PO-Revision-Date: 2016-04-29 16:03-0400\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: ../clients/cli/agent.c:39
 #, c-format
@@ -31,6 +37,10 @@ msgid ""
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 msgstr ""
+"用法:nmcli agent { 命令 | help }\n"
+"\n"
+"命令 := { secret | polkit | all }\n"
+"\n"
 
 #: ../clients/cli/agent.c:47
 #, c-format
@@ -43,6 +53,13 @@ msgid ""
 "and if a password is required asks the user for it.\n"
 "\n"
 msgstr ""
+"用法:nmcli agent secret { help }\n"
+"\n"
+"è¿è¡Œ nmcli 作为网络管ç†å™¨å¯†é’¥ä»£ç†ã€‚当网络管ç†å™¨éœ€è¦å¯†ç æ—¶å°±å‘\n"
+"已注册的代ç†è¦ã€‚æ­¤å‘½ä»¤ä¼šä¿æŒ nmcli è¿è¡Œè€Œä¸”如果需è¦å¯†ç æ—¶å°±å‘\n"
+"用户请求æä¾›ã€‚\n"
+"\n"
+"\n"
 
 #: ../clients/cli/agent.c:57
 #, c-format
@@ -55,6 +72,11 @@ msgid ""
 "the response back to polkit.\n"
 "\n"
 msgstr ""
+"用法:nmcli agent polkit { help }\n"
+"\n"
+"ä¸ºç”¨æˆ·ä¼šè¯æ³¨å†Œ nmcli 作为 polkit æ“作。\n"
+"当 polkit å®ˆæŠ¤è¿›ç¨‹éœ€è¦æŽˆæƒæ—¶ï¼Œnmcli 询问用户并且将å“应返回给 polkit。\n"
+"\n"
 
 #: ../clients/cli/agent.c:67
 #, c-format
@@ -64,44 +86,48 @@ msgid ""
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
 msgstr ""
+"用法:nmcli agent all { help }\n"
+"\n"
+"è¿è¡Œ nmcli åŒæ—¶ä½œä¸ºç½‘络管ç†å™¨å¯†é’¥å’Œ polkit 代ç†ã€‚\n"
+"\n"
 
 #: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr ""
+msgstr "nmcli å·²æˆåŠŸåœ°æ³¨å†Œä¸ºç½‘ç»œç®¡ç†å™¨çš„密钥代ç†ã€‚\n"
 
 #: ../clients/cli/agent.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Error: secret agent initialization failed"
-msgstr "调制解调器åˆå§‹åŒ–失败"
+msgstr "错误:密钥代ç†åˆå§‹åŒ–失败"
 
 #: ../clients/cli/agent.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Error: polkit agent initialization failed: %s"
-msgstr "错误:激活连接失败:%s"
+msgstr "错误:polkit 代ç†åˆå§‹åŒ–失败:%s"
 
 #: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
-msgstr ""
+msgstr "nmcli å·²æˆåŠŸæ³¨å†Œä¸º polkit 代ç†ã€‚\n"
 
-#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11050
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11057
 #: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
-#: ../clients/cli/general.c:484
+#: ../clients/cli/general.c:481
 #, c-format
 msgid "Error: NetworkManager is not running."
-msgstr "错误:NetworkManager 未è¿è¡Œã€‚"
+msgstr "错误:网络管ç†å™¨æœªè¿è¡Œã€‚"
 
-#: ../clients/cli/agent.c:242
-#, fuzzy, c-format
+#: ../clients/cli/agent.c:239
+#, c-format
 msgid "Error: 'agent' command '%s' is not valid."
-msgstr "错误:'general' 命令 '%s' 无效。"
+msgstr "错误:“agentâ€å‘½ä»¤â€œ%sâ€æ— æ•ˆã€‚"
 
 #: ../clients/cli/common.c:38 ../clients/cli/common.c:51
 #: ../clients/cli/common.c:59 ../clients/cli/common.c:71
 #: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
-msgstr "组"
+msgstr "群组"
 
 #. 0
 #: ../clients/cli/common.c:39 ../clients/cli/common.c:60
@@ -118,7 +144,7 @@ msgstr "网关"
 #. 2
 #: ../clients/cli/common.c:41 ../clients/cli/common.c:62
 msgid "ROUTE"
-msgstr "路由器"
+msgstr "路由"
 
 #. 3
 #: ../clients/cli/common.c:42 ../clients/cli/common.c:63
@@ -141,39 +167,39 @@ msgid "OPTION"
 msgstr "选项"
 
 #: ../clients/cli/common.c:376 ../clients/cli/common.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
-msgstr "无效å‰ç¼€ '%s':å…许 <1-32>"
+msgstr "无效å‰ç¼€â€œ%sâ€ï¼›å…许 <1-%d>"
 
 #: ../clients/cli/common.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "invalid IP address: %s"
-msgstr "无效 IPv4 åœ°å€ '%s'"
+msgstr "无效的 IP 地å€ï¼š%s"
 
 #: ../clients/cli/common.c:448
 #, c-format
 msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
 "metric"
-msgstr ""
+msgstr "路由 (“%sâ€ï¼‰çš„ç¬¬äºŒç»„åˆ†æ—¢ä¸æ˜¯ä¸‹ä¸€è·³åœ°å€ä¹Ÿä¸æ˜¯è·ƒç‚¹"
 
 #: ../clients/cli/common.c:457
 #, c-format
 msgid "invalid metric '%s'"
-msgstr "æ— æ•ˆåº¦é‡ '%s'"
+msgstr "无效跃点“%sâ€"
 
 #: ../clients/cli/common.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "invalid route: %s"
-msgstr "无效 IPv4 路由 '%s'"
+msgstr "无效的路由:%s"
 
 #: ../clients/cli/common.c:477
 msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr ""
+msgstr "默认路由无法被添加(网络管ç†å™¨è‡ªè¡Œå¤„ç†å®ƒï¼‰"
 
 #: ../clients/cli/common.c:494
 msgid "unmanaged"
-msgstr "未管ç†"
+msgstr "未托管"
 
 #: ../clients/cli/common.c:496
 msgid "unavailable"
@@ -197,15 +223,15 @@ msgstr "连接中(需è¦éªŒè¯)"
 
 #: ../clients/cli/common.c:506
 msgid "connecting (getting IP configuration)"
-msgstr "连接中(获得 IP é…ç½®)"
+msgstr "正在连接(æ­£åœ¨èŽ·å– IP é…ç½®)"
 
 #: ../clients/cli/common.c:508
 msgid "connecting (checking IP connectivity)"
-msgstr "连接中(正在检查 IP 连接性)"
+msgstr "正在连接(正在检查 IP 连通性)"
 
 #: ../clients/cli/common.c:510
 msgid "connecting (starting secondary connections)"
-msgstr "连接中(开始二次连接)"
+msgstr "正在连接(正在å¯ç”¨ç¬¬äºŒè¿žæŽ¥)"
 
 #: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
@@ -213,7 +239,7 @@ msgstr "连接的"
 
 #: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
-msgstr "å–æ¶ˆæ¿€æ´»ä¸­"
+msgstr "正在åœç”¨"
 
 #: ../clients/cli/common.c:516
 msgid "connection failed"
@@ -224,10 +250,10 @@ msgstr "连接失败"
 #: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
 #: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
 #: ../clients/cli/general.c:248 ../clients/cli/general.c:286
-#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/general.c:429 ../clients/cli/general.c:445
 #: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
 #: ../clients/cli/settings.c:1265 ../clients/cli/settings.c:1901
-#: ../clients/cli/settings.c:3205 ../clients/cli/utils.c:1400
+#: ../clients/cli/settings.c:3205
 #, c-format
 msgid "unknown"
 msgstr "未知"
@@ -237,8 +263,8 @@ msgstr "未知"
 #: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
 #: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
 #: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
-#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8563
-#: ../clients/cli/connections.c:8564 ../clients/cli/devices.c:772
+#: ../clients/cli/connections.c:3457 ../clients/cli/connections.c:8570
+#: ../clients/cli/connections.c:8571 ../clients/cli/devices.c:772
 #: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
 #: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
 #: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
@@ -247,15 +273,15 @@ msgstr "未知"
 #: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
 #: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
 #: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
-#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3200
+#: ../clients/cli/general.c:439 ../clients/cli/settings.c:3200
 msgid "yes"
 msgstr "是"
 
 #: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
 #: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
 #: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
-#: ../clients/cli/connections.c:8563 ../clients/cli/connections.c:8564
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3458
+#: ../clients/cli/connections.c:8570 ../clients/cli/connections.c:8571
 #: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
 #: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
 #: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
@@ -264,91 +290,86 @@ msgstr "是"
 #: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
 #: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
 #: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:441
 #: ../clients/cli/settings.c:3202
 msgid "no"
 msgstr "å¦"
 
 #: ../clients/cli/common.c:531
 msgid "yes (guessed)"
-msgstr ""
+msgstr "是(猜测所得)"
 
 #: ../clients/cli/common.c:533
 msgid "no (guessed)"
-msgstr ""
+msgstr "å¦ï¼ˆçŒœæµ‹æ‰€å¾—)"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:544
 msgid "No reason given"
-msgstr "没有给出ç†ç”±"
+msgstr "未给出原因"
 
 #. We should not really come here
-#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2983
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
 #: ../clients/cli/common.c:550
 msgid "Device is now managed"
-msgstr "现在已管ç†çš„设备"
+msgstr "设备现在已托管"
 
 #: ../clients/cli/common.c:553
 msgid "Device is now unmanaged"
-msgstr "现在未管ç†çš„设备"
+msgstr "设备现在未托管"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:556
 msgid "The device could not be readied for configuration"
-msgstr "无法让该设备准备é…ç½®"
+msgstr "设备é…置未就绪"
 
 #: ../clients/cli/common.c:559
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr "IP é…置无法ä¿ç•™ï¼ˆæ²¡æœ‰å¯ç”¨åœ°å€ï¼Œè¶…时等等。)"
+msgstr "IP é…置无法ä¿ç•™(æ— å¯ç”¨åœ°å€ï¼Œè¶…æ—¶ç­‰)"
 
 #: ../clients/cli/common.c:562
 msgid "The IP configuration is no longer valid"
-msgstr "该 IP é…ç½®ä¸å†æœ‰æ•ˆ"
+msgstr "IP é…ç½®ä¸å†æœ‰æ•ˆ"
 
 #: ../clients/cli/common.c:565
 msgid "Secrets were required, but not provided"
-msgstr "éœ€è¦ secrets 但没有æä¾›ã€‚"
+msgstr "需è¦è®¤è¯å‡­æ®ï¼Œä½†æœªæä¾›"
 
 #: ../clients/cli/common.c:568
 msgid "802.1X supplicant disconnected"
-msgstr "802.1X 请求被断开"
+msgstr "802.1X 客户端已断开连接"
 
 #: ../clients/cli/common.c:571
 msgid "802.1X supplicant configuration failed"
-msgstr "802.1X 请求é…置失败"
+msgstr "802.1X 客户端é…置失败"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:574
 msgid "802.1X supplicant failed"
-msgstr "802.1X 请求失败"
+msgstr "802.1X 客户端失败"
 
 #: ../clients/cli/common.c:577
 msgid "802.1X supplicant took too long to authenticate"
-msgstr "802.1X 请求时间太长无法验è¯"
+msgstr "802.1X å®¢æˆ·ç«¯è®¤è¯æ—¶é—´è¿‡é•¿"
 
 #: ../clients/cli/common.c:580
 msgid "PPP service failed to start"
-msgstr "PPP æœåŠ¡å¯åŠ¨å¤±è´¥"
+msgstr "PPP æœåŠ¡æ— æ³•å¯åЍ"
 
 #: ../clients/cli/common.c:583
 msgid "PPP service disconnected"
-msgstr "PPP æœåŠ¡å·²æ–­å¼€"
+msgstr "PPP æœåŠ¡å·²æ–­å¼€è¿žæŽ¥"
 
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:586
 msgid "PPP failed"
 msgstr "PPP 失败"
 
 #: ../clients/cli/common.c:589
 msgid "DHCP client failed to start"
-msgstr "DHCP æœåŠ¡å¯åŠ¨å¤±è´¥"
+msgstr "DHCP 客户端无法å¯åЍ"
 
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:592
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
@@ -357,10 +378,9 @@ msgstr "DHCP 客户端错误"
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:598
 msgid "Shared connection service failed to start"
-msgstr "共享连接æœåŠ¡å¯åŠ¨å¤±è´¥"
+msgstr "共享连接æœåŠ¡æ— æ³•å¯åЍ"
 
 #: ../clients/cli/common.c:601
 msgid "Shared connection service failed"
@@ -368,19 +388,19 @@ msgstr "共享连接æœåŠ¡å¤±è´¥"
 
 #: ../clients/cli/common.c:604
 msgid "AutoIP service failed to start"
-msgstr "AutoIP æœåŠ¡å¯åŠ¨å¤±è´¥"
+msgstr "自动 IP(AutoIP) æœåŠ¡æ— æ³•å¯åЍ"
 
 #: ../clients/cli/common.c:607
 msgid "AutoIP service error"
-msgstr "AutoIP æœåŠ¡å‡ºé”™"
+msgstr "自动 IP(AutoIP) æœåŠ¡å‡ºé”™"
 
 #: ../clients/cli/common.c:610
 msgid "AutoIP service failed"
-msgstr "AutoIP æœåŠ¡å¤±è´¥"
+msgstr "自动 IP(AutoIP) æœåŠ¡å¤±è´¥"
 
 #: ../clients/cli/common.c:613
 msgid "The line is busy"
-msgstr "线路ç¹å¿™"
+msgstr "线路忙"
 
 #: ../clients/cli/common.c:616
 msgid "No dial tone"
@@ -408,7 +428,7 @@ msgstr "无法选择指定的 APN"
 
 #: ../clients/cli/common.c:634
 msgid "Not searching for networks"
-msgstr "未æœç´¢ç½‘络"
+msgstr "䏿œç´¢ç½‘络"
 
 #: ../clients/cli/common.c:637
 msgid "Network registration denied"
@@ -420,43 +440,43 @@ msgstr "网络注册超时"
 
 #: ../clients/cli/common.c:643
 msgid "Failed to register with the requested network"
-msgstr "无法在请求的网络上注册"
+msgstr "无法注册请求的网络"
 
 #: ../clients/cli/common.c:646
 msgid "PIN check failed"
-msgstr "PIN 检查未通过"
+msgstr "PIN 检查失败"
 
 #: ../clients/cli/common.c:649
 msgid "Necessary firmware for the device may be missing"
-msgstr "å¯èƒ½ç¼ºå°‘å¿…è¦çš„设备固件"
+msgstr "该设备所需固件å¯èƒ½ä¸¢å¤±"
 
 #: ../clients/cli/common.c:652
 msgid "The device was removed"
-msgstr "设备被删除"
+msgstr "设备被移除"
 
 #: ../clients/cli/common.c:655
 msgid "NetworkManager went to sleep"
-msgstr "NetworkManager 进入ç¡çœ çжæ€"
+msgstr "网络管ç†å™¨æŒ‚èµ·"
 
 #: ../clients/cli/common.c:658
 msgid "The device's active connection disappeared"
-msgstr "该设备的活跃连接消失"
+msgstr "设备的活动连接已消失"
 
 #: ../clients/cli/common.c:661
 msgid "Device disconnected by user or client"
-msgstr "用户或者客户端断开与该设备的连接"
+msgstr "用户/客户端断开了设备连接"
 
 #: ../clients/cli/common.c:664
 msgid "Carrier/link changed"
-msgstr "载波/é“¾æŽ¥å·²å˜æ›´"
+msgstr "载波/连接已更改"
 
 #: ../clients/cli/common.c:667
 msgid "The device's existing connection was assumed"
-msgstr "å·²æ¢å¤è®¾å¤‡çš„现有连接"
+msgstr "å‡å®šè®¾å¤‡å·²æœ‰è¿žæŽ¥"
 
 #: ../clients/cli/common.c:670
 msgid "The supplicant is now available"
-msgstr "请求现已å¯ç”¨"
+msgstr "客户端目å‰å¯ç”¨"
 
 #: ../clients/cli/common.c:673
 msgid "The modem could not be found"
@@ -464,95 +484,79 @@ msgstr "未找到调制解调器"
 
 #: ../clients/cli/common.c:676
 msgid "The Bluetooth connection failed or timed out"
-msgstr "è“牙连接失败或者超时"
+msgstr "è“牙连接失败或超时"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:679
 msgid "GSM Modem's SIM card not inserted"
-msgstr "未æ’å…¥ GSM 调制解调器的 SIM å¡"
+msgstr "GSM 调制解调器的 SIM 塿œªæ’å…¥"
 
 #: ../clients/cli/common.c:682
 msgid "GSM Modem's SIM PIN required"
-msgstr "éœ€è¦ GSM 调制解调器 SIM å¡çš„ PIN ç "
+msgstr "GSM 调制解调器的 SIM éœ€è¦ PIN ç "
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:685
 msgid "GSM Modem's SIM PUK required"
-msgstr "éœ€è¦ GSM 调制解调器 SIM å¡çš„ PUK ç "
+msgstr "GSM 调制解调器的 SIM éœ€è¦ PUK ç "
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:688
 msgid "GSM Modem's SIM wrong"
-msgstr "GSM 调制解调器的 SIM å¡é”™è¯¯"
+msgstr "GSM 调制解调器的 SIM 错误"
 
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
 #: ../clients/cli/common.c:691
 msgid "InfiniBand device does not support connected mode"
-msgstr "高速互è”è®¾å¤‡ä¸æ”¯æŒå·²è¿žæŽ¥æ¨¡å¼"
+msgstr "é«˜é€Ÿç½‘ç»œè¿žæŽ¥è®¾å¤‡ä¸æ”¯æŒå·²è¿žæŽ¥çš„æ¨¡å¼"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:694
 msgid "A dependency of the connection failed"
-msgstr "è¿žæŽ¥çš„ç›¸ä¾æ€§å¤±è´¥"
+msgstr "连接的ä¾èµ–关系失败"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:697
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
-msgstr "ADSL 桥接的 RFC 2684 ç½‘å¡æœ‰é—®é¢˜"
+msgstr "RFC 2684 以太网在 ADSL 网桥处出现问题"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:700
 msgid "ModemManager is unavailable"
-msgstr "ModemManager ä¸å¯ç”¨"
+msgstr "调制解调器管ç†å™¨ä¸å¯ç”¨"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:703
 msgid "The Wi-Fi network could not be found"
-msgstr "无法找到 Wi-Fi 网络"
+msgstr "未找到 Wi-Fi 网络"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:706
 msgid "A secondary connection of the base connection failed"
-msgstr "基础连接失败åŽçš„二次连接"
+msgstr "基础连接的备选连接失败"
 
 #: ../clients/cli/common.c:709
 msgid "DCB or FCoE setup failed"
-msgstr "DCB 或者 FCoE 设置失败"
+msgstr "DCB 或 FCoE 设置失败"
 
 #: ../clients/cli/common.c:712
 msgid "teamd control failed"
 msgstr "teamd 控制失败"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:715
-#, fuzzy
 msgid "Modem failed or no longer available"
-msgstr "ModemManager ä¸å¯ç”¨"
+msgstr "调制解调器失败或ä¸å†å¯ç”¨"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #: ../clients/cli/common.c:718
-#, fuzzy
 msgid "Modem now ready and available"
-msgstr "ModemManager ä¸å¯ç”¨"
+msgstr "调制解调器已就绪并å¯ç”¨"
 
 #: ../clients/cli/common.c:721
 msgid "SIM PIN was incorrect"
-msgstr ""
+msgstr "SIM PIN 䏿­£ç¡®"
 
 #: ../clients/cli/common.c:724
-#, fuzzy
 msgid "New connection activation was enqueued"
-msgstr "错误:激活连接失败。"
+msgstr "新的连接激活æ“作已加入队列"
 
 #: ../clients/cli/common.c:727
-#, fuzzy
 msgid "The device's parent changed"
-msgstr "设备被删除"
+msgstr "设备的上级已更改"
 
 #: ../clients/cli/common.c:730
-#, fuzzy
 msgid "The device parent's management changed"
-msgstr "设备被删除"
+msgstr "设备的上级管ç†å·²æ›´æ”¹"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
@@ -563,32 +567,32 @@ msgstr "未知"
 #: ../clients/cli/common.c:776
 #, c-format
 msgid "invalid priority map '%s'"
-msgstr "æ— æ•ˆä¼˜å…ˆæƒæ˜ å°„ '%s'"
+msgstr "无效的优先级映射“%sâ€"
 
 #: ../clients/cli/common.c:783 ../clients/cli/common.c:789
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
-msgstr "ä¼˜å…ˆæƒ '%s' 无效(<0-%ld>)"
+msgstr "优先级“%sâ€æ— æ•ˆ (<0-%ld>)"
 
 #: ../clients/cli/common.c:856
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆå›¢é˜Ÿé…置或者文件å。"
+msgstr "“%s†是无效的群组设置或文件å。"
 
 #: ../clients/cli/common.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed: %s\n"
-msgstr "错误:连接验è¯å¤±è´¥ï¼š%s\n"
+msgstr "错误:openconnect 失败:%s\n"
 
 #: ../clients/cli/common.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with status %d\n"
-msgstr "错误:连接无效:%s\n"
+msgstr "错误:openconnect å¤±è´¥ï¼ŒçŠ¶æ€ %d\n"
 
 #: ../clients/cli/common.c:967
-#, fuzzy, c-format
+#, c-format
 msgid "Error: openconnect failed with signal %d\n"
-msgstr "错误:连接无效:%s\n"
+msgstr "错误:openconnect å¤±è´¥ï¼Œä¿¡å· %d\n"
 
 #: ../clients/cli/common.c:1045
 #, c-format
@@ -596,6 +600,8 @@ msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
 msgstr ""
+"警告:用于“%sâ€çš„å¯†ç æ²¡æœ‰åœ¨â€œpasswd-fileâ€ä¸­ç»™å‡ºå’Œ nmcli 无法在没有“--askâ€é€‰é¡¹ä¸‹"
+"请求。\n"
 
 #. define some prompts for connection editor
 #: ../clients/cli/connections.c:41
@@ -604,7 +610,7 @@ msgstr "设置å称?"
 
 #: ../clients/cli/connections.c:42
 msgid "Property name? "
-msgstr "属性å称?"
+msgstr "属性åç§°? "
 
 #: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
@@ -620,36 +626,33 @@ msgid "VPN type: "
 msgstr "VPN 类型:"
 
 #: ../clients/cli/connections.c:48
-#, fuzzy
 msgid "Master: "
-msgstr "绑定主机: "
+msgstr "主连接:"
 
 #: ../clients/cli/connections.c:49
 msgid "Connection (name, UUID, or path): "
-msgstr "连接(åç§°ã€UUIDã€æˆ–者路径):"
+msgstr "连接(åç§°ã€UUID 或路径):"
 
 #: ../clients/cli/connections.c:50
-#, fuzzy
 msgid "VPN connection (name, UUID, or path): "
-msgstr "连接(åç§°ã€UUIDã€æˆ–者路径):"
+msgstr "VPN 连接(åç§°ã€UUID 或路径):"
 
 #: ../clients/cli/connections.c:51
-#, fuzzy
 msgid "Connection(s) (name, UUID, or path): "
-msgstr "连接(åç§°ã€UUIDã€æˆ–者路径):"
+msgstr "连接(åç§°ã€UUID 或路径):"
 
+# apath = active path
 #: ../clients/cli/connections.c:52
-#, fuzzy
 msgid "Connection(s) (name, UUID, path or apath): "
-msgstr "连接(åç§°ã€UUIDã€æˆ–者路径):"
+msgstr "连接(åç§°ã€UUIDã€è·¯å¾„或活动路径):"
 
 #: ../clients/cli/connections.c:53
 msgid "Tunnel mode: "
-msgstr ""
+msgstr "éš§é“æ¨¡å¼ï¼š"
 
 #: ../clients/cli/connections.c:54
 msgid "MACVLAN mode: "
-msgstr ""
+msgstr "MACVLAN 模å¼ï¼š"
 
 #. 0
 #: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
@@ -696,16 +699,14 @@ msgstr "自动连接"
 
 #. 5
 #: ../clients/cli/connections.c:79
-#, fuzzy
 msgid "AUTOCONNECT-PRIORITY"
-msgstr "自动连接"
+msgstr "自动连接优先级"
 
 #. 6
 #: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "åªè¯»"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
 #. 7
 #. 8
 #. 2
@@ -715,7 +716,7 @@ msgstr "åªè¯»"
 #: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
 #: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
-msgstr "DBUS-PATH"
+msgstr "DBUS路径"
 
 #. 8
 #. 13
@@ -749,9 +750,8 @@ msgstr "状æ€"
 
 #. 11
 #: ../clients/cli/connections.c:85
-#, fuzzy
 msgid "ACTIVE-PATH"
-msgstr "MASTER-PATH"
+msgstr "活动路径"
 
 #. 2
 #: ../clients/cli/connections.c:195
@@ -766,21 +766,21 @@ msgstr "默认"
 #. 5
 #: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
-msgstr "DEFAULT6"
+msgstr "默认6"
 
 #. 6
 #: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
-msgstr "SPEC 对象"
+msgstr "指定对象"
 
 #. 7
 #. 4
 #. Ask for optional 'vpn' arguments.
 #: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
-#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
+#: ../clients/cli/connections.c:4176 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
-msgstr "VPN"
+msgstr "VPN 傿•°"
 
 #. 9
 #. 5
@@ -788,37 +788,37 @@ msgstr "VPN"
 #: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
 #: ../clients/cli/devices.c:78
 msgid "CON-PATH"
-msgstr "CON-PATH"
+msgstr "连接路径"
 
 #. 10
 #: ../clients/cli/connections.c:203
 msgid "ZONE"
-msgstr "ZONE"
+msgstr "区"
 
 #. 11
 #: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
-msgstr "MASTER-PATH"
+msgstr "主路径"
 
 #. 1
 #: ../clients/cli/connections.c:216
 msgid "USERNAME"
-msgstr "USERNAME"
+msgstr "用户å"
 
 #. 3
 #: ../clients/cli/connections.c:218
 msgid "BANNER"
-msgstr "BANNER"
+msgstr "连接标语"
 
 #. 4
 #: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
-msgstr "VPN-STATE"
+msgstr "VPN状æ€"
 
 #. 5
 #: ../clients/cli/connections.c:220
 msgid "CFG"
-msgstr "CFG"
+msgstr "é…ç½®"
 
 #: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
@@ -849,7 +849,7 @@ msgid "DHCP6"
 msgstr "DHCP6"
 
 #: ../clients/cli/connections.c:272
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -888,32 +888,40 @@ msgid ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 msgstr ""
-"用法:nmcli connection { COMMAND | help }\n"
+"用法:nmcli connection { 命令 | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
-"load }\n"
+"命令 := { show | up | down | add | modify | edit | delete | monitor | reload "
+"| load }\n"
 "\n"
-"  show configured [[id | uuid | path] <ID>]\n"
-"  show active     [[id | uuid | path | apath] <ID>]\n"
+"  show [--active] [--order <旧的指定>]\n"
+"  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <接å£åç§°>] [ap <BSSID>] [passwd-file "
+"<å¯†ç æ–‡ä»¶>]\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<设置>.<属性> <值>)+]\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
 "\n"
-"  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+"  clone [--temporary] [id | uuid | path ] <ID> <æ–°åç§°>\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
-"  edit [type <new_con_type>] [con-name <new_con_name>]\n"
+"  edit [type <新连接类型>] [con-name <新连接类型>]\n"
 "\n"
 "  delete [id | uuid | path] <ID>\n"
 "\n"
+"  monitor [id | uuid | path] <ID> ...\n"
+"\n"
 "  reload\n"
 "\n"
-"  load <filename> [ <filename>... ]\n"
+"  load <文件å> [ <文件å>... ]\n"
+"\n"
+"  import [--temporary] type <类型> file <è¦å¯¼å…¥çš„æ–‡ä»¶>\n"
+"\n"
+"  export [id | uuid | path] <ID> [<输出文件>]\n"
 "\n"
 
 #: ../clients/cli/connections.c:294
@@ -942,9 +950,24 @@ msgid ""
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
 msgstr ""
+"用法:nmcli connection show { 傿•° | help }\n"
+"\n"
+"傿•° := [--active] [--order <旧的指定>]\n"
+"\n"
+"列出内存里和ç£ç›˜ä¸Šçš„连接é…置文件,其中一些也å¯èƒ½æ˜¯æ´»åŠ¨çš„å¦‚æžœè®¾å¤‡\n"
+"正在使用那些连接é…置文件。ä¸å¸¦å‚数,所有的é…置文件会被列出。当指\n"
+"定 --active é€‰é¡¹æ—¶ï¼Œåªæ˜¾ç¤ºæ´»åŠ¨çš„é…置文件。--order 选项å…许自定义连接\n"
+"顺åºï¼ˆè§æ‰‹å†Œé¡µï¼‰ã€‚\n"
+"\n"
+"傿•° := [--active] [id | uuid | path | apath] <ID> ...\n"
+"\n"
+"显示指定连接的详细信æ¯ã€‚é»˜è®¤æƒ…å†µä¸‹ï¼Œé™æ€çš„é…置文件和活动连接的数\n"
+"æ®éƒ½ä¼šæ˜¾ç¤ºã€‚使用全局“--fieldsâ€é€‰é¡¹å°±å¯ä»¥è¿‡æ»¤è¾“出。 请å‚阅手册页了\n"
+"解更多信æ¯ã€‚当指定全局选项“--activeâ€æ—¶ï¼Œåªè€ƒè™‘活动的é…置文件在内。\n"
+"使用全局 --show--secrets 选项å¯ä»¥ä¸€å¹¶æ˜¾ç¤ºå¯†é’¥ã€‚\n"
 
 #: ../clients/cli/connections.c:315
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
@@ -967,27 +990,26 @@ msgid ""
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
 msgstr ""
-"用法:nmcli connection up { ARGUMENTS | help }\n"
+"用法:nmcli connection up { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>]\n"
+"傿•° := [id | uuid | path] <ID> [ifname <接å£åç§°>] [ap <BSSID>] [nsp <åç§°"
+">] [passwd-file <带密ç çš„æ–‡ä»¶>]\n"
 "\n"
-"Activate a connection on a device. The profile to activate is identified by "
-"its\n"
-"name, UUID or D-Bus path.\n"
+"æ¿€æ´»è®¾å¤‡ä¸Šçš„è¿žæŽ¥ã€‚è¦æ¿€æ´»çš„é…置文件由它的åç§°ã€UUID 或 D-Bus 路径确定。\n"
 "\n"
-"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+"傿•° := ifname <接å£åç§°> [ap <BSSID>] [nsp <åç§°>] [passwd-file <带密ç çš„æ–‡"
+"ä»¶>]\n"
 "\n"
-"Activate a device with a connection. The connection profile is selected\n"
-"automatically by NetworkManager.\n"
+"激活连接上的设备。连接é…置文件由网络管ç†å™¨è‡ªåŠ¨é€‰æ‹©ã€‚ \n"
 "\n"
-"ifname - specifies the device to active the connection on\n"
-"ap     - specifies AP to connect to (only valid for Wi-Fi)\n"
-"nsp    - specifies NSP to connect to (only valid for WiMAX)\n"
+"ifname      - æŒ‡å®šè¿žæŽ¥æ‰€åœ¨è¦æ¿€æ´»çš„设备\n"
+"ap          - 指定è¦è¿žæŽ¥çš„ AP(åªå¯¹ Wi-Fi 有效)\n"
+"nsp         - 指定è¦è¿žæŽ¥åˆ°çš„ NSP(åªå¯¹ WiMAX 有效)\n"
+"passwd-file - 激活连接所需è¦çš„带密ç çš„æ–‡ä»¶\n"
 "\n"
 
 #: ../clients/cli/connections.c:336
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
@@ -999,18 +1021,16 @@ msgid ""
 "UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection down { ARGUMENTS | help }\n"
+"用法:nmcli connection down { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path | apath] <ID>\n"
+"傿•° := [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"Deactivate a connection from a device (without preventing the device from\n"
-"further auto-activation). The profile to deactivate is identified by its "
-"name,\n"
-"UUID or D-Bus path.\n"
+"åœæ­¢æ¥è‡ªè®¾å¤‡ä¸Šçš„连接(ä¸é˜²æ­¢è®¾å¤‡ä»¥åŽçš„自动激活)。è¦å–消激活的é…ç½®\n"
+"文件由它的åç§°ã€UUID 或 D-Bus 路径确定。\n"
 "\n"
 
 #: ../clients/cli/connections.c:348
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -1151,98 +1171,142 @@ msgid ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 msgstr ""
-"用法:nmcli connection add { ARGUMENTS | help }\n"
+"用法:nmcli connection add { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+"傿•° := 通用选项 类型指定选项 从选项 IP选项 [-- ([+|-]<设置>.<属性> <值>)+]\n"
 "\n"
-"  COMMON_OPTIONS:\n"
-"                  type <type>\n"
-"                  ifname <interface name> | \"*\"\n"
-"                  [con-name <connection name>]\n"
+"  通用选项:\n"
+"                  type <类型>\n"
+"                  ifname <接å£åç§°> | \"*\"\n"
+"                  [con-name <连接åç§°>]\n"
 "                  [autoconnect yes|no]\n"
+"                  [save yes|no]\n"
+"                  [master <主连接(接å£å称或是连接的 UUID 或å称)>]\n"
+"                  [slave-type <主连接类型>]\n"
 "\n"
-"  TYPE_SPECIFIC_OPTIONS:\n"
-"    ethernet:     [mac <MAC address>]\n"
-"                  [cloned-mac <cloned MAC address>]\n"
+"  类型指定选项:\n"
+"    ethernet:     [mac <MAC 地å€>]\n"
+"                  [cloned-mac <克隆的 MAC 地å€>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
 "    wifi:         ssid <SSID>\n"
-"                  [mac <MAC address>]\n"
-"                  [cloned-mac <cloned MAC address>]\n"
+"                  [mac <MAC 地å€>]\n"
+"                  [cloned-mac <克隆的 MAC 地å€>]\n"
 "                  [mtu <MTU>]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
 "\n"
-"    wimax:        [mac <MAC address>]\n"
+"    wimax:        [mac <MAC 地å€>]\n"
 "                  [nsp <NSP>]\n"
 "\n"
-"    pppoe:        username <PPPoE username>\n"
-"                  [password <PPPoE password>]\n"
-"                  [service <PPPoE service name>]\n"
+"    pppoe:        username <PPPoE 用户å>\n"
+"                  [password <PPPoE 密ç >]\n"
+"                  [service <PPPoE æœåŠ¡å>]\n"
 "                  [mtu <MTU>]\n"
-"                  [mac <MAC address>]\n"
+"                  [mac <MAC 地å€>]\n"
 "\n"
 "    gsm:          apn <APN>\n"
-"                  [user <username>]\n"
-"                  [password <password>]\n"
+"                  [user <用户å>]\n"
+"                  [password <密ç >]\n"
 "\n"
-"    cdma:         [user <username>]\n"
-"                  [password <password>]\n"
+"    cdma:         [user <用户å>]\n"
+"                  [password <密ç >]\n"
 "\n"
-"    infiniband:   [mac <MAC address>]\n"
+"    infiniband:   [mac <MAC 地å€>]\n"
 "                  [mtu <MTU>]\n"
 "                  [transport-mode datagram | connected]\n"
-"                  [parent <ifname>]\n"
+"                  [parent <接å£åç§°>]\n"
 "                  [p-key <IPoIB P_Key>]\n"
 "\n"
-"    bluetooth:    [addr <bluetooth address>]\n"
+"    bluetooth:    [addr <è“牙地å€>]\n"
 "                  [bt-type panu|dun-gsm|dun-cdma]\n"
 "\n"
-"    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
+"    vlan:         dev <上级设备(连接 UUIDã€æŽ¥å£å称或 MAC)>\n"
 "                  id <VLAN ID>\n"
-"                  [flags <VLAN flags>]\n"
-"                  [ingress <ingress priority mapping>]\n"
-"                  [egress <egress priority mapping>]\n"
+"                  [flags <VLAN 标志>]\n"
+"                  [ingress <å…¥å£ä¼˜å…ˆçº§æ˜ å°„>]\n"
+"                  [egress <出å£ä¼˜å…ˆçº§æ˜ å°„>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
 "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
 "| broadcast (3) |\n"
 "                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
 "(6)]\n"
-"                  [primary <ifname>]\n"
-"                  [miimon <num>]\n"
-"                  [downdelay <num>]\n"
-"                  [updelay <num>]\n"
-"                  [arp-interval <num>]\n"
-"                  [arp-ip-target <num>]\n"
+"                  [primary <接å£åç§°>]\n"
+"                  [miimon <数值>]\n"
+"                  [downdelay <数值>]\n"
+"                  [updelay <数值>]\n"
+"                  [arp-interval <数值>]\n"
+"                  [arp-ip-target <数值>]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <master (ifname or connection UUID)>\n"
+"    bond-slave:   master <主(接å£å称或是连接的 UUID 或å称)>\n"
 "\n"
-"    team:         [config <file>|<raw JSON data>]\n"
+"    team:         [config <文件>|<原始 JSON æ•°æ®>]\n"
 "\n"
-"    team-slave:   master <master (ifname or connection UUID)>\n"
-"                  [config <file>|<raw JSON data>]\n"
+"    team-slave:   master <主(接å£å称或是连接的 UUID 或å称)>\n"
+"                  [config <文件>|<原始 JSON æ•°æ®>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
-"                  [priority <num>]\n"
+"                  [priority <数值>]\n"
 "                  [forward-delay <2-30>]\n"
 "                  [hello-time <1-10>]\n"
 "                  [max-age <6-40>]\n"
 "                  [ageing-time <0-1000000>]\n"
+"                  [multicast-snooping yes|no]\n"
+"                  [mac <MAC 地å€>]\n"
 "\n"
-"    bridge-slave: master <master (ifname or connection UUID)>\n"
+"    bridge-slave: master <主(接å£å称或是连接的 UUID 或å称)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
-"                  [user <username>]\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
+"                  [user <用户å>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
 "                  [channel <1-13>]\n"
-"                  [dhcp-anycast <MAC address>]\n"
+"                  [dhcp-anycast <MAC 地å€>]\n"
 "\n"
-"  IP_OPTIONS:\n"
-"                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
-"                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
+"    adsl:         username <用户å>\n"
+"                  protocol pppoa|pppoe|ipoatm\n"
+"                  [password <密ç >]\n"
+"                  [encapsulation vcmux|llc]\n"
+"\n"
+"    tun:          mode tun|tap\n"
+"                  [owner <UID>]\n"
+"                  [group <GID>]\n"
+"                  [pi yes|no]\n"
+"                  [vnet-hdr yes|no]\n"
+"                  [multi-queue yes|no]\n"
+"\n"
+"    ip-tunnel:    mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n"
+"                  remote <远程端点 IP>\n"
+"                  [local <本地端点 IP>]\n"
+"                  [dev <上级设备(接å£å称或连接 UUID)>]\n"
+"\n"
+"    macvlan:      dev <上级设备(连接 UUIDã€æŽ¥å£å称或 MAC)>\n"
+"                  mode vepa|bridge|private|passthru|source\n"
+"                  [tap yes|no]\n"
+"\n"
+"    vxlan:        id <VXLAN ID>\n"
+"                  remote <多播组的 IP 或远程地å€>\n"
+"                  [local <æº IP>]\n"
+"                  [dev <上级设备(接å£å称或连接 UUID)>]\n"
+"                  [source-port-min <0-65535>]\n"
+"                  [source-port-max <0-65535>]\n"
+"                  [destination-port <0-65535>]\n"
+"\n"
+"  SLAVE_OPTIONS:\n"
+"    bridge:       [priority <0-63>]\n"
+"                  [path-cost <1-65535>]\n"
+"                  [hairpin yes|no]\n"
+"\n"
+"    team:         [config <文件>|<原始 JSON æ•°æ®>]\n"
+"\n"
+"  IP 选项:\n"
+"                  [ip4 <IPv4 地å€>] [gw4 <IPv4 网关>]\n"
+"                  [ip6 <IPv6 地å€>] [gw6 <IPv6 网关>]\n"
 "\n"
 
 #: ../clients/cli/connections.c:460
@@ -1269,6 +1333,26 @@ msgid ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 msgstr ""
+"用法:nmcli connection modify { 傿•° | help }\n"
+"\n"
+"傿•° := [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
+"\n"
+"修改连接é…置文件的一个或更多属性。\n"
+"该é…置文件由åç§°ã€UUID 或 D-Bus 路径确定。对于多值属性,å¯ä»¥ä½¿ç”¨å¯é€‰"
+"的“+â€æˆ–“-â€å‰æ’到属性å称。\n"
+"“+â€ç¬¦å·å…è®¸è¿½åŠ é¡¹ç›®è€Œä¸æ˜¯è¦†ç›–去全部的值。\n"
+"“-â€ç¬¦å·å…è®¸ç§»é™¤æ‰€é€‰é¡¹ç›®è€Œä¸æ˜¯å…¨éƒ¨çš„值。\n"
+"\n"
+"示例:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
+"\n"
 
 #: ../clients/cli/connections.c:483
 #, c-format
@@ -1283,6 +1367,13 @@ msgid ""
 "id (provided as <new name> argument).\n"
 "\n"
 msgstr ""
+"用法:nmcli connection clone { 傿•° | help }\n"
+"\n"
+"傿•° := [--temporary] [id | uuid | path] <ID> <æ–°åç§°>\n"
+"\n"
+"克隆一个已有的连接é…置文件。新创建的连接将是 <ID> 的完全å¤åˆ¶ï¼Œ\n"
+"除了 uuid 属性(将被生æˆï¼‰å’Œ id(æä¾›ä¸º <æ–°åç§°> çš„å‚æ•°ï¼‰ã€‚\n"
+"\n"
 
 #: ../clients/cli/connections.c:495
 #, c-format
@@ -1299,16 +1390,16 @@ msgid ""
 "Add a new connection profile in an interactive editor.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection edit { ARGUMENTS | help }\n"
+"用法:nmcli connection edit { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID>\n"
+"傿•° := [id | uuid | path] <ID>\n"
 "\n"
-"Edit an existing connection profile in an interactive editor.\n"
-"The profile is identified by its name, UUID or D-Bus path\n"
+"在交互å¼ç¼–辑器中编辑已有的连接é…置文件。\n"
+"该é…置文件由åç§°ã€UUID 或 D-Bus 路径确定。\n"
 "\n"
-"ARGUMENTS := [type <new connection type>] [con-name <new connection name>]\n"
+"傿•° := [type <新连接类型>] [con-name <新连接åç§°>]\n"
 "\n"
-"Add a new connection profile in an interactive editor.\n"
+"在交互å¼ç¼–辑器中添加新的连接é…置文件。\n"
 "\n"
 
 #: ../clients/cli/connections.c:510
@@ -1322,16 +1413,16 @@ msgid ""
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection delete { ARGUMENTS | help }\n"
+"用法:nmcli connection delete { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID>\n"
+"傿•° := [id | uuid | path] <ID>\n"
 "\n"
-"Delete a connection profile.\n"
-"The profile is identified by its name, UUID or D-Bus path.\n"
+"删除一个连接é…置文件。\n"
+"该é…置文件由åç§°ã€UUID 或 D-Bus 路径确定。\n"
 "\n"
 
 #: ../clients/cli/connections.c:521
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
 "\n"
@@ -1342,16 +1433,14 @@ msgid ""
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection edit { ARGUMENTS | help }\n"
+"用法:nmcli connection monitor { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID>\n"
-"\n"
-"Edit an existing connection profile in an interactive editor.\n"
-"The profile is identified by its name, UUID or D-Bus path\n"
+"傿•° := [id | uuid | path] <ID> ...\n"
 "\n"
-"ARGUMENTS := [type <new connection type>] [con-name <new connection name>]\n"
+"监控连接é…置文件的活动。\n"
+"此命令输出一行åªè¦æŒ‡å®šçš„连接一改å˜ã€‚\n"
+"如果没有指定就监控所有的连接。\n"
 "\n"
-"Add a new connection profile in an interactive editor.\n"
 "\n"
 
 #: ../clients/cli/connections.c:533
@@ -1364,7 +1453,7 @@ msgid ""
 msgstr ""
 "用法:nmcli connection reload { help }\n"
 "\n"
-"Reload all connection files from disk.\n"
+"从ç£ç›˜é‡æ–°è½½å…¥æ‰€æœ‰çš„连接文件。\n"
 "\n"
 
 #: ../clients/cli/connections.c:541
@@ -1380,14 +1469,13 @@ msgid ""
 "state.\n"
 "\n"
 msgstr ""
-"用法: nmcli connection load { ARGUMENTS | help }\n"
+"用法:nmcli connection load { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := <filename> [<filename>...]\n"
+"傿•° := <文件å> [<文件å>...]\n"
 "\n"
-"Load/reload one or more connection files from disk. Use this after manually\n"
-"editing a connection file to ensure that NetworkManager is aware of its "
-"latest\n"
-"state.\n"
+"从ç£ç›˜åŠ è½½/é‡è½½ä¸€ä¸ªæˆ–多个连接文件。在手动编辑\n"
+"连接文件åŽä½¿ç”¨æ­¤æ–¹æ³•以确ä¿ç½‘络管ç†å™¨èƒ½æ³¨æ„到\n"
+"最新状æ€ã€‚\n"
 "\n"
 
 #: ../clients/cli/connections.c:553
@@ -1404,9 +1492,18 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"用法:nmcli connection import { 傿•° | help }\n"
+"\n"
+"傿•° := [--temporary] type <类型> file <è¦å¯¼å…¥çš„æ–‡ä»¶>\n"
+"\n"
+"导入对外/外部é…置文件作为网络管ç†å™¨çš„连接é…置文件。\n"
+"输入文件的类型在类型选项中指定。\n"
+"çŽ°åœ¨åªæ”¯æŒ VPN é…置。é…置由网络管\n"
+"ç†å™¨çš„ VPN æ’件导入。\n"
+"\n"
 
 #: ../clients/cli/connections.c:566
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
 "\n"
@@ -1416,12 +1513,12 @@ msgid ""
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
 msgstr ""
-"用法:nmcli connection delete { ARGUMENTS | help }\n"
+"用法:nmcli connection export { 傿•° | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID>\n"
+"傿•° := [id | uuid | path] <ID> [<输出文件>]\n"
 "\n"
-"Delete a connection profile.\n"
-"The profile is identified by its name, UUID or D-Bus path.\n"
+"å¯¼å‡ºè¿žæŽ¥ã€‚çŽ°åœ¨åªæ”¯æŒ VPN 连接。数æ®å°†å®šå‘到\n"
+"标准输出或者如果给定了å称就定å‘到文件。\n"
 "\n"
 
 #: ../clients/cli/connections.c:644
@@ -1434,7 +1531,7 @@ msgstr "已激活"
 
 #: ../clients/cli/connections.c:650
 msgid "deactivated"
-msgstr "已喿¶ˆæ¿€æ´»çš„"
+msgstr "已喿¶ˆæ¿€æ´»"
 
 #: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
@@ -1454,7 +1551,7 @@ msgstr "VPN 连接中(èŽ·å– IP é…ç½®)"
 
 #: ../clients/cli/connections.c:670
 msgid "VPN connected"
-msgstr "VPN 连接"
+msgstr "VPN 已连接"
 
 #: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
@@ -1462,60 +1559,56 @@ msgstr "VPN 连接失败"
 
 #: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
-msgstr "断开 VPN 连接"
+msgstr "VPN 已断开"
 
 #: ../clients/cli/connections.c:744
-#, fuzzy, c-format
+#, c-format
 msgid "Error updating secrets for %s: %s\n"
-msgstr "ä¿å­˜è¿žæŽ¥å‡ºé”™ï¼š%s"
+msgstr "为 %s 更新密钥时出错:%s\n"
 
 #: ../clients/cli/connections.c:764
-#, fuzzy
 msgid "Connection profile details"
-msgstr "连接详情"
+msgstr "连接é…置文件详情"
 
 #: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
-#, fuzzy, c-format
+#, c-format
 msgid "Error: 'connection show': %s"
-msgstr "错误:'device show': %s"
+msgstr "错误:“connection showâ€ï¼š%s"
 
 #: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1897
 msgid "never"
 msgstr "从ä¸"
 
 #: ../clients/cli/connections.c:1157
-#, fuzzy
 msgid "Activate connection details"
 msgstr "活跃连接详情"
 
 #: ../clients/cli/connections.c:1393
-#, fuzzy, c-format
+#, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
-msgstr "无效字段 '%s'; å…许的字段为:%s"
+msgstr "无效字段“%sâ€ï¼›å…许的字段:%s å’Œ %s 或 %s,%s"
 
 #: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' has to be alone"
-msgstr "字段 '%s' 必须是å•独的"
+msgstr "“%sâ€å¿…须是å•独的"
 
 #. Add headers
 #: ../clients/cli/connections.c:1634
-#, fuzzy
 msgid "NetworkManager active profiles"
-msgstr "网络管ç†å™¨çжæ€"
+msgstr "网络管ç†å™¨çš„æ´»è·ƒé…置文件"
 
 #: ../clients/cli/connections.c:1635
-#, fuzzy
 msgid "NetworkManager connection profiles"
-msgstr "NetworkManager 进入ç¡çœ çжæ€"
-
-#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
-#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
-#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
-#: ../clients/cli/connections.c:10156 ../clients/cli/connections.c:10273
-#: ../clients/cli/connections.c:10405 ../clients/cli/connections.c:10538
-#: ../clients/cli/connections.c:10648 ../clients/cli/connections.c:10659
-#: ../clients/cli/connections.c:10758 ../clients/cli/devices.c:2344
+msgstr "网络管ç†å™¨è¿žæŽ¥é…置文件"
+
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2396
+#: ../clients/cli/connections.c:2418 ../clients/cli/connections.c:2427
+#: ../clients/cli/connections.c:2436 ../clients/cli/connections.c:2595
+#: ../clients/cli/connections.c:10163 ../clients/cli/connections.c:10280
+#: ../clients/cli/connections.c:10412 ../clients/cli/connections.c:10545
+#: ../clients/cli/connections.c:10655 ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:10765 ../clients/cli/devices.c:2344
 #: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
 #: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
 #: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
@@ -1530,17 +1623,17 @@ msgid "Error: %s argument is missing."
 msgstr "错误:缺少 %s 傿•°ã€‚"
 
 #: ../clients/cli/connections.c:1696
-#, fuzzy, c-format
+#, c-format
 msgid "Error: %s - no such connection profile."
-msgstr "错误:%s - 没有这个连接。"
+msgstr "错误:%s - 没有这个连接é…置文件。"
 
-#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
-#: ../clients/cli/connections.c:11162 ../clients/cli/devices.c:3292
-#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
-#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
-#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
-#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
-#: ../clients/cli/general.c:843
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2459
+#: ../clients/cli/connections.c:11166 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3776 ../clients/cli/general.c:536
+#: ../clients/cli/general.c:585 ../clients/cli/general.c:602
+#: ../clients/cli/general.c:641 ../clients/cli/general.c:655
+#: ../clients/cli/general.c:773 ../clients/cli/general.c:820
+#: ../clients/cli/general.c:840
 #, c-format
 msgid "Error: %s."
 msgstr "错误:%s。"
@@ -1548,7 +1641,7 @@ msgstr "错误:%s。"
 #: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
-msgstr "设备 '%s' 中没有活跃连接"
+msgstr "设备“%sâ€ä¸­æ²¡æœ‰æ´»è·ƒè¿žæŽ¥"
 
 #: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
@@ -1557,12 +1650,12 @@ msgstr "没有活跃连接或者设备"
 #: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
-msgstr "设备 '%s' ä¸å…¼å®¹è¿žæŽ¥ '%s'"
+msgstr "设备“%sâ€ä¸å…¼å®¹è¿žæŽ¥â€œ%sâ€"
 
 #: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
-msgstr "没有找到å¯ç”¨äºŽè¿žæŽ¥ '%s' 的设备"
+msgstr "没有找到å¯ç”¨äºŽè¿žæŽ¥â€œ%sâ€çš„设备"
 
 #: ../clients/cli/connections.c:1925
 msgid "unknown reason"
@@ -1612,1128 +1705,1083 @@ msgstr "无效 VPN 加密"
 msgid "the connection was removed"
 msgstr "连接被删除"
 
-#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
-#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:2004
+#: ../clients/cli/connections.c:2165 ../clients/cli/connections.c:8461
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
-msgstr "æˆåŠŸæ¿€æ´»çš„è¿žæŽ¥ï¼ˆD-Bus 激活路径:%s)\n"
+msgstr "连接已æˆåŠŸæ¿€æ´»ï¼ˆD-Bus 活动路径:%s)\n"
 
-#: ../clients/cli/connections.c:1976
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:1977
+#, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "æˆåŠŸæ¿€æ´»çš„è¿žæŽ¥ï¼ˆD-Bus 激活路径:%s)\n"
+msgstr "连接已æˆåŠŸæ¿€æ´»ï¼ˆä¸»è¿žæŽ¥æ­£ç­‰å¾…ä»Žè¿žæŽ¥ï¼‰ï¼ˆD-Bus 活动路径:%s)\n"
 
-#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
+#: ../clients/cli/connections.c:1984 ../clients/cli/connections.c:1987
+#: ../clients/cli/connections.c:2009
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "错误:激活连接失败。"
 
-#: ../clients/cli/connections.c:2053
+#: ../clients/cli/connections.c:2060
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
-msgstr "æˆåŠŸæ¿€æ´»çš„ VPN 连接(D-Bus 激活路径:%s)\n"
+msgstr "VPN 连接æˆåŠŸæ¿€æ´»(D-Bus 活动路径:%s)\n"
 
-#: ../clients/cli/connections.c:2061
+#: ../clients/cli/connections.c:2068
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "错误:激活连接失败:%s。"
 
-#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
+#: ../clients/cli/connections.c:2087 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "错误:超时 %d 秒过期。"
 
-#: ../clients/cli/connections.c:2140
+#: ../clients/cli/connections.c:2147
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "错误:激活连接失败:%s"
 
-#: ../clients/cli/connections.c:2225
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2232
+#, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "错误:删除 '%s' 值失败:%s\n"
+msgstr "读å–带密ç çš„æ–‡ä»¶â€œ%sâ€å¤±è´¥ï¼š%s"
 
-#: ../clients/cli/connections.c:2237
+#: ../clients/cli/connections.c:2244
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
-msgstr ""
+msgstr "“password†æ¡ç›® “%s†缺少冒å·"
 
-#: ../clients/cli/connections.c:2245
+#: ../clients/cli/connections.c:2252
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
-msgstr ""
+msgstr "“password†æ¡ç›® “%s†缺少点"
 
-#: ../clients/cli/connections.c:2258
+#: ../clients/cli/connections.c:2265
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
-msgstr ""
+msgstr "在 “password†æ¡ç›® “%s†中设置å称无效"
 
-#: ../clients/cli/connections.c:2314
+#: ../clients/cli/connections.c:2321
 #, c-format
 msgid "unknown device '%s'."
-msgstr "未知设备 '%s'。"
+msgstr "未知设备“%sâ€"
 
-#: ../clients/cli/connections.c:2319
+#: ../clients/cli/connections.c:2326
 msgid "neither a valid connection nor device given"
-msgstr "给定无效连接或者设备"
+msgstr "没有给定有效连接或者设备"
 
-#: ../clients/cli/connections.c:2402
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2409
+#, c-format
 msgid "Error: Connection '%s' does not exist."
-msgstr "错误:连接无效:%s\n"
+msgstr "错误:连接“%sâ€ä¸å­˜åœ¨ã€‚"
 
-#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/connections.c:2444 ../clients/cli/devices.c:1325
 #: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
 #: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "æœªçŸ¥å‚æ•°ï¼š%s\n"
 
-#: ../clients/cli/connections.c:2462
+#: ../clients/cli/connections.c:2469
 msgid "preparing"
-msgstr "准备中"
+msgstr "正在准备"
 
-#: ../clients/cli/connections.c:2483
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2490
+#, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
-msgstr "æˆåŠŸæ·»åŠ çš„è¿žæŽ¥ '%s'(%s)。\n"
+msgstr "连接“%sâ€(%s) å·²æˆåŠŸåˆ é™¤ã€‚\n"
 
-#: ../clients/cli/connections.c:2499
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2506
+#, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
-msgstr "æˆåŠŸæ¿€æ´»çš„è¿žæŽ¥ï¼ˆD-Bus 激活路径:%s)\n"
+msgstr "连接“%sâ€å·²æˆåŠŸå–æ¶ˆæ¿€æ´»ï¼ˆD-Bus 活动路径:%s)\n"
 
-#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10391
-#: ../clients/cli/connections.c:10590
+#: ../clients/cli/connections.c:2577 ../clients/cli/connections.c:10398
+#: ../clients/cli/connections.c:10597
 #, c-format
 msgid "Error: No connection specified."
 msgstr "错误:未指定连接。"
 
-#: ../clients/cli/connections.c:2602
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2609
+#, c-format
 msgid "Error: '%s' is not an active connection.\n"
-msgstr "错误:'%s' 䏿˜¯æ´»è·ƒè¿žæŽ¥ã€‚"
+msgstr "错误:“%sâ€å¹¶éžæ´»è·ƒè¿žæŽ¥ã€‚\n"
 
-#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10420
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2610 ../clients/cli/connections.c:10427
+#, c-format
 msgid "Error: not all active connections found."
-msgstr "错误:'%s' 䏿˜¯æ´»è·ƒè¿žæŽ¥ã€‚"
+msgstr "错误:没有找到所有活跃连接。"
 
-#: ../clients/cli/connections.c:2612
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:2619
+#, c-format
 msgid "Error: no active connection provided."
-msgstr "错误:无法激活连接:%s。\n"
+msgstr "错误:未æä¾›æ´»è·ƒè¿žæŽ¥ã€‚"
 
-#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
+#: ../clients/cli/connections.c:2962 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
-msgstr "'%s' ä¸å† [%s] 中"
+msgstr "“%sâ€ä¸åœ¨ [%s] 之间"
 
-#: ../clients/cli/connections.c:3032
+#: ../clients/cli/connections.c:3039
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“%sâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ %s MAC 地å€"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1716
+#: ../clients/cli/connections.c:3040 ../clients/cli/connections.c:3572
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1729
 #: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
 msgid "InfiniBand"
-msgstr "InfiniBand"
+msgstr "InfiniBand 傿•°"
 
-#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../clients/cli/connections.c:3040 ../clients/tui/nm-editor-utils.c:146
 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
 msgid "Ethernet"
 msgstr "以太网"
 
-#: ../clients/cli/connections.c:3053
+#: ../clients/cli/connections.c:3060
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
-msgstr "错误:'mtu': '%s' 䏿˜¯æœ‰æ•ˆ MTU。"
+msgstr "错误:“mtuâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ MTU。"
 
-#: ../clients/cli/connections.c:3069
+#: ../clients/cli/connections.c:3076
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
-msgstr "错误:'parent': '%s' 䏿˜¯æœ‰æ•ˆæŽ¥å£å。"
+msgstr "错误:“parentâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æŽ¥å£å称。"
 
-#: ../clients/cli/connections.c:3090
+#: ../clients/cli/connections.c:3097
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
-msgstr "错误:'p-key': '%s' 䏿˜¯æœ‰æ•ˆ InfiniBand P_KEY。"
+msgstr "错误:“p-keyâ€ï¼šâ€œ%sâ€ ä¸æ˜¯æœ‰æ•ˆçš„ InfiniBand P_KEY。"
 
-#: ../clients/cli/connections.c:3105
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3112
+#, c-format
 msgid "Error: '%s' is not a valid UID/GID."
-msgstr "错误:'mtu': '%s' 䏿˜¯æœ‰æ•ˆ MTU。"
+msgstr "错误:“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ UID/GID。"
 
-#: ../clients/cli/connections.c:3149
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3156
+#, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
-msgstr "错误:'%s': '%s' 无效; %s"
+msgstr "错误:“%sâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ %s %s。"
 
-#: ../clients/cli/connections.c:3162
-#, fuzzy
+#: ../clients/cli/connections.c:3169
 msgid "Wi-Fi mode"
-msgstr "Wi-Fi"
+msgstr "Wi-Fi 模å¼"
 
-#: ../clients/cli/connections.c:3171
-#, fuzzy
+#: ../clients/cli/connections.c:3178
 msgid "InfiniBand transport mode"
-msgstr "传输模å¼"
+msgstr "InfiniBand 传输模å¼"
 
-#: ../clients/cli/connections.c:3183
+#: ../clients/cli/connections.c:3190
 msgid "ADSL protocol"
-msgstr ""
+msgstr "ADSL åè®®"
 
-#: ../clients/cli/connections.c:3194
-#, fuzzy
+#: ../clients/cli/connections.c:3201
 msgid "ADSL encapsulation"
-msgstr "DSL 认è¯"
+msgstr "ADSL å°è£…"
 
-#: ../clients/cli/connections.c:3203
-#, fuzzy
+#: ../clients/cli/connections.c:3210
 msgid "TUN device mode"
-msgstr "设备被删除"
+msgstr "TUN 设备模å¼"
 
-#: ../clients/cli/connections.c:3216
+#: ../clients/cli/connections.c:3223
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
-msgstr "错误:'flags': '%s' 无效;使用 <0-7>。"
+msgstr "错误:“flagâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„;使用 <0-7>。"
 
-#: ../clients/cli/connections.c:3238
+#: ../clients/cli/connections.c:3245
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
-msgstr "错误:'%s': '%s' 无效; %s"
+msgstr "错误:“%sâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„ï¼›%s"
 
-#: ../clients/cli/connections.c:3416
+#: ../clients/cli/connections.c:3423
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
+msgstr "警告:主连接=“%sâ€æ²¡æœ‰å¼•用任何已有的é…置文件。\n"
 
-#: ../clients/cli/connections.c:3441
+#: ../clients/cli/connections.c:3448
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
-msgstr "错误:'%s': '%s' 无效;使用 <%u-%u>。"
+msgstr "错误:“%sâ€ï¼šâ€œ%sâ€æ— æ•ˆï¼›ä½¿ç”¨ <%u-%u>。"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3497
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3504
+#, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
-msgstr[0] "'%s' 连接类型有一个å¯é€‰å‚数。\n"
+msgstr[0] "有 %d å¯é€‰å‚æ•°å¯ç”¨äºŽâ€œ%sâ€è¿žæŽ¥ç±»åž‹ã€‚\n"
 
-#: ../clients/cli/connections.c:3500
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3507
+#, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
-msgstr[0] "æ‚¨è¦æä¾›å®ƒå—?(yes/no)[yes]"
+msgstr[0] "您想æä¾›å®ƒä»¬å—?%s"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3517
+#: ../clients/cli/connections.c:3524
 msgid "ethernet"
-msgstr "以太网"
+msgstr "ä»¥å¤ªç½‘å‚æ•°"
 
-#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
-#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
+#: ../clients/cli/connections.c:3529 ../clients/cli/connections.c:3577
+#: ../clients/cli/connections.c:3711 ../clients/cli/connections.c:3790
 msgid "MTU [auto]: "
-msgstr "MTU [auto]: "
+msgstr "MTU [自动]:"
 
-#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
-#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
-#: ../clients/cli/connections.c:4101
+#: ../clients/cli/connections.c:3540 ../clients/cli/connections.c:3588
+#: ../clients/cli/connections.c:3683 ../clients/cli/connections.c:3722
+#: ../clients/cli/connections.c:4108
 msgid "MAC [none]: "
-msgstr "MAC [none]: "
+msgstr "MAC [无]:"
 
-#: ../clients/cli/connections.c:3544
+#: ../clients/cli/connections.c:3551
 msgid "Cloned MAC [none]: "
-msgstr "克隆的 MAC [none]: "
+msgstr "å¤åˆ¶çš„ MAC åœ°å€ [æ— ]:"
 
-#: ../clients/cli/connections.c:3592
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3599
+#, c-format
 msgid "Transport mode %s"
-msgstr "传输模å¼"
+msgstr "ä¼ è¾“æ¨¡å¼ %s"
 
-#: ../clients/cli/connections.c:3605
+#: ../clients/cli/connections.c:3612
 msgid "Parent interface [none]: "
-msgstr "ä¸Šçº§æŽ¥å£ [none]:"
+msgstr "ä¸Šçº§æŽ¥å£ [æ— ]:"
 
-#: ../clients/cli/connections.c:3616
+#: ../clients/cli/connections.c:3623
 msgid "P_KEY [none]: "
-msgstr "P_KEY [none]: "
+msgstr "P_KEY [无]:"
 
-#: ../clients/cli/connections.c:3626
+#: ../clients/cli/connections.c:3633
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
-msgstr "错误:指定 'parent' 时 'p-key' 是强制性的。\n"
+msgstr "错误:当指定 “parentâ€ è®¾å¤‡æ—¶ï¼Œéœ€è¦æœ‰ “p-keyâ€ã€‚\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../clients/cli/connections.c:3650 ../clients/tui/nm-editor-utils.c:154
 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
 msgid "Wi-Fi"
-msgstr "Wi-Fi"
+msgstr "Wi-Fi 傿•°"
 
-#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6199
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3658 ../clients/cli/connections.c:6206
+#, c-format
 msgid "Mode %s"
-msgstr "åž‹å·"
+msgstr "æ¨¡å¼ %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../clients/cli/connections.c:3678 ../libnm-glib/nm-device.c:1857
 #: ../libnm/nm-device.c:1808
 msgid "WiMAX"
-msgstr "WiMAX"
+msgstr "WiMAX 傿•°"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3694
+#: ../clients/cli/connections.c:3701
 msgid "PPPoE"
-msgstr ""
+msgstr "PPPoE 傿•°"
 
-#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
-#: ../clients/cli/connections.c:4223
+#: ../clients/cli/connections.c:3705 ../clients/cli/connections.c:3743
+#: ../clients/cli/connections.c:4230
 msgid "Password [none]: "
-msgstr "å¯†ç  [none]: "
+msgstr "å¯†ç  [æ— ]:"
 
-#: ../clients/cli/connections.c:3700
+#: ../clients/cli/connections.c:3707
 msgid "Service [none]: "
-msgstr "æœåŠ¡[æ— ]:"
+msgstr "æœåŠ¡ [æ— ]:"
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3730
-#, fuzzy
+#: ../clients/cli/connections.c:3737
 msgid "mobile broadband"
-msgstr "移动带宽"
+msgstr "ç§»åŠ¨å®½å¸¦å‚æ•°"
 
-#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
+#: ../clients/cli/connections.c:3741 ../clients/cli/connections.c:4180
 msgid "Username [none]: "
-msgstr "用户å [none]: "
+msgstr "用户å [æ— ]:"
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3749
-#, fuzzy
+#: ../clients/cli/connections.c:3756
 msgid "bluetooth"
-msgstr "è“牙"
+msgstr "è“ç‰™å‚æ•°"
 
-#: ../clients/cli/connections.c:3756
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3763
+#, c-format
 msgid "Bluetooth type %s"
-msgstr "è“牙"
+msgstr "è“牙类型 %s"
 
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:3769
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
-msgstr "错误:'bt-type': '%s' 䏿˜¯æœ‰æ•ˆè“牙类型。\n"
+msgstr "错误:“by-typeâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„è“牙类型。\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/cli/connections.c:3785 ../clients/cli/devices.c:239
 #: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
-#: ../libnm-core/nm-connection.c:1714 ../libnm-glib/nm-device.c:1869
+#: ../libnm-core/nm-connection.c:1727 ../libnm-glib/nm-device.c:1869
 #: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1820
 msgid "VLAN"
-msgstr "VLAN"
+msgstr "VLAN 傿•°"
 
-#: ../clients/cli/connections.c:3794
+#: ../clients/cli/connections.c:3801
 msgid "VLAN flags (<0-7>) [none]: "
-msgstr "VLAN 标签 (<0-7>) [none]: "
+msgstr "VLAN 标志 (<0-7>) [无]:"
 
-#: ../clients/cli/connections.c:3805
+#: ../clients/cli/connections.c:3812
 msgid "Ingress priority maps [none]: "
-msgstr "å…¥å£é¦–选项映射 [none]: "
+msgstr "å…¥å£ä¼˜å…ˆçº§æ˜ å°„ [æ— ]:"
 
-#: ../clients/cli/connections.c:3816
+#: ../clients/cli/connections.c:3823
 msgid "Egress priority maps [none]: "
-msgstr "出å£é¦–选项映射 [none]: "
+msgstr "出å£ä¼˜å…ˆçº§æ˜ å°„ [æ— ]:"
 
-#: ../clients/cli/connections.c:3827
+#: ../clients/cli/connections.c:3834
 msgid "Bonding mode [balance-rr]: "
-msgstr "ç»‘å®šæ¨¡å¼ [balance-rr]: "
+msgstr "ç»‘å®šæ¨¡å¼ [balance-rr]:"
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3843
+#: ../clients/cli/connections.c:3850
 msgid "bond"
-msgstr ""
+msgstr "ç»‘å®šå‚æ•°"
 
-#: ../clients/cli/connections.c:3865
+#: ../clients/cli/connections.c:3872
 msgid "Bonding primary interface [none]: "
-msgstr "ç»‘å®šçš„ä¸»æŽ¥å£ [none]: "
+msgstr "ç»‘å®šä¸»è¦æŽ¥å£ [æ— ]:"
 
-#: ../clients/cli/connections.c:3868
+#: ../clients/cli/connections.c:3875
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
-msgstr "错误:'primary': '%s' 䏿˜¯æœ‰æ•ˆæŽ¥å£å。\n"
+msgstr "错误:“primaryâ€ï¼šâ€œ%s†是无效的接å£å称。\n"
 
-#: ../clients/cli/connections.c:3876
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3883
+#, c-format
 msgid "Bonding monitoring mode %s"
-msgstr "链接监控"
+msgstr "ç»‘å®šç›‘æŽ§æ¨¡å¼ %s"
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3889
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr "错误:'%s' 䏿˜¯æœ‰æ•ˆç›‘控模å¼ï¼›ä½¿ç”¨ '%s' 或者 '%s'。\n"
+msgstr "错误:“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„监控模å¼ï¼›ä½¿ç”¨â€œ%sâ€æˆ–“%sâ€ã€‚\n"
 
-#: ../clients/cli/connections.c:3891
+# https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s3-modules-bonding-directives.html
+# 链接有下é¢å‡ ä¸ªæœ¯è¯­çš„定义,ä¸è¿‡åº”该ä¸ç”¨ç¿»è¯‘,作为å‚考。
+#: ../clients/cli/connections.c:3898
 msgid "Bonding miimon [100]: "
-msgstr "绑定 miimon [100]: "
+msgstr "绑定 miimon [100]:"
 
-#: ../clients/cli/connections.c:3894
+#: ../clients/cli/connections.c:3901
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
-msgstr "错误:'miimon': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%u>。\n"
+msgstr "错误:“miimonâ€ï¼šâ€œ%sâ€ ä¸æ˜¯æœ‰æ•ˆçš„æ•°å­— <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3902
+#: ../clients/cli/connections.c:3909
 msgid "Bonding downdelay [0]: "
-msgstr "æ†ç»‘çš„ downdelay [0]: "
+msgstr "绑定 downdelay [0]:"
 
-#: ../clients/cli/connections.c:3905
+#: ../clients/cli/connections.c:3912
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "错误:'downdelay': '%s' 䏿˜¯æœ‰æ•ˆæ•° <0-%u>。\n"
+msgstr "错误:“downdelayâ€ï¼šâ€œ%s†是无效数字 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3913
+#: ../clients/cli/connections.c:3920
 msgid "Bonding updelay [0]: "
-msgstr "æ†ç»‘çš„ updelay [0]: "
+msgstr "绑定 updelay [0]:"
 
-#: ../clients/cli/connections.c:3916
+#: ../clients/cli/connections.c:3923
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
-msgstr "错误:'updelay': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%u>。\n"
+msgstr "错误:“updelayâ€ï¼šâ€œ%s†是无效数字 <0-%u>。\n"
 
-#: ../clients/cli/connections.c:3925
+#: ../clients/cli/connections.c:3932
 msgid "Bonding arp-interval [0]: "
-msgstr "æ†ç»‘çš„ arp-interval [0]: "
+msgstr "绑定 arp-interval [0]:"
 
-#: ../clients/cli/connections.c:3928
+#: ../clients/cli/connections.c:3935
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
-msgstr "错误:'arp-interval': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%u>。\n"
+msgstr "错误:“arp-intervalâ€ï¼šâ€œ%sâ€ ä¸æ˜¯æœ‰æ•ˆæ•°å­— <0-%u>。\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3936
+#: ../clients/cli/connections.c:3943
 msgid "Bonding arp-ip-target [none]: "
-msgstr "绑定的 arp-ip-target [none]: "
+msgstr "绑定 arp-ip-target [none]:"
 
-#: ../clients/cli/connections.c:3943
+#: ../clients/cli/connections.c:3950
 msgid "LACP rate ('slow' or 'fast') [slow]: "
-msgstr ""
+msgstr "LACP 速率(“slowâ€æˆ–“fastâ€ï¼‰[slow]:"
 
-#: ../clients/cli/connections.c:3949
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:3956
+#, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
-msgstr "错误:'master': '%s' 䏿˜¯æœ‰æ•ˆ UUID 接å£ã€‚"
+msgstr "错误:“lacp_rateâ€ï¼šâ€œ%s†无效 (“slowâ€æˆ–“fastâ€)。\n"
 
-#: ../clients/cli/connections.c:3972
+#: ../clients/cli/connections.c:3979
 msgid "Team JSON configuration [none]: "
-msgstr "Team JSON é…ç½® [none]:"
+msgstr "群组 JSON é…ç½® [æ— ]: "
 
-#: ../clients/cli/connections.c:3989
+#: ../clients/cli/connections.c:3996
 msgid "team"
-msgstr "team"
+msgstr "组队"
 
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:4002
 msgid "team-slave"
-msgstr "team-slave"
+msgstr "组队-从"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4007
-#, fuzzy
+#: ../clients/cli/connections.c:4014
 msgid "bridge"
-msgstr "桥接"
+msgstr "æ¡¥æŽ¥å‚æ•°"
 
-#: ../clients/cli/connections.c:4013
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4020
+#, c-format
 msgid "Enable STP %s"
-msgstr "å¯ç”¨ STP (yes/no) [yes]: "
+msgstr "å¯ç”¨ STP %s"
 
-#: ../clients/cli/connections.c:4018
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4025
+#, c-format
 msgid "Error: 'stp': %s.\n"
-msgstr "错误:'stp': %s。"
+msgstr "错误:“stpâ€ï¼š%s。\n"
 
-#: ../clients/cli/connections.c:4026
-#, fuzzy
+#: ../clients/cli/connections.c:4033
 msgid "STP priority [32768]: "
-msgstr "STP 优先级 [128]: "
+msgstr "STP 优先级 [32768]:"
 
-#: ../clients/cli/connections.c:4030
+#: ../clients/cli/connections.c:4037
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
-msgstr "错误:'priority': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%d>。\n"
+msgstr "错误:“priorityâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <0-%d>。\n"
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4045
 msgid "Forward delay [15]: "
-msgstr "转å‘延迟 [15]: "
+msgstr "转å‘å»¶æ—¶ [15]:"
 
-#: ../clients/cli/connections.c:4042
+#: ../clients/cli/connections.c:4049
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
-msgstr "错误:'forward-delay': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <2-30>。\n"
+msgstr "错误:“forward-delayâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <2-30>。\n"
 
-#: ../clients/cli/connections.c:4051
+#: ../clients/cli/connections.c:4058
 msgid "Hello time [2]: "
-msgstr "ç¥è´ºæ—¶é—´ [2]: "
+msgstr "问候时间 [2]:"
 
-#: ../clients/cli/connections.c:4055
+#: ../clients/cli/connections.c:4062
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
-msgstr "错误:'hello-time': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <1-10>。\n"
+msgstr "错误:“hello-timeâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <1-10>。\n"
 
-#: ../clients/cli/connections.c:4063
+#: ../clients/cli/connections.c:4070
 msgid "Max age [20]: "
-msgstr "最大值 [20]: "
+msgstr "最大寿命 [20]:"
 
-#: ../clients/cli/connections.c:4067
+#: ../clients/cli/connections.c:4074
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
-msgstr "错误:'max-age': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <6-40>。\n"
+msgstr "错误:“max-ageâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <6-40>。\n"
 
-#: ../clients/cli/connections.c:4075
+#: ../clients/cli/connections.c:4082
 msgid "MAC address ageing time [300]: "
-msgstr "MAC 地å€è¿‡æœŸæ—¶é—´ [300]: "
+msgstr "MAC 地å€è€åŒ–æ—¶é—´ [300]:"
 
-#: ../clients/cli/connections.c:4079
+#: ../clients/cli/connections.c:4086
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
-msgstr "错误:'ageing-time': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-1000000>。\n"
+msgstr "错误:“ageing-tiemâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <0-1000000>。\n"
 
-#: ../clients/cli/connections.c:4088
+#: ../clients/cli/connections.c:4095
 #, c-format
 msgid "Enable IGMP snooping %s"
-msgstr ""
+msgstr "å¯ç”¨ IGMP ç›‘å¬ %s"
 
-#: ../clients/cli/connections.c:4093
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4100
+#, c-format
 msgid "Error: 'multicast-snooping': %s.\n"
-msgstr "错误:'stp': %s。"
+msgstr "错误:“multicast-snoopingâ€ï¼š%s。\n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4120
-#, fuzzy
+#: ../clients/cli/connections.c:4127
 msgid "bridge-slave"
-msgstr "team-slave"
+msgstr "桥接-ä»Žå‚æ•°"
 
-#: ../clients/cli/connections.c:4125
+#: ../clients/cli/connections.c:4132
 msgid "Bridge port priority [32]: "
-msgstr "桥接端å£ä¼˜å…ˆçº§ [32]: "
+msgstr "桥接端å£ä¼˜å…ˆçº§ [32]:"
 
-#: ../clients/cli/connections.c:4138
+#: ../clients/cli/connections.c:4145
 msgid "Bridge port STP path cost [100]: "
-msgstr "æ¡¥æŽ¥ç«¯å£ STP è·¯å¾„æˆæœ¬ [100]: "
+msgstr "æ¡¥æŽ¥ç«¯å£ STP 路径开销 [100]:"
 
-#: ../clients/cli/connections.c:4152
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4159
+#, c-format
 msgid "Hairpin %s"
-msgstr "Hairpin 模å¼"
+msgstr "åå¼¹è½¬å‘ %s"
 
-#: ../clients/cli/connections.c:4157
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4164
+#, c-format
 msgid "Error: 'hairpin': %s.\n"
-msgstr "错误:'hairpin': %s。"
+msgstr "错误:“hairpinâ€ï¼š%s。\n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../clients/cli/connections.c:4191 ../libnm-glib/nm-device.c:1855
 #: ../libnm/nm-device.c:1806
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../clients/cli/connections.c:4189
+#: ../clients/cli/connections.c:4196
 msgid "OLPC Mesh channel [1]: "
-msgstr "OLPC Mesh é¢‘é“ [1]: "
+msgstr "OLPC Mesh é¢‘é“ [1]:"
 
-#: ../clients/cli/connections.c:4192
+#: ../clients/cli/connections.c:4199
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
-msgstr "错误:'channel': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <1-13>。\n"
+msgstr "错误:“channelâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <1-13>。\n"
 
-#: ../clients/cli/connections.c:4200
+#: ../clients/cli/connections.c:4207
 msgid "DHCP anycast MAC address [none]: "
-msgstr "DHCP 选播 MAC åœ°å€ [none]:"
+msgstr "DHCP ä»»æ„广播 MAC åœ°å€ [æ— ]:"
 
 #. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../clients/cli/connections.c:4226 ../libnm-glib/nm-device.c:1871
 #: ../libnm/nm-device.c:1822
 msgid "ADSL"
-msgstr "ADSL"
+msgstr "ADSL 傿•°"
 
-#: ../clients/cli/connections.c:4227
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4234
+#, c-format
 msgid "ADSL encapsulation %s"
-msgstr "ADSL 连接 %d"
+msgstr "ADSL å°è£… %s"
 
-#. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4245
-msgid "macvlan"
-msgstr ""
-
-#: ../clients/cli/connections.c:4251
+#: ../clients/cli/connections.c:4263
 #, c-format
-msgid "Tap %s"
-msgstr ""
-
-#: ../clients/cli/connections.c:4256
-#, fuzzy, c-format
 msgid "Error: 'tap': %s.\n"
-msgstr "错误:'stp': %s。"
+msgstr "错误:“tapâ€ï¼š%s。\n"
 
 #. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../clients/cli/connections.c:4279 ../libnm-glib/nm-device.c:1875
 #: ../libnm/nm-device.c:1826
 msgid "VXLAN"
-msgstr ""
+msgstr "VXLAN 傿•°"
 
-#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
-#, fuzzy
+#: ../clients/cli/connections.c:4284 ../clients/cli/connections.c:4608
 msgid "Parent device [none]: "
-msgstr "ä¸Šçº§æŽ¥å£ [none]:"
+msgstr "上级设备 [无]:"
 
-#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4289 ../clients/cli/connections.c:4613
+#, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
-msgstr "错误:'dev': '%s' 䏿˜¯ UUIDã€æŽ¥å£å或者 MAC。"
+msgstr "错误:“devâ€ï¼šâ€œ%sâ€ä¸æ˜¯ UUID 或接å£å称。\n"
 
-#: ../clients/cli/connections.c:4291
-#, fuzzy
+#: ../clients/cli/connections.c:4298
 msgid "Local address [none]: "
-msgstr "DHCP 选播 MAC åœ°å€ [none]:"
+msgstr "æœ¬åœ°åœ°å€ [æ— ]:"
 
-#: ../clients/cli/connections.c:4296
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4303
+#, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“localâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IP 地å€ã€‚\n"
 
-#: ../clients/cli/connections.c:4305
+#: ../clients/cli/connections.c:4312
 msgid "Minimum source port [0]: "
-msgstr ""
+msgstr "æœ€å°æ¥æºç«¯å£ [0]:"
 
-#: ../clients/cli/connections.c:4309
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4316
+#, c-format
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
-msgstr "错误:'priority': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%d>。\n"
+msgstr "错误:“source-port-minâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <0-65535>。\n"
 
-#: ../clients/cli/connections.c:4318
+#: ../clients/cli/connections.c:4325
 msgid "Maximum source port [0]: "
-msgstr ""
+msgstr "æœ€å¤§æ¥æºç«¯å£ [0]:"
 
-#: ../clients/cli/connections.c:4322
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4329
+#, c-format
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
-msgstr "错误:'priority': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%d>。\n"
+msgstr "错误:“source-port-maxâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <0-65535>。\n"
 
-#: ../clients/cli/connections.c:4331
-#, fuzzy
+#: ../clients/cli/connections.c:4338
 msgid "Destination port [8472]: "
-msgstr "目标ä½ç½®"
+msgstr "ç›®æ ‡ç«¯å£ [8472]:"
 
-#: ../clients/cli/connections.c:4335
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4342
+#, c-format
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
-msgstr "错误:'miimon': '%s' 䏿˜¯æœ‰æ•ˆæ•°å­— <0-%u>。\n"
+msgstr "错误:“destination-portâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <0-65535>。\n"
 
-#: ../clients/cli/connections.c:4374
-#, fuzzy
+#: ../clients/cli/connections.c:4381
 msgid "IPv4 address (IP[/plen]) [none]: "
-msgstr "IPv4 åœ°å€ (IP[/plen] [gateway]) [none]: "
+msgstr "IPv4 åœ°å€ (IP[/plen]) [æ— ]:"
 
-#: ../clients/cli/connections.c:4376
-#, fuzzy
+#: ../clients/cli/connections.c:4383
 msgid "IPv6 address (IP[/plen]) [none]: "
-msgstr "IPv6 åœ°å€ (IP[/plen] [gateway]) [none]: "
+msgstr "IPv6 åœ°å€ (IP[/plen]) [æ— ]:"
 
-#: ../clients/cli/connections.c:4390
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4397
+#, c-format
 msgid "  Address successfully added: %s\n"
-msgstr "  æˆåŠŸæ·»åŠ åœ°å€ï¼š%s %s\n"
+msgstr "  地å€å·²æˆåŠŸæ·»åŠ ï¼š%s\n"
 
-#: ../clients/cli/connections.c:4392
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4399
+#, c-format
 msgid "  Warning: address already present: %s\n"
-msgstr "  警告:地å€å·²å‡ºçŽ°ï¼š%s %s\n"
+msgstr "  警告:地å€å·²ç»å­˜åœ¨ï¼š%s\n"
 
-#: ../clients/cli/connections.c:4394
+#: ../clients/cli/connections.c:4401
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
-msgstr "  警告:忽略结尾处的无用信æ¯ï¼š'%s'\n"
+msgstr "  警告:忽略结尾处的垃圾: “%sâ€\n"
 
-#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5605
-#: ../clients/cli/connections.c:5652 ../clients/cli/connections.c:6569
-#: ../clients/cli/connections.c:6602
+#: ../clients/cli/connections.c:4403 ../clients/cli/connections.c:5612
+#: ../clients/cli/connections.c:5659 ../clients/cli/connections.c:6576
+#: ../clients/cli/connections.c:6609
 msgid "Error: "
 msgstr "错误:"
 
-#: ../clients/cli/connections.c:4416
-#, fuzzy
+#: ../clients/cli/connections.c:4423
 msgid "IPv4 gateway [none]: "
-msgstr "IPv4 åœ°å€ (IP[/plen] [gateway]) [none]: "
+msgstr "IPv4 网关 [无]:"
 
-#: ../clients/cli/connections.c:4419
-#, fuzzy
+#: ../clients/cli/connections.c:4426
 msgid "IPv6 gateway [none]: "
-msgstr "IPv6 åœ°å€ (IP[/plen] [gateway]) [none]: "
+msgstr "IPv6 网关 [无]:"
 
-#: ../clients/cli/connections.c:4439
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4446
+#, c-format
 msgid "Error: invalid gateway address '%s'\n"
-msgstr "错误:无效é¢å¤–傿•°E '%s'。"
+msgstr "错误:无效的网关地å€â€œ%sâ€\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:4452
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4459
+#, c-format
 msgid "Do you want to add IP addresses? %s"
-msgstr "æ‚¨è¦æ·»åŠ  IP 地å€å—?(yes/no)[yes]"
+msgstr "您想添加 IP 地å€å—?%s"
 
-#: ../clients/cli/connections.c:4460
+#: ../clients/cli/connections.c:4467
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
-msgstr "按 <Enter> å®Œæˆæ·»åŠ åœ°å€ã€‚\n"
+msgstr "按 <回车键> 以完æˆåœ°å€æ·»åŠ ã€‚\n"
 
 #. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../clients/cli/connections.c:4511 ../libnm-glib/nm-device.c:1879
 #: ../libnm/nm-device.c:1830
 msgid "Tun"
-msgstr ""
+msgstr "Tun 傿•°"
 
-#: ../clients/cli/connections.c:4509
-#, fuzzy
+#: ../clients/cli/connections.c:4516
 msgid "User ID [none]: "
-msgstr "用户å [none]: "
+msgstr "用户 ID [无]:"
 
-#: ../clients/cli/connections.c:4522
-#, fuzzy
-msgid "Group ID [none]: "
-msgstr "MAC [none]: "
-
-#: ../clients/cli/connections.c:4536
+#: ../clients/cli/connections.c:4543
 #, c-format
 msgid "Enable PI %s"
-msgstr ""
+msgstr "å¯ç”¨ PI %s"
 
-#: ../clients/cli/connections.c:4541
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4548
+#, c-format
 msgid "Error: 'pi': %s.\n"
-msgstr "错误:'stp': %s。"
+msgstr "错误:“piâ€ï¼š%s。\n"
 
-#: ../clients/cli/connections.c:4549
+#: ../clients/cli/connections.c:4556
 #, c-format
 msgid "Enable VNET header %s"
-msgstr ""
+msgstr "å¯ç”¨ VNET 首部 %s"
 
-#: ../clients/cli/connections.c:4554
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4561
+#, c-format
 msgid "Error: 'vnet-hdr': %s.\n"
-msgstr "错误:'vpn-type': %s。"
+msgstr "错误:“vnet-hdrâ€ï¼š%s。\n"
 
-#: ../clients/cli/connections.c:4562
+#: ../clients/cli/connections.c:4569
 #, c-format
 msgid "Enable multi queue %s"
-msgstr ""
+msgstr "å¯ç”¨å¤šé˜Ÿåˆ— %s"
 
-#: ../clients/cli/connections.c:4567
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4574
+#, c-format
 msgid "Error: 'multi-queue': %s.\n"
-msgstr "错误:'mode': %s。"
+msgstr "错误:“multi-queueâ€ï¼š%s。\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4581
+#: ../clients/cli/connections.c:4588
 msgid "IP Tunnel"
-msgstr ""
+msgstr "IP éš§é“傿•°"
 
-#: ../clients/cli/connections.c:4586
-#, fuzzy
+#: ../clients/cli/connections.c:4593
 msgid "Local endpoint [none]: "
-msgstr "ä¸Šçº§æŽ¥å£ [none]:"
+msgstr "本地端点 (endpoint) [无]:"
 
-#: ../clients/cli/connections.c:4592
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4599
+#, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“localâ€ï¼šâ€œ%sâ€æ— æ•ˆï¼›å¿…须是 IP 地å€\n"
 
-#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184
+#: ../clients/cli/connections.c:4665 ../clients/cli/connections.c:10191
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
-msgstr "错误:<setting>。缺少 <property> 傿•°ã€‚"
+msgstr "错误:缺少 <设置>.<属性> 傿•°ã€‚"
 
-#: ../clients/cli/connections.c:4663
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4670
+#, c-format
 msgid "Error: value for '%s' is missing."
-msgstr "错误:缺少 '%s' 选项字段。"
+msgstr "错误:缺少用于“%sâ€çš„值。"
 
-#: ../clients/cli/connections.c:4681
+#: ../clients/cli/connections.c:4688
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
-msgstr "错误:无效 <setting>。<property> '%s'。"
+msgstr "错误:无效的 <设置>.<属性> “%sâ€ã€‚"
 
-#: ../clients/cli/connections.c:4689
+#: ../clients/cli/connections.c:4696
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
-msgstr "错误:无效或者ä¸å…许的设置 '%s': %s。"
+msgstr "错误:无效或ä¸å…许的设置“%sâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:4700
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4707
+#, c-format
 msgid "Error: don't know how to create '%s' setting."
-msgstr "错误:无法获得系统设置。"
+msgstr "错误:ä¸çŸ¥é“如何创建“%sâ€è®¾ç½®ã€‚"
 
-#: ../clients/cli/connections.c:4710
+#: ../clients/cli/connections.c:4717
 #, c-format
 msgid "Error: invalid property '%s': %s."
-msgstr "错误:无效属性 '%s': %s。"
+msgstr "错误:无效的属性“%sâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:4722
+#: ../clients/cli/connections.c:4729
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
-msgstr "错误:修改 %s 失败。%s: %s。"
+msgstr "错误:修改 %s.%s 失败:%s。"
 
-#: ../clients/cli/connections.c:4741
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:4748
+#, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
-msgstr "错误:删除 '%s' 值失败:%s\n"
+msgstr "错误:移除æ¥è‡ª %s.%s 的值失败:%s。"
 
-#: ../clients/cli/connections.c:4775
+#: ../clients/cli/connections.c:4782
 #, c-format
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
-msgstr ""
+msgstr "警告:“typeâ€å·²è¢«å¿½ç•¥ã€‚使用“nmcli connection add \"%s\" â€¦â€æ¥ä»£æ›¿ã€‚"
 
-#: ../clients/cli/connections.c:4783
-#, fuzzy
+#: ../clients/cli/connections.c:4790
 msgid "Error: redundant 'master' option."
-msgstr "错误:'%s' é€‰é¡¹ç¼ºå°‘å‚æ•°ã€‚"
+msgstr "错误:冗余的“masterâ€é€‰é¡¹ã€‚"
 
-#: ../clients/cli/connections.c:4796
+#: ../clients/cli/connections.c:4803
 msgid "Error: 'master' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'master'。"
+msgstr "错误:需è¦â€œmasterâ€ã€‚"
 
-#: ../clients/cli/connections.c:4950
+#: ../clients/cli/connections.c:4957
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
-msgstr "错误:'parent': 无 'p-key' 则无效。"
+msgstr "错误:“parentâ€ï¼šæ²¡æœ‰å¸¦â€œp-keyâ€ä¸ä¸ºæœ‰æ•ˆã€‚"
 
-#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:5012 ../clients/cli/connections.c:5974
 msgid "SSID: "
-msgstr "SSID: "
+msgstr "SSID:"
 
-#: ../clients/cli/connections.c:5008 ../clients/cli/connections.c:5970
+#: ../clients/cli/connections.c:5015 ../clients/cli/connections.c:5977
 msgid "Error: 'ssid' is required."
-msgstr "错误:ä¸éœ€è¦ 'ssid'。"
+msgstr "错误:需è¦â€œssidâ€ã€‚"
 
-#: ../clients/cli/connections.c:5072
+#: ../clients/cli/connections.c:5079
 msgid "WiMAX NSP name: "
 msgstr "WiMAX NSP å称:"
 
-#: ../clients/cli/connections.c:5075
+#: ../clients/cli/connections.c:5082
 msgid "Error: 'nsp' is required."
-msgstr "错误:ä¸éœ€è¦ 'nsp'。"
+msgstr "错误:需è¦â€œnspâ€ã€‚"
 
-#: ../clients/cli/connections.c:5127
+#: ../clients/cli/connections.c:5134
 msgid "PPPoE username: "
 msgstr "PPPoE 用户å:"
 
-#: ../clients/cli/connections.c:5130 ../clients/cli/connections.c:6037
+#: ../clients/cli/connections.c:5137 ../clients/cli/connections.c:6044
 msgid "Error: 'username' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'username'。"
+msgstr "错误:需è¦â€œusernameâ€ã€‚"
 
-#: ../clients/cli/connections.c:5199
+#: ../clients/cli/connections.c:5206
 msgid "APN: "
-msgstr "APN: "
+msgstr "APN:"
 
-#: ../clients/cli/connections.c:5202
+#: ../clients/cli/connections.c:5209
 msgid "Error: 'apn' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'apn'。"
+msgstr "错误:需è¦â€œapnâ€ã€‚"
 
-#: ../clients/cli/connections.c:5260
+#: ../clients/cli/connections.c:5267
 msgid "Bluetooth device address: "
 msgstr "è“牙设备地å€ï¼š"
 
-#: ../clients/cli/connections.c:5263
+#: ../clients/cli/connections.c:5270
 msgid "Error: 'addr' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'addr'。"
+msgstr "错误:需è¦â€œaddrâ€ã€‚"
 
-#: ../clients/cli/connections.c:5304
+#: ../clients/cli/connections.c:5311
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
-msgstr "错误:'bt-type': '%s' 无效;使用 [%s, %s (%s), %s]。"
+msgstr "错误:“bt-typeâ€ï¼šâ€œ%sâ€æ— æ•ˆï¼›ä½¿ç”¨ [%s, %s (%s), %s]。"
 
-#: ../clients/cli/connections.c:5348
+#: ../clients/cli/connections.c:5355
 msgid "VLAN parent device or connection UUID: "
-msgstr "VLAN 上级设备或者连接 UUID:"
+msgstr "VLAN 上级设备或连接 UUID:"
 
-#: ../clients/cli/connections.c:5351 ../clients/cli/connections.c:6108
+#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6115
 msgid "Error: 'dev' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'dev'。"
+msgstr "错误:需è¦â€œdevâ€ã€‚"
 
-#: ../clients/cli/connections.c:5355
-#, fuzzy
+#: ../clients/cli/connections.c:5362
 msgid "VLAN ID <0-4094>: "
-msgstr "VLAN ID <0-4095>: "
+msgstr "VLAN ID <0-4095>:"
 
-#: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424
+#: ../clients/cli/connections.c:5365 ../clients/cli/connections.c:6431
 msgid "Error: 'id' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'id'。"
+msgstr "错误:需è¦â€œidâ€ã€‚"
 
-#: ../clients/cli/connections.c:5364
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:5371
+#, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4094>."
-msgstr "错误:'id': '%s' 无效;使用 <0-4095>。"
+msgstr "错误:“idâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„;使用 <0-4094>。"
 
-#: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116
+#: ../clients/cli/connections.c:5381 ../clients/cli/connections.c:6123
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
-msgstr "错误:'dev': '%s' 䏿˜¯ UUIDã€æŽ¥å£å或者 MAC。"
+msgstr "错误:“devâ€ï¼šâ€œ%sâ€ä¸æ˜¯ UUID 或接å£åç§°ï¼Œä¹Ÿä¸æ˜¯ MAC。"
 
-#: ../clients/cli/connections.c:5506
+#: ../clients/cli/connections.c:5513
 #, c-format
 msgid "Error: 'mode': %s."
-msgstr "错误:'mode': %s。"
+msgstr "错误:“modeâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:5515
+#: ../clients/cli/connections.c:5522
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
-msgstr "错误:'primary': '%s' 䏿˜¯æœ‰æ•ˆæŽ¥å£å。"
+msgstr "错误:“primaryâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æŽ¥å£å称。"
 
-#: ../clients/cli/connections.c:5738
+#: ../clients/cli/connections.c:5745
 #, c-format
 msgid "Error: 'stp': %s."
-msgstr "错误:'stp': %s。"
+msgstr "错误:“stpâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:5747
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:5754
+#, c-format
 msgid "Error: 'multicast-snooping': %s."
-msgstr "错误:'stp': %s。"
+msgstr "错误:“multicast-snoopingâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:5866
+#: ../clients/cli/connections.c:5873
 #, c-format
 msgid "Error: 'hairpin': %s."
-msgstr "错误:'hairpin': %s。"
+msgstr "错误:“hairpinâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:5915
+#: ../clients/cli/connections.c:5922
 msgid "Error: 'vpn-type' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'vpn-type'。"
+msgstr "错误:需è¦â€œvpn-typeâ€ã€‚"
 
-#: ../clients/cli/connections.c:5922
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:5929
+#, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
-msgstr "错误:'vpn-type': %s。"
+msgstr "警告:“vpn-typeâ€ï¼š%s ä¸çŸ¥é“。\n"
 
-#: ../clients/cli/connections.c:5983
+#: ../clients/cli/connections.c:5990
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
-msgstr "错误:'channel': '%s' 无效;使用 <1-13>。"
+msgstr "错误:“channelâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„;使用 <1-13>。"
 
-#: ../clients/cli/connections.c:6034
-#, fuzzy
+#: ../clients/cli/connections.c:6041
 msgid "Username: "
-msgstr "用户å"
+msgstr "用户å:"
 
-#: ../clients/cli/connections.c:6043
+#: ../clients/cli/connections.c:6050
 #, c-format
 msgid "Protocol %s"
-msgstr ""
+msgstr "åè®® %s"
 
-#: ../clients/cli/connections.c:6046
-#, fuzzy
+#: ../clients/cli/connections.c:6053
 msgid "Error: 'protocol' is required."
-msgstr "错误:ä¸éœ€è¦ 'nsp'。"
+msgstr "错误:需è¦â€œprotocolâ€ã€‚"
 
-#: ../clients/cli/connections.c:6105
-#, fuzzy
+#: ../clients/cli/connections.c:6112
 msgid "MACVLAN parent device or connection UUID: "
-msgstr "VLAN 上级设备或者连接 UUID:"
+msgstr "MACVLAN 上级设备或连接 UUID:"
 
-#: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205
-#: ../clients/cli/connections.c:6307
-#, fuzzy
+#: ../clients/cli/connections.c:6132 ../clients/cli/connections.c:6212
+#: ../clients/cli/connections.c:6314
 msgid "Error: 'mode' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'dev'。"
+msgstr "错误:需è¦â€œmodeâ€ã€‚"
 
-#: ../clients/cli/connections.c:6131
-#, fuzzy
+#: ../clients/cli/connections.c:6138
 msgid "Error: 'mode' is not valid."
-msgstr "错误:'dev' 命令 '%s' 无效。"
+msgstr "错误:“modeâ€æ˜¯æ— æ•ˆçš„。"
 
-#: ../clients/cli/connections.c:6144
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6151
+#, c-format
 msgid "Error: 'tap': %s."
-msgstr "错误:'stp': %s。"
+msgstr "错误:“tapâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:6230
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6237
+#, c-format
 msgid "Error: 'pi': %s."
-msgstr "错误:'stp': %s。"
+msgstr "错误:“piâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:6241
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6248
+#, c-format
 msgid "Error: 'vnet-hdr': %s."
-msgstr "错误:'vpn-type': %s。"
+msgstr "错误:“vnet-hdrâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:6252
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6259
+#, c-format
 msgid "Error: 'multi-queue': %s."
-msgstr "错误:'mode': %s。"
+msgstr "错误:“multi-queueâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:6321
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6328
+#, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
-msgstr "错误:'%s': '%s' 无效; %s"
+msgstr "错误:“modeâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„,使用 %s 中的一个"
 
-#: ../clients/cli/connections.c:6327
+#: ../clients/cli/connections.c:6334
 msgid "Remote endpoint: "
-msgstr ""
+msgstr "远程端点 (endpoint):"
 
-#: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432
-#, fuzzy
+#: ../clients/cli/connections.c:6337 ../clients/cli/connections.c:6439
 msgid "Error: 'remote' is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'master'。"
+msgstr "错误:需è¦â€œremoteâ€ã€‚"
 
-#: ../clients/cli/connections.c:6337
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6344
+#, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“remoteâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„;必须为 IP 地å€"
 
-#: ../clients/cli/connections.c:6351
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6358
+#, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“localâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„;必须为 IP 地å€"
 
-#: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6367 ../clients/cli/connections.c:6462
+#, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
-msgstr "错误:'dev': '%s' 䏿˜¯ UUIDã€æŽ¥å£å或者 MAC。"
+msgstr "错误:“devâ€ï¼šâ€œ%sâ€ä¸æ˜¯ UUID 或接å£å称。"
 
-#: ../clients/cli/connections.c:6421
-#, fuzzy
+#: ../clients/cli/connections.c:6428
 msgid "VXLAN ID: "
-msgstr "VLAN ID <0-4095>: "
+msgstr "VXLAN ID:"
 
-#: ../clients/cli/connections.c:6429
-#, fuzzy
+#: ../clients/cli/connections.c:6436
 msgid "Remote: "
-msgstr "移除"
+msgstr "远程:"
 
-#: ../clients/cli/connections.c:6438
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6445
+#, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
-msgstr "错误:'id': '%s' 无效;使用 <0-4095>。"
+msgstr "错误:“idâ€ï¼šâ€œ%s†是无效的;使用 <0-16777215>。"
 
-#: ../clients/cli/connections.c:6464
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6471
+#, c-format
 msgid "Error: 'remote': '%s' is not a valid IP address"
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“remoteâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IP 地å€"
 
-#: ../clients/cli/connections.c:6473
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6480
+#, c-format
 msgid "Error: 'local': '%s' is not a valid IP address"
-msgstr "错误:'%s': '%s' 䏿˜¯æœ‰æ•ˆ %s MAC 地å€ã€‚"
+msgstr "错误:“localâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IP 地å€"
 
-#: ../clients/cli/connections.c:6482
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6489
+#, c-format
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
-msgstr "错误:'id': '%s' 无效;使用 <0-4095>。"
+msgstr "错误:“source-port-minâ€ï¼š%s 是无效的;使用 <0-65535>。"
 
-#: ../clients/cli/connections.c:6491
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6498
+#, c-format
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
-msgstr "错误:'flags': '%s' 无效;使用 <0-7>。"
+msgstr "错误:“source-port-maxâ€ï¼š%s 是无效的;使用 <0-65535>。"
 
-#: ../clients/cli/connections.c:6500
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6507
+#, c-format
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
-msgstr "错误:'id': '%s' 无效;使用 <0-4095>。"
+msgstr "错误:“destination-portâ€ï¼š%s 是无效的;使用 <0-65535>。"
 
-#: ../clients/cli/connections.c:6540
+#: ../clients/cli/connections.c:6547
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
-msgstr "错误: '%s' 为无效连接类型。"
+msgstr "错误:“%sâ€æ˜¯æ— æ•ˆçš„连接类型。"
 
-#: ../clients/cli/connections.c:6581
+#: ../clients/cli/connections.c:6588
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
-msgstr ""
+msgstr "错误:IPv4 网关已指定ä¸éœ€è¦ IPv4 地å€"
 
-#: ../clients/cli/connections.c:6585
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6592
+#, c-format
 msgid "Error: multiple IPv4 gateways specified"
-msgstr "错误:未指定接å£ã€‚"
+msgstr "错误:指定了多个 IPv4 网关"
 
-#: ../clients/cli/connections.c:6589
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6596
+#, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
-msgstr "无效网关 '%s'"
+msgstr "错误:无效的 IPv4 网关“%sâ€"
 
-#: ../clients/cli/connections.c:6614
+#: ../clients/cli/connections.c:6621
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
-msgstr ""
+msgstr "错误:IPv6 网关已指定ä¸éœ€è¦ IPv6 地å€"
 
-#: ../clients/cli/connections.c:6618
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6625
+#, c-format
 msgid "Error: multiple IPv6 gateways specified"
-msgstr "错误:未指定接å£ã€‚"
+msgstr "错误:指定了多个 IPv6 网关"
 
-#: ../clients/cli/connections.c:6622
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6629
+#, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
-msgstr "无效网关 '%s'"
+msgstr "错误:无效的 IPv6 网关“%sâ€"
 
-#: ../clients/cli/connections.c:6670 ../clients/cli/connections.c:10223
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6677 ../clients/cli/connections.c:10230
+#, c-format
 msgid "Error: Failed to add '%s' connection: %s"
-msgstr "错误:添加 '%s' 连接失败:(%d)%s"
+msgstr "错误:添加“%sâ€è¿žæŽ¥å¤±è´¥ï¼š%s"
 
-#: ../clients/cli/connections.c:6675
+#: ../clients/cli/connections.c:6682
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
-msgstr "æˆåŠŸæ·»åŠ çš„è¿žæŽ¥ '%s'(%s)。\n"
+msgstr "连接“%sâ€(%s) å·²æˆåŠŸæ·»åŠ ã€‚\n"
 
-#: ../clients/cli/connections.c:6951 ../clients/cli/connections.c:10678
+#: ../clients/cli/connections.c:6958 ../clients/cli/connections.c:10685
 #, c-format
 msgid "Error: 'type' argument is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'type' 傿•°ã€‚"
+msgstr "错误:需è¦â€œtypeâ€å‚数。"
 
-#: ../clients/cli/connections.c:6959
+#: ../clients/cli/connections.c:6966
 #, c-format
 msgid "Error: invalid connection type; %s."
-msgstr "错误:无效的连接类型;%s"
+msgstr "错误:无效的连接类型;%s。"
 
-#: ../clients/cli/connections.c:6968 ../clients/cli/devices.c:2164
+#: ../clients/cli/connections.c:6975 ../clients/cli/devices.c:2164
 #, c-format
 msgid "Error: 'autoconnect': %s."
-msgstr "错误:'autoconnect': %s。"
+msgstr "错误:“autoconnectâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:6978
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:6985
+#, c-format
 msgid "Error: 'save': %s."
-msgstr "错误:'stp': %s。"
+msgstr "错误:“saveâ€ï¼š%s。"
 
-#: ../clients/cli/connections.c:6995
+#: ../clients/cli/connections.c:7002
 msgid "Interface name [*]: "
-msgstr "接å£å [*]: "
+msgstr "接å£åç§° [*]:"
 
-#: ../clients/cli/connections.c:7000
+#: ../clients/cli/connections.c:7007
 #, c-format
 msgid "Error: 'ifname' argument is required."
-msgstr "错误:需è¦'ifname' 傿•°ã€‚"
+msgstr "错误:需è¦â€œifnameâ€å‚数。"
 
-#: ../clients/cli/connections.c:7002
-#, c-format
-msgid "Error: mandatory 'ifname' not seen before '%s'."
-msgstr ""
-
-#: ../clients/cli/connections.c:7011
+#: ../clients/cli/connections.c:7018
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
-msgstr "错误:'ifname': '%s' 䏿˜¯æœ‰æ•ˆæŽ¥å£å。"
+msgstr "错误:“ifnameâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æŽ¥å£å称或“*â€ã€‚"
 
-#: ../clients/cli/connections.c:8035
+#: ../clients/cli/connections.c:8042
 #, c-format
 msgid "['%s' setting values]\n"
-msgstr "['%s' setting values]\n"
+msgstr "[“%sâ€è®¾ç½®å€¼]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8117
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8124
+#, c-format
 msgid ""
 "---[ Main menu ]---\n"
 "goto     [<setting> | <prop>]        :: go to a setting or property\n"
@@ -2750,22 +2798,21 @@ msgid ""
 "nmcli    <conf-option> <value>       :: nmcli configuration\n"
 "quit                                 :: exit nmcli\n"
 msgstr ""
-"---[ Main menu ]---\n"
-"goto     [<setting> | <prop>]        :: go to a setting or property\n"
-"remove   <setting>[.<prop>] | <prop> :: remove setting or reset property "
-"value\n"
-"set      [<setting>.<prop> <value>]  :: set property value\n"
-"describe [<setting>.<prop>]          :: describe property\n"
-"print    [all]                       :: print the connection\n"
-"verify   [all]                       :: verify the connection\n"
-"save                                 :: save the connection\n"
-"activate [<ifname>] [/<ap>|<nsp>]    :: activate the connection\n"
-"back                                 :: go one level up (back)\n"
-"help/?   [<command>]                 :: print this help\n"
-"nmcli    <conf-option> <value>       :: nmcli configuration\n"
-"quit                                 :: exit nmcli\n"
+"---[ 主èœå• ]---\n"
+"goto     [<设置> | <属性>]        :: 转到设置或属性\n"
+"remove   <设置>[.<属性>] | <属性> :: 移除设置或é‡ç½®å±žæ€§å€¼\n"
+"set      [<设置>.<属性> <值>]  :: 设置属性值\n"
+"describe [<设置>.<属性>]          :: æè¿°å±žæ€§\n"
+"print    [all | <设置>[.<属性>]]  :: 输出该连接\n"
+"verify   [all | fix]                 :: 验è¯è¯¥è¿žæŽ¥\n"
+"save     [persistent|temporary]      :: ä¿å­˜è¯¥è¿žæŽ¥\n"
+"activate [<接å£åç§°>] [/<ap>|<nsp>]    :: 激活该连接\n"
+"back                                 :: 转到上一级 (返回)\n"
+"help/?   [<命令>]                 :: 输出此帮助\n"
+"nmcli    <é…置选项> <值>       :: nmcli é…ç½®\n"
+"quit                                 :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:8144
+#: ../clients/cli/connections.c:8151
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2776,15 +2823,15 @@ msgid ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 msgstr ""
-"进入 <setting>[.<prop>] | <prop>  :: 输入è¦ç¼–辑的设置/属性\n"
+"goto <设置>[.<属性>] | <属性>  :: 进入设置/属性进行编辑\n"
 "\n"
-"这个命令å¯è¿›å…¥è¦ç¼–辑的设置或者属性。\n"
+"该命令进入设置或属性æ¥è¿›è¡Œç¼–辑。\n"
 "\n"
-"Examples: nmcli> goto connection\n"
+"示例:nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8151
+#: ../clients/cli/connections.c:8158
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -2796,14 +2843,14 @@ msgid ""
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 msgstr ""
-"remove <setting>[.<prop>]  :: remove setting or reset property value\n"
+"remove <设置>[.<属性>]  :: 移除设置或é‡ç½®å±žæ€§å€¼\n"
 "\n"
-"这个命令删除整个连接中的设置,或者如果给定属性,则将该属性é‡ç½®ä¸ºé»˜è®¤å€¼ã€‚\n"
+"该命令移除æ¥è‡ªè¿žæŽ¥çš„输入项设置,或者如果给定属性,é‡ç½®è¯¥å±žæ€§ä¸ºé»˜è®¤å€¼ã€‚\n"
 "\n"
-"Examples: nmcli> remove wifi-sec\n"
+"示例:nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8158
+#: ../clients/cli/connections.c:8165
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2812,13 +2859,13 @@ msgid ""
 "\n"
 "Example: nmcli> set con.id My connection\n"
 msgstr ""
-"set [<setting>.<prop> <value>]  :: set property value\n"
+"set [<设置>.<属性> <值>]  :: 设置属性值\n"
 "\n"
-"这个命令设定属性值。\n"
+"该命令用于设置属性值。\n"
 "\n"
-"Example: nmcli> set con.id My connection\n"
+"示例:nmcli> set con.id 我的连接\n"
 
-#: ../clients/cli/connections.c:8163
+#: ../clients/cli/connections.c:8170
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2826,11 +2873,12 @@ msgid ""
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
 msgstr ""
-"describe [<setting>.<prop>]  :: describe property\n"
+"describe [<设置>.<属性>]  :: æè¿°å±žæ€§\n"
 "\n"
-"显示属性æè¿°ã€‚您å¯ä»¥å‚考 nm-settings(5) æ‰‹å†Œé¡µé¢æŸ¥çœ‹æ‰€æœ‰ NM 设置和属性。\n"
+"显示属性æè¿°ã€‚您肯ä¾å‚阅 nm-settings(5) æ‰‹å†Œé¡µæ¥æŸ¥çœ‹å…¨éƒ¨çš„网络管ç†å™¨è®¾ç½®å’Œå±ž"
+"性。\n"
 
-#: ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:8175
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2839,14 +2887,14 @@ msgid ""
 "\n"
 "Example: nmcli ipv4> print all\n"
 msgstr ""
-"print [all]  :: print setting or connection values\n"
+"print [all]  :: 输出设置或连接值\n"
 "\n"
-"显示当å‰å±žæ€§æˆ–者整个连接。\n"
+"显示当å‰å±žæ€§æˆ–全部的连接。\n"
 "\n"
-"Example: nmcli ipv4> print all\n"
+"示例:nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8173
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8180
+#, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
@@ -2859,14 +2907,16 @@ msgid ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
-"verify [all]  :: verify setting or connection validity\n"
+"verify [all | fix]  :: 验è¯è®¾ç½®æˆ–连接有效性\n"
 "\n"
-"验è¯è¯¥è®¾ç½®æˆ–è€…è¿žæŽ¥æ˜¯å¦æœ‰æ•ˆä¸”å¯åœ¨ä»¥åŽä¿å­˜ã€‚它以错误信æ¯ä½œä¸ºæ— æ•ˆå€¼ã€‚\n"
+"éªŒè¯æ˜¯å¦è®¾ç½®æˆ–连接是有效的并且å¯ä»¥ç¨åŽä¿å­˜ã€‚\n"
+"它指出出错的无效值。有些错误能够使用“fixâ€é€‰é¡¹è‡ªåŠ¨ä¿®å¤ã€‚\n"
 "\n"
-"Examples: nmcli> verify\n"
+"示例:nmcli> verify\n"
+"          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8182
+#: ../clients/cli/connections.c:8189
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2881,8 +2931,15 @@ msgid ""
 "connection\n"
 "profile must be deleted.\n"
 msgstr ""
+"save [persistent|temporary]  :: ä¿å­˜è¯¥è¿žæŽ¥\n"
+"\n"
+"å‘é€è¯¥è¿žæŽ¥é…置文件到网络管ç†å™¨ï¼Œè¦ä¹ˆå°±æ°¸ä¹…ä¿å­˜è¦ä¹ˆåªä¿å­˜åœ¨å†…存里。\n"
+"“save†ä¸å¸¦å‚数表示“save persistentâ€ã€‚\n"
+"注æ„,一旦您选择永久ä¿å­˜é…置文件,那些设置将在é‡å¯åŽä¿å­˜ã€‚\n"
+"之åŽçš„æ›´æ”¹ä¹Ÿå¯ä»¥æ˜¯ä¸´æ—¶æˆ–永久的,但是任何临时更改在é‡å¯åŽä¸ä¼šå­˜åœ¨ã€‚\n"
+"如果您想è¦å®Œå…¨ç§»é™¤æ°¸ä¹…连接,必须删除该连接的é…置文件。\n"
 
-#: ../clients/cli/connections.c:8193
+#: ../clients/cli/connections.c:8200
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2894,34 +2951,34 @@ msgid ""
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
 msgstr ""
-"activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
+"activate [<接å£åç§°>] [/<ap>|<nsp>]  :: 激活该连接\n"
 "\n"
-"激活连接。\n"
+"激活该连接。\n"
 "\n"
-"å¯ç”¨é€‰é¡¹ï¼š\n"
-"<ifname>    - 在其中激活连接的设备。\n"
-"/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX) (未指定 <ifname> 时用 / åšå‰ç¼€ã€‚)\n"
+"å¯é€‰é€‰é¡¹ï¼š\n"
+"<接å£åç§°>    - 该连接将会激活的设备\n"
+"/<ap>|<nsp> - AP (Wi-Fi) 或 NSP (WiMAX) (剿’ / 当 <接å£åç§°> 未指定)\n"
 
-#: ../clients/cli/connections.c:8200 ../clients/cli/connections.c:8359
+#: ../clients/cli/connections.c:8207 ../clients/cli/connections.c:8366
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
 "\n"
 msgstr ""
-"back  :: go to upper menu level\n"
+"back  :: 转到上级èœå•\n"
 "\n"
 
-#: ../clients/cli/connections.c:8203
+#: ../clients/cli/connections.c:8210
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
 msgstr ""
-"help/? [<command>]  :: help for the nmcli commands\n"
+"help/? [<命令>]  :: nmcli 命令的帮助\n"
 "\n"
 
-#: ../clients/cli/connections.c:8206
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8213
+#, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
@@ -2935,18 +2992,19 @@ msgid ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 msgstr ""
-"nmcli [<conf-option> <value>]  :: nmcli configuration\n"
+"nmcli [<é…置选项> <值>]  :: nmcli é…ç½®\n"
 "\n"
-"é…ç½® nmcli。以下是å¯ç”¨é€‰é¡¹ï¼š\n"
-"status-line yes | no        [default: no]\n"
-"save-confirmation yes | no  [default: yes]\n"
-"prompt-color <0-8>          [default: 0]\n"
+"é…ç½® nmcli。有以下选项å¯ç”¨ï¼š\n"
+"status-line yes | no          [默认:no]\n"
+"save-confirmation yes | no    [默认:yes]\n"
+"show-secrets yes | no         [默认:no]\n"
+"prompt-color <颜色> | <0-8>  [默认:0]\n"
 "%s\n"
-"Examples: nmcli> nmcli status-line yes\n"
+"示例:nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8228 ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8235 ../clients/cli/connections.c:8372
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2954,20 +3012,20 @@ msgid ""
 "This command exits nmcli. When the connection being edited is not saved, the "
 "user is asked to confirm the action.\n"
 msgstr ""
-"quit  :: exit nmcli\n"
+"quit  :: 退出 nmcli\n"
 "\n"
-"这个命令退出 nmcli。当è¦ç¼–辑的连接没有被ä¿å­˜æ—¶ï¼Œä¼šè¯¢é—®ç”¨æˆ·æ˜¯å¦æ‰§è¡Œæ­¤æ“作。\n"
+"此命令用于退出 nmcli。当被编辑的连接没有ä¿å­˜ï¼Œä¼šè¯¢é—®ç”¨æˆ·ç¡®å®šæ“作。\n"
 
-#: ../clients/cli/connections.c:8233 ../clients/cli/connections.c:8370
-#: ../clients/cli/connections.c:8794 ../clients/cli/connections.c:9742
+#: ../clients/cli/connections.c:8240 ../clients/cli/connections.c:8377
+#: ../clients/cli/connections.c:8801 ../clients/cli/connections.c:9749
 #, c-format
 msgid "Unknown command: '%s'\n"
-msgstr "未知的命令:'%s'\n"
+msgstr "未知命令:“%sâ€\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8299
+#: ../clients/cli/connections.c:8306
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2982,31 +3040,30 @@ msgid ""
 "help/?   [<command>]             :: print this help or command description\n"
 "quit                             :: exit nmcli\n"
 msgstr ""
-"---[ Property menu ]---\n"
-"set      [<value>]               :: set new value\n"
-"add      [<value>]               :: add new option to the property\n"
-"change                           :: change current value\n"
-"remove   [<index> | <option>]    :: delete the value\n"
-"describe                         :: describe property\n"
-"print    [setting | connection]  :: print property (setting/connection) "
-"value(s)\n"
-"back                             :: go to upper level\n"
-"help/?   [<command>]             :: print this help or command description\n"
-"quit                             :: exit nmcli\n"
+"---[ 属性èœå• ]---\n"
+"set      [<值>]               :: 设置新值\n"
+"add      [<值>]               :: 添加新选项到属性\n"
+"change                           :: 更改当å‰å€¼\n"
+"remove   [<目录> | <选项>]    :: 删除该值\n"
+"describe                         :: æè¿°å±žæ€§\n"
+"print    [setting | connection]  :: 输出 (设置/连接) 值\n"
+"back                             :: 转到上一级\n"
+"help/?   [<命令>]             :: 输出该帮助或命令æè¿°\n"
+"quit                             :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:8324
+#: ../clients/cli/connections.c:8331
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
 msgstr ""
-"set [<value>]  :: set new value\n"
+"set [<值>]  :: 设置新值\n"
 "\n"
-"这个命令将æä¾›çš„ <value> 设定到属性中。\n"
+"此命令用于设置æä¾›çš„ <值> 到该属性\n"
 
-#: ../clients/cli/connections.c:8328
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8335
+#, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
 "\n"
@@ -3014,23 +3071,23 @@ msgid ""
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
 msgstr ""
-"add [<value>]  :: add new option to the property\n"
+"add [<值>]  :: 添加新值到属性\n"
 "\n"
-"如果该属性为容器类型,则这个命令在这个属性中添加æä¾›çš„ <value>。对于å•值属"
-"性,它会替æ¢è¯¥å€¼ï¼ˆå’Œâ€˜set’一样)。\n"
+"此命令添加æä¾›çš„ <值> 到该属性,如果该属性术语容器类型。对于å•值属性,属性值"
+"将被替代 (与“setâ€ç›¸åŒ)。\n"
 
-#: ../clients/cli/connections.c:8334
+#: ../clients/cli/connections.c:8341
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
 msgstr ""
-"change  :: change current value\n"
+"change  :: 更改当å‰å€¼\n"
 "\n"
-"显示当å‰å€¼å¹¶å…许编辑。\n"
+"显示当å‰å€¼å¹¶å…许编辑它。\n"
 
-#: ../clients/cli/connections.c:8338
+#: ../clients/cli/connections.c:8345
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -3049,8 +3106,19 @@ msgid ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 msgstr ""
+"remove [<值>|<目录>|<选项åç§°>]  :: 删除该值\n"
+"\n"
+"删除该属性值。对于å•值属性,æ“作将设置属性回它的默认值。对于容器类型\n"
+"属性,æ“作将移除该属性的所有值,或这您å¯ä»¥æŒ‡å®šå‚æ•°æ¥ç§»é™¤å•一项目或选\n"
+"é¡¹ã€‚å‚æ•°è¦ä¹ˆæ˜¯è¦ç§»é™¤çš„项目的值或目录,è¦ä¹ˆæ˜¯é€‰é¡¹åç§° (用于有命å选项的\n"
+"属性)。\n"
+"\n"
+"示例:nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
+"\n"
 
-#: ../clients/cli/connections.c:8349
+#: ../clients/cli/connections.c:8356
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -3058,11 +3126,12 @@ msgid ""
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
 msgstr ""
-"describe  :: describe property\n"
+"describe  :: æè¿°å±žæ€§\n"
 "\n"
-"显示属性æè¿°ã€‚您å¯ä»¥å‚考 nm-settings(5) æ‰‹å†Œé¡µé¢æŸ¥çœ‹æ‰€æœ‰ NM 设置和属性。\n"
+"显示属性æè¿°ã€‚您å¯ä»¥å‚阅 nm-settings(5) æ‰‹å†Œé¡µæ¥æŸ¥çœ‹æ‰€æœ‰çš„网络管ç†å™¨è®¾ç½®å’Œå±ž"
+"性。\n"
 
-#: ../clients/cli/connections.c:8354
+#: ../clients/cli/connections.c:8361
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -3071,564 +3140,554 @@ msgid ""
 "Shows property value. Providing an argument you can also display values for "
 "the whole setting or connection.\n"
 msgstr ""
-"print [property|setting|connection]  :: print property (setting, connection) "
-"value(s)\n"
+"print [property|setting|connection]  :: 输出属性 (设置ã€è¿žæŽ¥) 值\n"
 "\n"
-"显示属性值。æä¾›æ‚¨è¿˜å¯ä»¥ä¸ºæ•´ä¸ªè®¾ç½®æˆ–者连接显示的值。\n"
+"显示属性。æä¾›ä¸€é¡¹å‘½ä»¤ï¼Œæ‚¨å¯ä»¥ä¸ºå…¨éƒ¨è®¾ç½®æˆ–连接显示值。\n"
 
-#: ../clients/cli/connections.c:8362
+#: ../clients/cli/connections.c:8369
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 msgstr ""
-"help/? [<command>]  :: help for nmcli commands\n"
+"help/? [<命令>]  :: nmcli 命令的帮护\n"
 "\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8467
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "错误:激活连接失败。\n"
 
-#: ../clients/cli/connections.c:8543
+#: ../clients/cli/connections.c:8550
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
-msgstr "错误:设置 '%s' 为强制设置,且无法删除。\n"
+msgstr "错误:设置“%sâ€æ˜¯å¿…填的而且无法移除。\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:8561
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8568
+#, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
-msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:8597
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8604
+#, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr "连接未ä¿å­˜ã€‚您真的è¦é€€å‡ºå—?[y/n]\n"
+msgstr "连接还未ä¿å­˜ã€‚您真的想è¦é€€å‡ºå—?%s"
 
-#: ../clients/cli/connections.c:8646
+#: ../clients/cli/connections.c:8653
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
-msgstr "已从å¦ä¸€ä¸ªå®¢æˆ·ç«¯ä¸­åˆ é™¤è¿žæŽ¥ä¾§å†™ã€‚您需è¦åœ¨ä¸»èœå•中输入 'save'æ¢å¤å®ƒã€‚\n"
+msgstr ""
+"此连接é…置文件已被其它客户端移除了。您å¯ä»¥åœ¨ä¸»èœå•输入“saveâ€æ¥è¿˜åŽŸå®ƒã€‚\n"
 
-#: ../clients/cli/connections.c:8671 ../clients/cli/connections.c:9093
-#: ../clients/cli/connections.c:9151
+#: ../clients/cli/connections.c:8678 ../clients/cli/connections.c:9100
+#: ../clients/cli/connections.c:9158
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
-msgstr "'%s' 属性的å¯ç”¨å€¼ï¼š%s\n"
+msgstr "对于“%sâ€å±žæ€§å…许的值:%s\n"
 
-#: ../clients/cli/connections.c:8675 ../clients/cli/connections.c:9097
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:8682 ../clients/cli/connections.c:9104
+#: ../clients/cli/connections.c:9162
 #, c-format
 msgid "Enter '%s' value: "
-msgstr "输入 '%s' 值:"
+msgstr "输入“%sâ€å€¼ï¼š"
 
-#: ../clients/cli/connections.c:8690 ../clients/cli/connections.c:8712
-#: ../clients/cli/connections.c:9101 ../clients/cli/connections.c:9160
+#: ../clients/cli/connections.c:8697 ../clients/cli/connections.c:8719
+#: ../clients/cli/connections.c:9108 ../clients/cli/connections.c:9167
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
-msgstr "错误:设定 '%s' 属性失败:%s\n"
+msgstr "错误:设置“%sâ€å±žæ€§å¤±è´¥ï¼š%s\n"
 
-#: ../clients/cli/connections.c:8706
+#: ../clients/cli/connections.c:8713
 #, c-format
 msgid "Edit '%s' value: "
-msgstr "编辑 '%s' 值:"
+msgstr "编辑“%sâ€å€¼ï¼š"
 
-#: ../clients/cli/connections.c:8735
+#: ../clients/cli/connections.c:8742
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误:%s\n"
 
-#: ../clients/cli/connections.c:8741 ../clients/cli/connections.c:9242
-#: ../clients/cli/connections.c:9290
+#: ../clients/cli/connections.c:8748 ../clients/cli/connections.c:9249
+#: ../clients/cli/connections.c:9297
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
-msgstr "错误:删除 '%s' 值失败:%s\n"
+msgstr "错误:移除“%sâ€çš„值失败:%s\n"
 
-#: ../clients/cli/connections.c:8762
+#: ../clients/cli/connections.c:8769
 #, c-format
 msgid "Unknown command argument: '%s'\n"
-msgstr "æœªçŸ¥å‘½ä»¤å‚æ•°ï¼š'%s'\n"
+msgstr "æœªçŸ¥å‘½ä»¤å‚æ•°ï¼šâ€œ%sâ€\n"
 
-#: ../clients/cli/connections.c:8867
+#: ../clients/cli/connections.c:8874
 #, c-format
 msgid "Available settings: %s\n"
-msgstr "å¯ç”¨è®¾ç½®ï¼š%s\n"
+msgstr "有效设置:%s\n"
 
-#: ../clients/cli/connections.c:8879
+#: ../clients/cli/connections.c:8886
 #, c-format
 msgid "Error: invalid setting name; %s\n"
-msgstr "错误:无效设置åç§°ï¼›%s\n"
+msgstr "错误:无效的设置åç§°ï¼›%s\n"
 
-#: ../clients/cli/connections.c:8896
+#: ../clients/cli/connections.c:8903
 #, c-format
 msgid "Available properties: %s\n"
-msgstr "å¯ç”¨å±žæ€§ï¼š%s\n"
+msgstr "有效属性:%s\n"
 
-#: ../clients/cli/connections.c:8904
+#: ../clients/cli/connections.c:8911
 #, c-format
 msgid "Error: property %s\n"
 msgstr "错误:属性 %s\n"
 
-#: ../clients/cli/connections.c:8945
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:8952
+#, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
 "Do you still want to save? %s"
 msgstr ""
-"使用 'autoconnect=yes' ä¿å­˜è¯¥è¿žæŽ¥ã€‚è¿™æ ·ä¼šç«‹å³æ¿€æ´»è¯¥è¿žæŽ¥ã€‚\n"
-"您还è¦ä¿å­˜å—? [yes] "
+"正在使用“autoconnect=yesâ€ä¿å­˜è¿žæŽ¥ã€‚è¿™å¯å¯¼è‡´è¿žæŽ¥ç«‹å³æ¿€æ´»ã€‚\n"
+"æ‚¨ä»æƒ³è¦ä¿å­˜å—?%s"
 
-#: ../clients/cli/connections.c:9035
+#: ../clients/cli/connections.c:9042
 #, c-format
 msgid "You may edit the following settings: %s\n"
-msgstr "您å¯ä»¥ç¼–辑如下设置:%s\n"
+msgstr "您å¯ç¼–辑下列设置:%s\n"
 
-#: ../clients/cli/connections.c:9063
+#: ../clients/cli/connections.c:9070
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
-msgstr "已从å¦ä¸€ä¸ªå®¢æˆ·ç«¯ä¸­åˆ é™¤è¯¥è¿žæŽ¥ä¾§å†™ã€‚您需è¦è¾“å…¥ 'save'æ¢å¤å®ƒã€‚\n"
+msgstr "此连接é…置文件已被其它客户端移除了。您å¯ä»¥è¾“入“saveâ€æ¥è¿˜åŽŸå®ƒã€‚\n"
 
-#: ../clients/cli/connections.c:9105 ../clients/cli/connections.c:9335
+#: ../clients/cli/connections.c:9112 ../clients/cli/connections.c:9342
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
-msgstr "错误:未选择设置;有效值为 [%s]\n"
+msgstr "错误:未选择设置;有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:9106
+#: ../clients/cli/connections.c:9113
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
-msgstr "使用 'goto <setting>' 或者 'set <setting>。<property>'\n"
+msgstr "先使用“goto <设置>â€ï¼Œæˆ–“set <设置>.<属性>â€\n"
 
-#: ../clients/cli/connections.c:9120 ../clients/cli/connections.c:9269
-#: ../clients/cli/connections.c:9357
+#: ../clients/cli/connections.c:9127 ../clients/cli/connections.c:9276
+#: ../clients/cli/connections.c:9364
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
-msgstr "é”™è¯¯ï¼šæ— æ•ˆè®¾ç½®å‚æ•° '%s';有效值为 [%s]\n"
+msgstr "é”™è¯¯ï¼šæ— æ•ˆçš„è®¾ç½®å‚æ•°â€œ%sâ€ï¼›æœ‰æ•ˆçš„为 [%s]\n"
 
-#: ../clients/cli/connections.c:9130
+#: ../clients/cli/connections.c:9137
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
-msgstr "错误:缺少 '%s' 属性设置\n"
+msgstr "错误:缺少用于“%sâ€å±žæ€§çš„设置\n"
 
-#: ../clients/cli/connections.c:9137
+#: ../clients/cli/connections.c:9144
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "错误:无效属性:%s\n"
 
-#: ../clients/cli/connections.c:9190
+#: ../clients/cli/connections.c:9197
 #, c-format
 msgid "Error: unknown setting '%s'\n"
-msgstr "错误:ä½ç½®è®¾ç½® '%s'\n"
+msgstr "错误:未知设置“%sâ€\n"
 
-#: ../clients/cli/connections.c:9203
+#: ../clients/cli/connections.c:9210
 #, c-format
 msgid "You may edit the following properties: %s\n"
-msgstr "您å¯ä»¥ç¼–辑以下属性:%s\n"
+msgstr "您å¯ä»¥ç¼–辑下列属性:%s\n"
 
-#: ../clients/cli/connections.c:9247
+#: ../clients/cli/connections.c:9254
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
-msgstr "é”™è¯¯ï¼šä¸ºç»™å‡ºå‚æ•°ï¼›æœ‰æ•ˆå€¼ä¸º [%s]\n"
+msgstr "é”™è¯¯ï¼šæœªç»™å®šå‚æ•°ï¼šæœ‰æ•ˆçš„为 [%s]\n"
 
-#: ../clients/cli/connections.c:9266
+#: ../clients/cli/connections.c:9273
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
-msgstr "该连接中未显示设置 '%s'。\n"
+msgstr "设置“%sâ€æœªåœ¨è¿žæŽ¥é‡Œæä¾›ã€‚\n"
 
-#: ../clients/cli/connections.c:9311
+#: ../clients/cli/connections.c:9318
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
-msgstr "错误:%s å±žæ€§ï¼Œå®ƒä¸æ˜¯è®¾ç½®å称。\n"
+msgstr "错误:%s å±žæ€§ï¼Œä¹Ÿä¸æ˜¯è®¾ç½®å称。\n"
 
-#: ../clients/cli/connections.c:9336
+#: ../clients/cli/connections.c:9343
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr "首先使用 'goto <setting>' 或者 'describe <setting>。<property>'\n"
+msgstr "先使用“goto <设置>â€ï¼Œæˆ–“describe <设置>.<属性>â€\n"
 
-#: ../clients/cli/connections.c:9385
+#: ../clients/cli/connections.c:9392
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
-msgstr "错误:无效属性:%sï¼Œä¹Ÿä¸æ˜¯æœ‰æ•ˆè®¾ç½®å称。\n"
+msgstr "错误:无效属性:%sï¼Œä¹Ÿä¸æ˜¯æœ‰æ•ˆçš„设置å称。\n"
 
-#: ../clients/cli/connections.c:9417
+#: ../clients/cli/connections.c:9424
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
-msgstr "错误:未知设置:'%s'\n"
+msgstr "错误:未知设置:“%sâ€\n"
 
-#: ../clients/cli/connections.c:9422
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9429
+#, c-format
 msgid "Error: '%s' setting not present in the connection\n"
-msgstr "该连接中未显示设置 '%s'。\n"
+msgstr "错误:设置“%sâ€æœªåœ¨è¿žæŽ¥é‡Œæä¾›ã€‚\n"
 
-#: ../clients/cli/connections.c:9450
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9457
+#, c-format
 msgid "Error: invalid property: %s%s\n"
-msgstr "错误:无效属性:%s\n"
+msgstr "错误:无效属性:%s%s\n"
 
-#: ../clients/cli/connections.c:9452
-#, fuzzy
+#: ../clients/cli/connections.c:9459
 msgid ", neither a valid setting name"
-msgstr "错误:无效属性:%sï¼Œä¹Ÿä¸æ˜¯æœ‰æ•ˆè®¾ç½®å称。\n"
+msgstr "ï¼Œä¹Ÿä¸æ˜¯æœ‰æ•ˆçš„设置åç§°"
 
-#: ../clients/cli/connections.c:9469
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9476
+#, c-format
 msgid "Invalid verify option: %s\n"
-msgstr "无效选项 '%s'"
+msgstr "无效的验è¯é€‰é¡¹ï¼š%s\n"
 
-#: ../clients/cli/connections.c:9477
+#: ../clients/cli/connections.c:9484
 #, c-format
 msgid "Verify setting '%s': %s\n"
-msgstr "确认设置 '%s': %s\n"
+msgstr "验è¯è®¾ç½®â€œ%sâ€ï¼š%s\n"
 
-#: ../clients/cli/connections.c:9492
+#: ../clients/cli/connections.c:9499
 #, c-format
 msgid "Verify connection: %s\n"
-msgstr "确认连接:%s\n"
+msgstr "验è¯è¿žæŽ¥ï¼š%s\n"
 
-#: ../clients/cli/connections.c:9495
+#: ../clients/cli/connections.c:9502
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
-msgstr ""
+msgstr "该错误无法被自动修å¤ã€‚\n"
 
-#: ../clients/cli/connections.c:9512
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9519
+#, c-format
 msgid "Error: invalid argument '%s'\n"
-msgstr "错误:无效é¢å¤–傿•°E '%s'。"
+msgstr "é”™è¯¯ï¼šæ— æ•ˆçš„å‚æ•°â€œ%sâ€\n"
 
-#: ../clients/cli/connections.c:9545
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9552
+#, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
-msgstr "错误:ä¿å­˜ '%s' (%s) 连接失败:(%d) %s\n"
+msgstr "错误:ä¿å­˜â€œ%sâ€(%s) 连接失败:%s\n"
 
-#: ../clients/cli/connections.c:9552
+#: ../clients/cli/connections.c:9559
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
-msgstr "æˆåŠŸä¿å­˜è¿žæŽ¥ '%s' (%s)。\n"
+msgstr "连接“%s†(%s)  å·²æˆåŠŸä¿å­˜ã€‚\n"
 
-#: ../clients/cli/connections.c:9553
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9560
+#, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
-msgstr "æˆåŠŸæ·»åŠ çš„è¿žæŽ¥ '%s'(%s)。\n"
+msgstr "连接“%s†(%s)  å·²æˆåŠŸæ›´æ–°ã€‚\n"
 
-#: ../clients/cli/connections.c:9586
+#: ../clients/cli/connections.c:9593
 #, c-format
 msgid "Error: connection verification failed: %s\n"
-msgstr "错误:连接验è¯å¤±è´¥ï¼š%s\n"
+msgstr "错误:连接验è¯å¤±è´¥ï¼š%s。\n"
 
-#: ../clients/cli/connections.c:9587
+#: ../clients/cli/connections.c:9594
 msgid "(unknown error)"
-msgstr "(未知错误)"
+msgstr "(未知错误)"
 
-#: ../clients/cli/connections.c:9588
+#: ../clients/cli/connections.c:9595
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
-msgstr ""
+msgstr "您å¯ä»¥å°è¯•è¿è¡Œâ€œverify fixâ€æ¥ä¿®å¤é”™è¯¯ã€‚\n"
 
-#: ../clients/cli/connections.c:9610
+#: ../clients/cli/connections.c:9617
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
-msgstr "错误:未ä¿å­˜è¿žæŽ¥ã€‚请首先输入 'save'。\n"
+msgstr "错误:连接还未ä¿å­˜ã€‚先输入“saveâ€ã€‚\n"
 
-#: ../clients/cli/connections.c:9614
+#: ../clients/cli/connections.c:9621
 #, c-format
 msgid "Error: connection is not valid: %s\n"
-msgstr "错误:连接无效:%s\n"
+msgstr "错误:连接是无效的:%s\n"
 
-#: ../clients/cli/connections.c:9624
+#: ../clients/cli/connections.c:9631
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "错误:无法激活连接:%s。\n"
 
-#: ../clients/cli/connections.c:9634
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9641
+#, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
-msgstr "错误:激活 '%s' (%s) 连接失败:(%d) %s\n"
+msgstr "错误:激活“%sâ€(%s) 连接失败:%s\n"
 
-#: ../clients/cli/connections.c:9640
+#: ../clients/cli/connections.c:9647
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
-msgstr "激活监控连接(按任æ„间继续)\n"
+msgstr "正在监控连接激活(按任æ„键继续)\n"
 
-#: ../clients/cli/connections.c:9678
+#: ../clients/cli/connections.c:9685
 #, c-format
 msgid "Error: status-line: %s\n"
-msgstr "错误:status-line: %s\n"
+msgstr "错误:status-line:%s\n"
 
-#: ../clients/cli/connections.c:9686
+#: ../clients/cli/connections.c:9693
 #, c-format
 msgid "Error: save-confirmation: %s\n"
-msgstr "错误:save-confirmation: %s\n"
+msgstr "错误:save-confirmation:%s\n"
 
-#: ../clients/cli/connections.c:9694
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9701
+#, c-format
 msgid "Error: show-secrets: %s\n"
-msgstr "错误:'show active': %s"
+msgstr "错误:show-secrets:%s\n"
 
-#: ../clients/cli/connections.c:9703
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:9710
+#, c-format
 msgid "Error: bad color: %s\n"
-msgstr "错误:无效属性:%s\n"
+msgstr "错误:错误的颜色:%s\n"
 
-#: ../clients/cli/connections.c:9717
+#: ../clients/cli/connections.c:9724
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "å½“å‰ nmcli é…置:\n"
 
-#: ../clients/cli/connections.c:9727
+#: ../clients/cli/connections.c:9734
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
-msgstr "无效é…置选项 '%s';应为 [%s]\n"
+msgstr "无效的é…置选项“%sâ€ï¼›å…许 [%s]\n"
 
-#: ../clients/cli/connections.c:9982
+#: ../clients/cli/connections.c:9989
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgstr "错误:åªèƒ½æä¾› 'id', uuid, 或者 'path' 之一。"
+msgstr "错误:åªèƒ½æä¾›â€œidâ€ã€uuid 或“路径â€ä¹‹ä¸€ã€‚"
 
-#: ../clients/cli/connections.c:9994 ../clients/cli/connections.c:10171
-#: ../clients/cli/connections.c:10178 ../clients/cli/connections.c:10306
-#: ../clients/cli/connections.c:10782
+#: ../clients/cli/connections.c:10001 ../clients/cli/connections.c:10178
+#: ../clients/cli/connections.c:10185 ../clients/cli/connections.c:10313
+#: ../clients/cli/connections.c:10789
 #, c-format
 msgid "Error: Unknown connection '%s'."
-msgstr "错误:未知连接:'%s'."
+msgstr "错误:未知连接“%sâ€ã€‚"
 
-#: ../clients/cli/connections.c:10012
+#: ../clients/cli/connections.c:10019
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
-msgstr "警告:编辑现有连接 '%s'; 忽略 'type' 傿•°ã€‚\n"
+msgstr "警告:正在编辑已存的连接“%sâ€ï¼›â€œtypeâ€å‚数已忽略\n"
 
-#: ../clients/cli/connections.c:10015
+#: ../clients/cli/connections.c:10022
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-msgstr "警告:编辑现有连接 '%s';忽略 'con-name' 傿•°ã€‚\n"
+msgstr "警告:正在编辑已存的连接“%sâ€ï¼›â€œcon-nameâ€å‚数已忽略\n"
 
-#: ../clients/cli/connections.c:10029
+#: ../clients/cli/connections.c:10036
 #, c-format
 msgid "Valid connection types: %s\n"
-msgstr "无效连接类型:%s\n"
+msgstr "无效的连接类型:%s\n"
 
-#: ../clients/cli/connections.c:10031
+#: ../clients/cli/connections.c:10038
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "错误:无效的连接类型;%s\n"
 
-#: ../clients/cli/connections.c:10070
+#: ../clients/cli/connections.c:10077
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
-msgstr "===| nmcli interactive connection editor |==="
+msgstr "===| nmcli 交互å¼è¿žæŽ¥ç¼–辑器 |==="
 
-#: ../clients/cli/connections.c:10073
+#: ../clients/cli/connections.c:10080
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
-msgstr "编辑现有 '%s' 连接:'%s'"
+msgstr "正在编辑已存的连接“%sâ€ï¼šâ€œ%sâ€"
 
-#: ../clients/cli/connections.c:10075
+#: ../clients/cli/connections.c:10082
 #, c-format
 msgid "Adding a new '%s' connection"
-msgstr "添加新 '%s' 连接"
+msgstr "正在添加新的“%sâ€è¿žæŽ¥"
 
-#: ../clients/cli/connections.c:10077
+#: ../clients/cli/connections.c:10084
 #, c-format
 msgid "Type 'help' or '?' for available commands."
-msgstr "输入 'help' 或者 '?' 查看å¯ç”¨å‘½ä»¤ã€‚"
+msgstr "对于å¯ç”¨çš„命令输入“helpâ€æˆ–“?â€ã€‚"
 
-#: ../clients/cli/connections.c:10079
+#: ../clients/cli/connections.c:10086
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr "输入 'describe [<setting>.<prop>]' 查看详细的属性说明。"
+msgstr "输入“describe [<设置>.<属性>]â€æ¥èŽ·å¾—è¯¦ç»†çš„å±žæ€§æè¿°ã€‚"
 
-#: ../clients/cli/connections.c:10117
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10124
+#, c-format
 msgid "Error: Failed to modify connection '%s': %s"
-msgstr "错误:修改连接 '%s' 失败:(%d) %s"
+msgstr "错误:修改连接“%sâ€å¤±è´¥ï¼š%s"
 
-#: ../clients/cli/connections.c:10124
+#: ../clients/cli/connections.c:10131
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
-msgstr "æˆåŠŸä¿®æ”¹è¿žæŽ¥ '%s' (%s)。\n"
+msgstr "连接“%sâ€(%s) å·²æˆåŠŸä¿®æ”¹ã€‚\n"
 
-#: ../clients/cli/connections.c:10146 ../clients/cli/connections.c:10262
-#: ../clients/cli/connections.c:10639 ../clients/cli/connections.c:10747
+#: ../clients/cli/connections.c:10153 ../clients/cli/connections.c:10269
+#: ../clients/cli/connections.c:10646 ../clients/cli/connections.c:10754
 #, c-format
 msgid "Error: No arguments provided."
-msgstr "错误:未æä¾›å‚数。"
+msgstr "错误:没有æä¾›å‚数。"
 
-#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10776
+#: ../clients/cli/connections.c:10172 ../clients/cli/connections.c:10301
+#: ../clients/cli/connections.c:10783
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "错误:缺少连接 ID。"
 
-#: ../clients/cli/connections.c:10228
+#: ../clients/cli/connections.c:10235
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
-msgstr ""
+msgstr "%s (%s) 已克隆为 %s (%s)。\n"
 
-#: ../clients/cli/connections.c:10260
-#, fuzzy
+#: ../clients/cli/connections.c:10267
 msgid "New connection name: "
-msgstr "新连接"
+msgstr "新连接å称:"
 
-#: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10288 ../clients/cli/connections.c:10306
+#, c-format
 msgid "Error: <new name> argument is missing."
-msgstr "错误:缺少 %s 傿•°ã€‚"
+msgstr "错误:缺少 <new name> 傿•°ã€‚"
 
-#: ../clients/cli/connections.c:10287
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10294
+#, c-format
 msgid "Error: unexpected extra argument '%s'."
-msgstr "错误:æ„外傿•° '%s'"
+msgstr "错误:æ„外的é¢å¤–傿•°â€œ%sâ€ã€‚"
 
-#: ../clients/cli/connections.c:10356
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10363
+#, c-format
 msgid "Error: not all connections deleted."
-msgstr "错误:未指定连接。"
+msgstr "é”™è¯¯ï¼šä¸æ˜¯æ‰€æœ‰çš„连接都已删除。"
 
-#: ../clients/cli/connections.c:10357
+#: ../clients/cli/connections.c:10364
 #, c-format
 msgid "Error: Connection deletion failed: %s"
-msgstr "错误:删除连接失败:%s"
+msgstr "错误:连接删除失败:%s"
 
-#: ../clients/cli/connections.c:10419 ../clients/cli/connections.c:10547
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10426 ../clients/cli/connections.c:10554
+#, c-format
 msgid "Error: unknown connection '%s'\n"
-msgstr "错误:未知连接:%s\n"
+msgstr "错误:未知连接“%sâ€\n"
 
-#: ../clients/cli/connections.c:10433
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10440
+#, c-format
 msgid "Error: no connection provided."
-msgstr "错误:未指定连接。"
+msgstr "错误:没有æä¾›è¿žæŽ¥ã€‚"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:10458
+#: ../clients/cli/connections.c:10465
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "错误:无法删除未知连接:%s。"
 
-#: ../clients/cli/connections.c:10470
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10477
+#, c-format
 msgid "%s: connection profile changed\n"
-msgstr "连接失败"
+msgstr "%s:连接é…置文件已改å˜\n"
 
-#: ../clients/cli/connections.c:10496
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10503
+#, c-format
 msgid "%s: connection profile created\n"
-msgstr "连接失败"
+msgstr "%s:连接é…置文件已创建\n"
 
-#: ../clients/cli/connections.c:10505
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10512
+#, c-format
 msgid "%s: connection profile removed\n"
-msgstr "连接被删除"
+msgstr "%s:连接é…置已移除\n"
 
-#: ../clients/cli/connections.c:10548
-#, fuzzy, c-format
-msgid "Error: not all connections found."
-msgstr "错误:'%s' 䏿˜¯æœ‰æ•ˆ 'connection' 命令。"
-
-#: ../clients/cli/connections.c:10571
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10578
+#, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "错误:添加 '%s' 连接失败:(%d)%s"
+msgstr "é”™è¯¯ï¼šé‡æ–°è½½å…¥è¿žæŽ¥å¤±è´¥ï¼š%s。"
 
-#: ../clients/cli/connections.c:10603
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10610
+#, c-format
 msgid "Error: failed to load connection: %s."
-msgstr "错误:添加 '%s' 连接失败:(%d)%s"
+msgstr "错误:加载连接失败:%s。"
 
-#: ../clients/cli/connections.c:10611
+#: ../clients/cli/connections.c:10618
 #, c-format
 msgid "Could not load file '%s'\n"
-msgstr "无法载入文件 '%s'\n"
+msgstr "无法加载文件“%sâ€\n"
 
-#: ../clients/cli/connections.c:10620
-#, fuzzy
+#: ../clients/cli/connections.c:10627
 msgid "File to import: "
-msgstr "加密失败:%d。"
+msgstr "è¦å¯¼å…¥çš„æ–‡ä»¶ï¼š"
 
-#: ../clients/cli/connections.c:10655
+#: ../clients/cli/connections.c:10662
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "警告:“typeâ€å·²ç»æŒ‡å®šäº†ï¼Œæ­£åœ¨å¿½ç•¥å¤šä½™çš„。\n"
 
-#: ../clients/cli/connections.c:10666
+#: ../clients/cli/connections.c:10673
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
-msgstr ""
+msgstr "警告:“fileâ€å·²ç»æŒ‡å®šäº†ï¼Œæ­£åœ¨å¿½ç•¥å¤šä½™çš„。\n"
 
-#: ../clients/cli/connections.c:10668
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10675
+#, c-format
 msgid "Unknown parameter: %s"
-msgstr "æœªçŸ¥å‚æ•°ï¼š%s\n"
+msgstr "æœªçŸ¥å‚æ•°ï¼š%s"
 
-#: ../clients/cli/connections.c:10683
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10690
+#, c-format
 msgid "Error: 'file' argument is required."
-msgstr "错误:需è¦'ifname' 傿•°ã€‚"
+msgstr "错误:需è¦â€œfileâ€å‚数。"
 
-#: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10698 ../clients/cli/connections.c:10805
+#, c-format
 msgid "Error: failed to load VPN plugin: %s."
-msgstr "错误:修改 %s 失败。%s: %s。"
+msgstr "错误:加载 VPN æ’件失败:%s。"
 
-#: ../clients/cli/connections.c:10699
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10706
+#, c-format
 msgid "Error: failed to import '%s': %s."
-msgstr "错误:修改 %s 失败。%s: %s。"
+msgstr "错误:导入“%sâ€å¤±è´¥ï¼š%s。"
 
-#: ../clients/cli/connections.c:10745
-#, fuzzy
+#: ../clients/cli/connections.c:10752
 msgid "Output file name: "
-msgstr "文件å"
+msgstr "输出文件å称:"
 
-#: ../clients/cli/connections.c:10769
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10776
+#, c-format
 msgid "Error: unknown extra argument: '%s'."
-msgstr "错误:无效é¢å¤–傿•°E '%s'。"
+msgstr "错误:未知的é¢å¤–傿•°ï¼šâ€œ%sâ€ã€‚"
 
-#: ../clients/cli/connections.c:10789
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10796
+#, c-format
 msgid "Error: the connection is not VPN."
-msgstr "错误:连接无效:%s\n"
+msgstr "错误:连接ä¸ä¸º VPN。"
 
-#: ../clients/cli/connections.c:10810
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10817
+#, c-format
 msgid "Error: failed to create temporary file %s."
-msgstr "无法创建临时文件:%s"
+msgstr "错误:创建临时文件 %s 失败。"
 
-#: ../clients/cli/connections.c:10819
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10826
+#, c-format
 msgid "Error: failed to export '%s': %s."
-msgstr "错误:设定 '%s' 属性失败:%s\n"
+msgstr "错误:导出“%sâ€å¤±è´¥ï¼š%s。"
 
-#: ../clients/cli/connections.c:10830
-#, fuzzy, c-format
+#: ../clients/cli/connections.c:10837
+#, c-format
 msgid "Error: failed to read temporary file '%s': %s."
-msgstr "错误:删除 '%s' 值失败:%s\n"
+msgstr "错误:读å–临时文件“%sâ€å¤±è´¥ï¼š%s。"
 
-#: ../clients/cli/connections.c:10976
+#: ../clients/cli/connections.c:10983
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
-msgstr ""
+msgstr "“--orderâ€é€‰é¡¹çš„错误字符串“%sâ€"
 
-#: ../clients/cli/connections.c:11002
+#: ../clients/cli/connections.c:11009
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
-msgstr ""
+msgstr "“--orderâ€é€‰é¡¹çš„错误项目“%sâ€"
 
-#: ../clients/cli/connections.c:11089
-#, fuzzy
+#: ../clients/cli/connections.c:11093
 msgid "'--order' argument is missing"
-msgstr "错误:缺少 %s 傿•°ã€‚"
+msgstr "缺少“--orderâ€å‚æ•°"
 
-#: ../clients/cli/connections.c:11154
+#: ../clients/cli/connections.c:11158
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
-msgstr "错误:'%s' 䏿˜¯æœ‰æ•ˆ 'connection' 命令。"
+msgstr "错误:“%s†是无效的 “connection†命令。"
 
 #. define some prompts
 #: ../clients/cli/devices.c:35
@@ -3636,7 +3695,6 @@ msgid "Interface: "
 msgstr "接å£ï¼š"
 
 #: ../clients/cli/devices.c:36
-#, fuzzy
 msgid "Interface(s): "
 msgstr "接å£ï¼š"
 
@@ -3644,7 +3702,7 @@ msgstr "接å£ï¼š"
 #. 20
 #: ../clients/cli/devices.c:44 ../clients/cli/devices.c:76
 msgid "CONNECTION"
-msgstr "CONNECTION"
+msgstr "连接"
 
 #. 4
 #. 21
@@ -3654,19 +3712,18 @@ msgstr "CON-UUID"
 
 #. 2
 #: ../clients/cli/devices.c:58
-#, fuzzy
 msgid "NM-TYPE"
-msgstr "类型"
+msgstr "NM-类型"
 
 #. 3
 #: ../clients/cli/devices.c:59
 msgid "VENDOR"
-msgstr "VENDOR"
+msgstr "厂商"
 
 #. 4
 #: ../clients/cli/devices.c:60
 msgid "PRODUCT"
-msgstr "PRODUCT"
+msgstr "产å“"
 
 #. 5
 #: ../clients/cli/devices.c:61
@@ -3676,12 +3733,12 @@ msgstr "驱动程åº"
 #. 6
 #: ../clients/cli/devices.c:62
 msgid "DRIVER-VERSION"
-msgstr "DRIVER-VERSION"
+msgstr "驱动程åºç‰ˆæœ¬"
 
 #. 7
 #: ../clients/cli/devices.c:63
 msgid "FIRMWARE-VERSION"
-msgstr "FIRMWARE-VERSION"
+msgstr "固件版本"
 
 #. 8
 #: ../clients/cli/devices.c:64
@@ -3698,7 +3755,7 @@ msgstr "MTU"
 #. 11
 #: ../clients/cli/devices.c:67
 msgid "REASON"
-msgstr "REASON"
+msgstr "原因"
 
 #. 12
 #: ../clients/cli/devices.c:68
@@ -3714,42 +3771,37 @@ msgstr "IP-IFACE"
 #. 2
 #: ../clients/cli/devices.c:70 ../clients/cli/devices.c:102
 msgid "IS-SOFTWARE"
-msgstr ""
+msgstr "是å¦è½¯ä»¶"
 
 #. 15
 #: ../clients/cli/devices.c:71
 msgid "NM-MANAGED"
-msgstr "NM-MANAGED"
+msgstr "被 NM 管ç†"
 
 #. 17
 #: ../clients/cli/devices.c:73
 msgid "FIRMWARE-MISSING"
-msgstr "FIRMWARE-MISSING"
+msgstr "固件缺失"
 
 #. 18
 #: ../clients/cli/devices.c:74
 msgid "NM-PLUGIN-MISSING"
-msgstr ""
+msgstr "网络管ç†å™¨æ’件缺失"
 
 #. 19
 #: ../clients/cli/devices.c:75
 msgid "PHYS-PORT-ID"
-msgstr ""
-
-#. 23
-#: ../clients/cli/devices.c:79
-msgid "METERED"
-msgstr ""
+msgstr "物ç†ç«¯å£ ID"
 
 #. 0
 #: ../clients/cli/devices.c:90
 msgid "AVAILABLE-CONNECTION-PATHS"
-msgstr "AVAILABLE-CONNECTION-PATHS"
+msgstr "å¯ç”¨è¿žæŽ¥è·¯å¾„"
 
 #. 1
 #: ../clients/cli/devices.c:91
 msgid "AVAILABLE-CONNECTIONS"
-msgstr "AVAILABLE-CONNECTIONS"
+msgstr "å¯ç”¨è¿žæŽ¥"
 
 #. 0
 #: ../clients/cli/devices.c:100
@@ -3764,12 +3816,12 @@ msgstr "速度"
 #. 0
 #: ../clients/cli/devices.c:111
 msgid "CARRIER"
-msgstr "容器"
+msgstr "载波"
 
 #. 1
 #: ../clients/cli/devices.c:112
 msgid "S390-SUBCHANNELS"
-msgstr ""
+msgstr "S390 å­é¢‘段"
 
 #. 0
 #: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731
@@ -3800,7 +3852,7 @@ msgstr "CCMP"
 #. 2
 #: ../clients/cli/devices.c:126 ../clients/cli/devices.c:228
 msgid "AP"
-msgstr "AP"
+msgstr "访问点"
 
 #. 6
 #: ../clients/cli/devices.c:127
@@ -3810,17 +3862,17 @@ msgstr "ADHOC"
 #. 7
 #: ../clients/cli/devices.c:128
 msgid "2GHZ"
-msgstr ""
+msgstr "2GHZ"
 
 #. 8
 #: ../clients/cli/devices.c:129
 msgid "5GHZ"
-msgstr ""
+msgstr "5GHZ"
 
 #. 0
 #: ../clients/cli/devices.c:138
 msgid "CTR-FREQ"
-msgstr "CTR-FREQ"
+msgstr "CTR 频率"
 
 #. 1
 #: ../clients/cli/devices.c:139
@@ -3860,22 +3912,22 @@ msgstr "BSSID"
 #. 3
 #: ../clients/cli/devices.c:154
 msgid "MODE"
-msgstr "åž‹å·"
+msgstr "模å¼"
 
 #. 4
 #: ../clients/cli/devices.c:155
 msgid "CHAN"
-msgstr "CHAN"
+msgstr "频段"
 
 #. 5
 #: ../clients/cli/devices.c:156
 msgid "FREQ"
-msgstr "FREQ"
+msgstr "频率"
 
 #. 6
 #: ../clients/cli/devices.c:157
 msgid "RATE"
-msgstr "频率"
+msgstr "速率"
 
 #. 7
 #. 1
@@ -3896,12 +3948,12 @@ msgstr "安全性"
 #. 10
 #: ../clients/cli/devices.c:161
 msgid "WPA-FLAGS"
-msgstr "WPA-标志"
+msgstr "WPA标志"
 
 #. 11
 #: ../clients/cli/devices.c:162
 msgid "RSN-FLAGS"
-msgstr "RSN-标志"
+msgstr "RSN标志"
 
 #. 14
 #: ../clients/cli/devices.c:165
@@ -3917,12 +3969,12 @@ msgstr "NSP"
 #. 0
 #: ../clients/cli/devices.c:192
 msgid "SLAVES"
-msgstr "SLAVES"
+msgstr "从"
 
 #. 0
 #: ../clients/cli/devices.c:201
 msgid "PARENT"
-msgstr ""
+msgstr "父"
 
 #. 1
 #: ../clients/cli/devices.c:202
@@ -3947,7 +3999,7 @@ msgstr "有线连接属性"
 #. 4
 #: ../clients/cli/devices.c:230
 msgid "WIMAX-PROPERTIES"
-msgstr "WIMAX-PROPERTIES"
+msgstr "WIMAX 属性"
 
 #. 10
 #: ../clients/cli/devices.c:236 ../clients/tui/nmt-page-bond.c:351
@@ -3957,7 +4009,7 @@ msgstr "BOND"
 #. 11
 #: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
-msgstr "TEAM"
+msgstr "群组"
 
 #. 12
 #: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-bridge.c:74
@@ -3967,87 +4019,60 @@ msgstr "桥接"
 #. 14
 #: ../clients/cli/devices.c:240
 msgid "BLUETOOTH"
-msgstr ""
+msgstr "è“牙"
 
 #. 15
 #: ../clients/cli/devices.c:241
 msgid "CONNECTIONS"
-msgstr "CONNECTIONS"
-
-#. 1
-#: ../clients/cli/devices.c:253
-msgid "CHASSIS-ID"
-msgstr ""
+msgstr "连接"
 
 #. 2
 #: ../clients/cli/devices.c:254
 msgid "PORT-ID"
-msgstr ""
+msgstr "ç«¯å£ ID"
 
 #. 3
 #: ../clients/cli/devices.c:255
 msgid "PORT-DESCRIPTION"
-msgstr ""
+msgstr "ç«¯å£æè¿°"
 
 #. 4
 #: ../clients/cli/devices.c:256
-#, fuzzy
 msgid "SYSTEM-NAME"
-msgstr "USERNAME"
+msgstr "系统åç§°"
 
 #. 5
 #: ../clients/cli/devices.c:257
 msgid "SYSTEM-DESCRIPTION"
-msgstr ""
+msgstr "系统æè¿°"
 
 #. 6
 #: ../clients/cli/devices.c:258
-#, fuzzy
 msgid "SYSTEM-CAPABILITIES"
-msgstr "功能"
+msgstr "系统功能"
 
 #. 7
 #: ../clients/cli/devices.c:259
 msgid "IEEE-802-1-PVID"
-msgstr ""
+msgstr "IEEE-802-1-PVID"
 
 #. 8
 #: ../clients/cli/devices.c:260
 msgid "IEEE-802-1-PPVID"
-msgstr ""
-
-#. 9
-#: ../clients/cli/devices.c:261
-msgid "IEEE-802-1-PPVID-FLAGS"
-msgstr ""
+msgstr "IEEE-802-1-PPVID"
 
 #. 10
 #: ../clients/cli/devices.c:262
 msgid "IEEE-802-1-VID"
-msgstr ""
-
-#. 11
-#: ../clients/cli/devices.c:263
-msgid "IEEE-802-1-VLAN-NAME"
-msgstr ""
-
-#. 12
-#: ../clients/cli/devices.c:264
-msgid "DESTINATION"
-msgstr ""
-
-#. 13
-#: ../clients/cli/devices.c:265
-msgid "CHASSIS-ID-TYPE"
-msgstr ""
+msgstr "IEEE-802-1-VID"
 
 #. 14
 #: ../clients/cli/devices.c:266
 msgid "PORT-ID-TYPE"
-msgstr ""
+msgstr "ç«¯å£ ID 类型"
 
 #: ../clients/cli/devices.c:283
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
@@ -4085,29 +4110,40 @@ msgid ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 msgstr ""
-"用法:nmcli device { COMMAND | help }\n"
+"用法:nmcli device { 命令 | help }\n"
 "\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
-"\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
+"命令 := { status | show | connect | reapply | disconnect | delete | monitor "
+"| wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
-"  show [<ifname>]\n"
+"  show [<接å£åç§°>]\n"
 "\n"
-"  connect <ifname>\n"
+"  set [ifname] <接å£åç§°> [autoconnect yes|no] [managed yes|no]\n"
 "\n"
-"  disconnect <ifname>\n"
+"  connect <接å£åç§°>\n"
 "\n"
-"  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"  reapply <接å£åç§°> ...\n"
 "\n"
-"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"  disconnect <接å£åç§°> ...\n"
+"\n"
+"  delete <接å£åç§°> ...\n"
+"\n"
+"  monitor <接å£åç§°> ...\n"
 "\n"
-"  wifi rescan [[ifname] <ifname>]\n"
+"  wifi [list [ifname <接å£åç§°>] [bssid <BSSID>]]\n"
 "\n"
-"  wimax [list [ifname <ifname>] [nsp <name>]]\n"
+"  wifi connect <(B)SSID> [password <密ç >] [wep-key-type key|phrase] [ifname "
+"<接å£åç§°>]\n"
+"                         [bssid <BSSID>] [name <åç§°>] [private yes|no] "
+"[hidden yes|no]\n"
+"\n"
+"  wifi hotspot [ifname <接å£åç§°>] [con-name <åç§°>] [ssid <SSID>] [band a|"
+"bg] [channel <频段>] [password <密ç >]\n"
+"\n"
+"  wifi rescan [ifname <接å£åç§°>] [[ssid <è¦æ‰«æçš„ SSID>] ...]\n"
+"\n"
+"  lldp [list [ifname <接å£åç§°>]]\n"
 "\n"
 
 #: ../clients/cli/devices.c:305
@@ -4129,15 +4165,14 @@ msgid ""
 msgstr ""
 "用法:nmcli device status { help }\n"
 "\n"
-"显示所有设备的状æ€ã€‚\n"
-"默认情况下显示以下æ ï¼š\n"
-" DEVICE     - interface name\n"
-" TYPE       - device type\n"
-" STATE      - device state\n"
-" CONNECTION - connection activated on device (if any)\n"
-"å¯ä½¿ç”¨ '--fields' 全局选项更改显示æ ã€‚ 'status' 是\n"
-"é»˜è®¤å‘½ä»¤ï¼Œæ„æ€æ˜¯ 'nmcli device' 调用 'nmcli device status'。\n"
-"\n"
+"显示全部设备的状æ€ã€‚\n"
+"默认情况下,显示下列:\n"
+" DEVICE     - 接å£åç§°\n"
+" TYPE       - 设备类型\n"
+" STATE      - 设备状æ€\n"
+" CONNECTION - 设备上激活的连接(如果有的è¯ï¼‰\n"
+"显示哪些列å¯ä»¥é€šè¿‡â€œ--fieldsâ€å…¨å±€é€‰é¡¹æ”¹å˜ã€‚\n"
+"“status†是默认命令,也就是说 “nmcli device†会调用 “nmcli device statusâ€ã€‚\n"
 
 #: ../clients/cli/devices.c:320
 #, c-format
@@ -4180,28 +4215,8 @@ msgstr ""
 "它也将考虑哪些没有设定为 set to auto-connect 的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:343
-#, fuzzy, c-format
-msgid ""
-"Usage: nmcli device reapply { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := <ifname> ...\n"
-"\n"
-"Attempts to update device with changes to the currently active connection\n"
-"made since it was last applied.\n"
-"\n"
-msgstr ""
-"用法:nmcli device disconnect { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := <ifname>\n"
-"\n"
-"断开该设备。\n"
-"该命令断开该设备并方å¼å…¶åœ¨æ²¡æœ‰ç”¨æˆ·/èœå•\n"
-"互动的情况下自动激活进一步的连接。\n"
-"\n"
-
 #: ../clients/cli/devices.c:354
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
@@ -4214,15 +4229,14 @@ msgid ""
 msgstr ""
 "用法:nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"傿•°ï¼š= <ifname> ...\n"
 "\n"
-"断开该设备。\n"
-"该命令断开该设备并方å¼å…¶åœ¨æ²¡æœ‰ç”¨æˆ·/èœå•\n"
-"互动的情况下自动激活进一步的连接。\n"
+"断开设备。\n"
+"命令断开设备连接并阻止他在没有用户/手动干预的情况下自动激活继续连接。\n"
 "\n"
 
 #: ../clients/cli/devices.c:366
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
 "\n"
@@ -4234,151 +4248,13 @@ msgid ""
 "command.\n"
 "\n"
 msgstr ""
-"用法:nmcli device show { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [<ifname>]\n"
-"\n"
-"显示设备详情。\n"
-"该命令列出所有设备或者给定设备详情。\n"
-"\n"
-
-#: ../clients/cli/devices.c:379
-#, c-format
-msgid ""
-"Usage: nmcli device set { ARGUMENTS | help }\n"
+"用法:nmcli device delete { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
-"DEVICE    := [ifname] <ifname> \n"
-"PROPERTY  := { autoconnect { yes | no } |\n"
-"             { managed { yes | no }\n"
+"傿•°ï¼š= <ifname> ...\n"
 "\n"
-"Modify device properties.\n"
-"\n"
-msgstr ""
-
-#: ../clients/cli/devices.c:392
-#, fuzzy, c-format
-msgid ""
-"Usage: nmcli device monitor { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [<ifname>] ...\n"
-"\n"
-"Monitor device activity.\n"
-"This command prints a line whenever the specified devices change state.\n"
-"Monitors all devices in case no interface is specified.\n"
-"\n"
-msgstr ""
-"用法:nmcli device show { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [<ifname>]\n"
-"\n"
-"显示设备详情。\n"
-"该命令列出所有设备或者给定设备详情。\n"
-"\n"
-
-#: ../clients/cli/devices.c:404
-#, fuzzy, c-format
-msgid ""
-"Usage: nmcli device wifi { ARGUMENTS | help }\n"
-"\n"
-"Perform operation on Wi-Fi devices.\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
-"\n"
-"List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
-"used to list APs for a particular interface, or with a specific BSSID.\n"
-"\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
-"yes|no]\n"
-"\n"
-"Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
-"a new connection and then activates it on a device. This is a command-line\n"
-"counterpart of clicking an SSID in a GUI client. The command always creates\n"
-"a new connection and thus it is mainly useful for connecting to new Wi-Fi\n"
-"networks. If a connection for the network already exists, it is better to\n"
-"bring up the existing profile as follows: nmcli con up id <name>. Note that\n"
-"only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
-"assumed that IP configuration is obtained via DHCP.\n"
-"\n"
-"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
-"                          [band a|bg] [channel <channel>] [password "
-"<password>]\n"
-"\n"
-"Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
-"to stop the hotspot.\n"
-"Parameters of the hotspot can be influenced by the optional parameters:\n"
-"ifname - Wi-Fi device to use\n"
-"con-name - name of the created hotspot connection profile\n"
-"ssid - SSID of the hotspot\n"
-"band - Wi-Fi band to use\n"
-"channel - Wi-Fi channel to use\n"
-"password - password to use for the hotspot\n"
-"\n"
-"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
-"\n"
-"Request that NetworkManager immediately re-scan for available access "
-"points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
-"might\n"
-"be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
-"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
-"be\n"
-"given. Note that this command does not show the APs,\n"
-"use 'nmcli device wifi list' for that.\n"
-"\n"
-msgstr ""
-"用法:nmcli device wifi { ARGUMENTS | help }\n"
-"\n"
-"在 Wi-Fi 失败中执行æ“作。\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
-"\n"
-"列出å¯ç”¨ Wi-Fi 接入点。å¯ä½¿ç”¨ 'ifname' å’Œ 'bssid' 选项\n"
-"åˆ—å‡ºå…·ä½“æŽ¥å£æˆ–者指定 BSSID çš„ AP。\n"
-"\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
-"phrase] [ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
-"\n"
-"连接到由 SSID 或者 BSSID 指定的 Wi-Fi 网络。该命令生æˆ\n"
-"新连接并在设备中将其激活。这是在 GUI 客户端\n"
-"中点击 SSID å½¢æˆçš„命令行副本。该命令总是生æˆä¸€ä¸ª\n"
-"新连接,因此主è¦ç”¨äºŽè¿žæŽ¥åˆ°æ–° Wi-Fi\n"
-"网络。如果该网络已存在,最好使用如下\n"
-"已存在的侧写:nmcli con up id <name>. 注:\n"
-"ç›®å‰åªæ”¯æŒ Openã€WEP å’Œ WPA-PSK ç½‘ç»œã€‚åŒæ—¶ä¹Ÿå‡è®¾\n"
-"通过 DHCP 获得 IP é…置。\n"
-"\n"
-"ARGUMENTS := rescan [[ifname] <ifname>]\n"
-"\n"
-"请求 NetworkManager ç«‹å³é‡æ–°æ‰«æå¯ç”¨æŽ¥å…¥ç‚¹ã€‚\n"
-"NetworkManager 周期性扫æ Wi-Fi 网络,但也å¯ä»¥\n"
-"å¯åŠ¨æ‰‹åŠ¨æ‰«æã€‚æ³¨ï¼šè¿™ä¸ªå‘½ä»¤ä¸æ˜¾ç¤º\n"
-"AP,使用 'nmcli device wifi list' 显示 AP。\n"
-"\n"
-
-#: ../clients/cli/devices.c:451
-#, fuzzy, c-format
-msgid ""
-"Usage: nmcli device lldp { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>]]\n"
-"\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can "
-"be\n"
-"used to list neighbors for a particular interface.\n"
-"\n"
-msgstr ""
-"用法:nmcli device wimax { ARGUMENTS | help }\n"
-"\n"
-"在 WiMAX 设备中执行æ“作。\n"
-"\n"
-"ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n"
-"\n"
-"列出å¯ç”¨ WiMAX NSP。å¯ä½¿ç”¨ 'ifname' å’Œ 'nsp' 选项\n"
-"åˆ—å‡ºå…·ä½“æŽ¥å£æˆ–者 NSP 的网络。\n"
+"删除软件设备。\n"
+"该命令删除接å£ã€‚它仅适用于软件的设备(如绑定,桥接等)。\n"
+"硬件设备无法用命令删除。\n"
 "\n"
 
 #: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676
@@ -4386,26 +4262,26 @@ msgstr ""
 #: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2110
 #, c-format
 msgid "Error: No interface specified."
-msgstr "错误:未指定接å£ã€‚"
+msgstr "错误:没有指定接å£ã€‚"
 
 #: ../clients/cli/devices.c:547 ../clients/cli/devices.c:1899
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
-msgstr ""
+msgstr "è­¦å‘Šï¼šå‚æ•° “%s†é‡å¤ã€‚\n"
 
 #: ../clients/cli/devices.c:549 ../clients/cli/devices.c:1901
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Device '%s' not found.\n"
-msgstr "错误:没有找到设备 '%s'。"
+msgstr "错误:没有找到设备 “%sâ€ã€‚\n"
 
 #: ../clients/cli/devices.c:550 ../clients/cli/devices.c:1902
-#, fuzzy, c-format
+#, c-format
 msgid "Error: not all devices found."
-msgstr "错误:未找到 Wi-Fi 设备。"
+msgstr "错误:没有找到所有设备。"
 
 #: ../clients/cli/devices.c:650 ../clients/cli/devices.c:801
 msgid "(none)"
-msgstr "(æ— )"
+msgstr "(无)"
 
 #: ../clients/cli/devices.c:719
 #, c-format
@@ -4431,11 +4307,11 @@ msgstr "Ad-Hoc"
 
 #: ../clients/cli/devices.c:761
 msgid "Infra"
-msgstr "Infra"
+msgstr "红外"
 
 #: ../clients/cli/devices.c:762
 msgid "N/A"
-msgstr "N/A"
+msgstr "ä¸å¯ç”¨"
 
 #: ../clients/cli/devices.c:916
 msgid "Device details"
@@ -4444,11 +4320,11 @@ msgstr "设备详情"
 #: ../clients/cli/devices.c:928
 #, c-format
 msgid "Error: 'device show': %s"
-msgstr "错误:'device show': %s"
+msgstr "错误:“device showâ€ï¼š%s"
 
 #: ../clients/cli/devices.c:980 ../clients/cli/devices.c:983
 msgid "(unknown)"
-msgstr "(未知)"
+msgstr "(未知)"
 
 #: ../clients/cli/devices.c:1024
 #, c-format
@@ -4466,7 +4342,7 @@ msgstr "å…³"
 #: ../clients/cli/devices.c:1342
 #, c-format
 msgid "Error: 'device status': %s"
-msgstr "错误:'device status': %s"
+msgstr "错误:“dev statusâ€: %s"
 
 #. Add headers
 #: ../clients/cli/devices.c:1349
@@ -4476,160 +4352,100 @@ msgstr "设备状æ€"
 #: ../clients/cli/devices.c:1380 ../clients/cli/devices.c:3509
 #, c-format
 msgid "Error: invalid extra argument '%s'."
-msgstr "错误:无效é¢å¤–傿•°E '%s'。"
+msgstr "错误:无效的é¢å¤–傿•°â€œ%sâ€ã€‚"
 
 #: ../clients/cli/devices.c:1397 ../clients/cli/devices.c:1707
 #: ../clients/cli/devices.c:2126 ../clients/cli/devices.c:2396
 #: ../clients/cli/devices.c:3548
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "错误:没有找到设备 '%s'。"
+msgstr "错误:没有找到设备“%sâ€ã€‚"
 
 #: ../clients/cli/devices.c:1475
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
-msgstr "æˆåŠŸï¼šæˆåŠŸæ¿€æ´»è®¾å¤‡ '%s'。"
+msgstr "设备 “%s†已æˆåŠŸç”±â€œ%sâ€æ¿€æ´» 。\n"
 
 #: ../clients/cli/devices.c:1481
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
-msgstr "错误:连接激活失败:(%d)%s。"
-
-#: ../clients/cli/devices.c:1517
-#, fuzzy, c-format
-msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
-msgstr "错误:设定主机å失败:(%d) %s"
+msgstr "错误:连接激活失败:(%d) %s。\n"
 
 #: ../clients/cli/devices.c:1520
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr "错误:添加/激活新连接失败:(%d)%s"
-
-#: ../clients/cli/devices.c:1530
-#, fuzzy, c-format
-msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "错误:设定主机å失败:(%d) %s"
+msgstr "错误:无法增加/激活新连接:%s"
 
 #: ../clients/cli/devices.c:1532
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
-msgstr "错误:添加/激活新连接失败:未知错误"
+msgstr "错误:无法添加/激活新连接:未知错误"
 
 #: ../clients/cli/devices.c:1544
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "使用 UUI的 '%s' 连接,并在设备 '%s' 中激活。\n"
-
-#: ../clients/cli/devices.c:1547
-#, fuzzy, c-format
-msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "使用 UUI的 '%s' 连接,并在设备 '%s' 中激活。\n"
+msgstr "UUID 为“%sâ€çš„连接已创建并在设备“%sâ€ä¸Šæ¿€æ´»\n"
 
 #: ../clients/cli/devices.c:1611
 #, c-format
 msgid "Error: Device activation failed: %s"
-msgstr "错误:设备激活失败:%s"
+msgstr "错误:激活设备失败:%s"
 
 #: ../clients/cli/devices.c:1620
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Device activation failed: device was disconnected"
-msgstr "错误:设备激活失败:%s"
+msgstr "错误:设备激活失败:设备断开连接"
 
 #: ../clients/cli/devices.c:1635
 #, c-format
 msgid "Device '%s' has been connected.\n"
-msgstr "已连接设备 '%s'。\n"
+msgstr "设备“%sâ€å·²è¿žæŽ¥ã€‚\n"
 
 #: ../clients/cli/devices.c:1691
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
-msgstr "错误:ä¸å…许的é¢å¤–傿•° '%s'。"
+msgstr "错误:ä¸å…许的é¢å¤–傿•° “%sâ€ã€‚"
 
 #: ../clients/cli/devices.c:1776 ../clients/cli/devices.c:1791
 #: ../clients/cli/devices.c:1964
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' successfully disconnected.\n"
-msgstr "æˆåŠŸï¼šæˆåŠŸæ–­å¼€è®¾å¤‡ '%s'。"
+msgstr "设备 “%s†æˆåŠŸæ–­å¼€ã€‚\n"
 
 #: ../clients/cli/devices.c:1779
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' successfully removed.\n"
-msgstr "æˆåŠŸï¼šæˆåŠŸæ¿€æ´»è®¾å¤‡ '%s'。"
-
-#: ../clients/cli/devices.c:1838
-#, fuzzy, c-format
-msgid "Error: not all connections reapplied."
-msgstr "错误:未指定连接。"
-
-#: ../clients/cli/devices.c:1839
-#, fuzzy, c-format
-msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
-msgstr "错误:断开设备 '%s'(%s)失败:%s"
-
-#: ../clients/cli/devices.c:1849
-#, fuzzy, c-format
-msgid "Connection successfully reapplied to device '%s'.\n"
-msgstr "æˆåŠŸæ¿€æ´»çš„è¿žæŽ¥ï¼ˆD-Bus 激活路径:%s)\n"
+msgstr "设备 “%s†æˆåŠŸåˆ é™¤ã€‚\n"
 
 #: ../clients/cli/devices.c:1912
-#, fuzzy, c-format
+#, c-format
 msgid "Error: no valid device provided."
-msgstr "错误:未找到 Wi-Fi 设备。"
+msgstr "错误:没有æä¾›æœ‰æ•ˆçš„设备。"
 
 #: ../clients/cli/devices.c:1949
-#, fuzzy, c-format
+#, c-format
 msgid "Error: not all devices disconnected."
-msgstr "错误:未找到 Wi-Fi 设备。"
+msgstr "é”™è¯¯ï¼šä¸æ˜¯æ‰€æœ‰çš„设备断开连接。"
 
 #: ../clients/cli/devices.c:1950
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
-msgstr "错误:断开设备 '%s'(%s)失败:%s"
+msgstr "错误:断开设备 “%sâ€(%s)失败:%s\n"
 
 #: ../clients/cli/devices.c:2025
-#, fuzzy, c-format
+#, c-format
 msgid "Error: not all devices deleted."
-msgstr "错误:未找到 Wi-Fi 设备。"
+msgstr "é”™è¯¯ï¼šä¸æ˜¯æ‰€æœ‰çš„设备被删除。"
 
 #: ../clients/cli/devices.c:2026
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
-msgstr "错误:断开设备 '%s'(%s)失败:%s"
-
-#: ../clients/cli/devices.c:2132
-#, fuzzy, c-format
-msgid "Error: No property specified."
-msgstr "错误:未指定连接。"
+msgstr "错误:设备 “%sâ€(%s) 删除失败:%s\n"
 
 #: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159
 #, c-format
 msgid "Error: '%s' argument is missing."
-msgstr "错误:缺少 '%s' 傿•°ã€‚"
-
-#: ../clients/cli/devices.c:2149
-#, fuzzy, c-format
-msgid "Error: 'managed': %s."
-msgstr "错误:'mode': %s。"
-
-#: ../clients/cli/devices.c:2174
-#, fuzzy, c-format
-msgid "Error: property '%s' is not known."
-msgstr "错误:无效属性 '%s': %s。"
-
-#: ../clients/cli/devices.c:2220
-#, fuzzy, c-format
-msgid "%s: using connection '%s'\n"
-msgstr "没有此类连接 '%s'"
-
-#: ../clients/cli/devices.c:2246
-#, c-format
-msgid "%s: device created\n"
-msgstr ""
-
-#: ../clients/cli/devices.c:2253
-#, fuzzy, c-format
-msgid "%s: device removed\n"
-msgstr "设备被删除"
+msgstr "错误:缺少 “%sâ€ å‚æ•°ã€‚"
 
 #: ../clients/cli/devices.c:2339
 msgid "Wi-Fi scan list"
@@ -4638,171 +4454,91 @@ msgstr "Wi-Fi 扫æåˆ—表"
 #: ../clients/cli/devices.c:2377
 #, c-format
 msgid "Error: 'device wifi': %s"
-msgstr "错误:'device wifi': %s"
+msgstr "错误:“device wifiâ€ï¼š%s"
 
 #: ../clients/cli/devices.c:2419 ../clients/cli/devices.c:2500
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
-msgstr "错误:未找到 bssid '%s' 的接入点。"
+msgstr "错误:未找到 bssid 是“%sâ€çš„访问点。"
 
 #: ../clients/cli/devices.c:2446
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr "错误:设备 '%s' 䏿˜¯ä¸€ä¸ª Wi-Fi 设备。"
+msgstr ""
+"错误:设备 “%s†未被识别为 Wi-Fi 设备,检查 NetworkManager Wi-Fi æ’件。"
 
 #: ../clients/cli/devices.c:2448 ../clients/cli/devices.c:2780
 #: ../clients/cli/devices.c:3200 ../clients/cli/devices.c:3349
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
-msgstr "错误:设备 '%s' 䏿˜¯ä¸€ä¸ª Wi-Fi 设备。"
+msgstr "错误:设备“%sâ€ä¸æ˜¯ Wi-Fi 设备。"
 
 #: ../clients/cli/devices.c:2660
 msgid "SSID or BSSID: "
-msgstr "SSID 或者 BSSID:"
+msgstr "SSID 或 BSSID:"
 
 #: ../clients/cli/devices.c:2665
 #, c-format
 msgid "Error: SSID or BSSID are missing."
-msgstr "错误:缺少 SSID 或者 BSSID。"
+msgstr "错误:缺少 SSID/BSSID。"
 
 #: ../clients/cli/devices.c:2689
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
-msgstr "错误:bssid 傿•°å€¼ '%s' 是一个无效 BSSID。"
+msgstr "错误:bssid 傿•°å€¼â€œ%sâ€ä¸ºæ— æ•ˆ BSSID。"
 
 #: ../clients/cli/devices.c:2713
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr "错误:wep-key-type 傿•°å€¼ '%s' 无效,请使用 'key' 或者 'phrase'。"
+msgstr "错误:wep-key-type 傿•°å€¼â€œ%sâ€æ— æ•ˆï¼Œè¯·ä½¿ç”¨â€œkeyâ€æˆ–“phraseâ€ã€‚"
 
 #: ../clients/cli/devices.c:2733 ../clients/cli/devices.c:2746
 #, c-format
 msgid "Error: %s: %s."
-msgstr "错误:%s: %s。"
+msgstr "错误:%s:%s。"
 
 #: ../clients/cli/devices.c:2761
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr "错误:BSSID 连接的(%s)与 bssid 傿•°ï¼ˆ%s)ä¸åŒã€‚"
+msgstr "错误:è¦è¿žæŽ¥çš„ BSSID (%s) 与 bssid 傿•°ä¸­çš„(%s)ä¸åŒã€‚"
 
 #: ../clients/cli/devices.c:2767
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
-msgstr "é”™è¯¯ï¼šå‚æ•° '%s' 䏿˜¯ SSIDï¼Œä¹Ÿä¸æ˜¯ BSSID。"
+msgstr "é”™è¯¯ï¼šå‚æ•°â€œ%sâ€ä¸æ˜¯ SSID 或 BSSID。"
 
 #: ../clients/cli/devices.c:2782 ../clients/cli/devices.c:3202
 #: ../clients/cli/devices.c:3351
 #, c-format
 msgid "Error: No Wi-Fi device found."
-msgstr "错误:未找到 Wi-Fi 设备。"
-
-#: ../clients/cli/devices.c:2802
-#, fuzzy, c-format
-msgid "Error: Failed to scan hidden SSID: %s."
-msgstr "错误:修改 %s 失败。%s: %s。"
+msgstr "错误:未å‘现 Wi-Fi 设备。"
 
 #: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: No network with SSID '%s' found."
-msgstr "错误:未找到 SSID 为 '%s' 的网络。"
+msgstr "错误:未å‘现 SSID 是“%sâ€çš„网络。"
 
 #: ../clients/cli/devices.c:2829
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
-msgstr "错误:未找到 BSSID '%s' 的接入点。"
-
-#: ../clients/cli/devices.c:2871
-#, c-format
-msgid ""
-"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr ""
+msgstr "错误:未找到 BSSID 是“%sâ€çš„访问点。"
 
 #: ../clients/cli/devices.c:2885
 msgid "Password: "
 msgstr "密ç ï¼š"
 
-#: ../clients/cli/devices.c:3034
-#, fuzzy, c-format
-msgid "'%s' is not valid WPA PSK"
-msgstr "'%s' 是无效 PSK"
-
-#: ../clients/cli/devices.c:3051
-#, fuzzy, c-format
-msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr "'%s' 长度无效(应为 5 或者 6 个数字)"
-
-#: ../clients/cli/devices.c:3067
-#, c-format
-msgid "Hotspot password: %s\n"
-msgstr ""
-
-#: ../clients/cli/devices.c:3125
-#, fuzzy, c-format
-msgid "Error: ssid is too long."
-msgstr "错误:ä¸éœ€è¦ 'ssid'。"
-
-#: ../clients/cli/devices.c:3137
-#, fuzzy, c-format
-msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr "错误:wep-key-type 傿•°å€¼ '%s' 无效,请使用 'key' 或者 'phrase'。"
-
-#: ../clients/cli/devices.c:3161
-#, fuzzy, c-format
-msgid "Error: Unknown parameter %s."
-msgstr "æœªçŸ¥å‚æ•°ï¼š%s\n"
-
-#: ../clients/cli/devices.c:3180
-#, fuzzy, c-format
-msgid "Error: channel requires band too."
-msgstr "é”™è¯¯ï¼šéœ€è¦ 'apn'。"
-
-#: ../clients/cli/devices.c:3186
-#, fuzzy, c-format
-msgid "Error: channel '%s' not valid for band '%s'."
-msgstr "错误:'channel': '%s' 无效;使用 <1-13>。"
-
-#: ../clients/cli/devices.c:3214
-#, fuzzy, c-format
-msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr "错误:设备 '%s' 䏿˜¯ä¸€ä¸ª Wi-Fi 设备。"
-
-#: ../clients/cli/devices.c:3249
-#, fuzzy, c-format
-msgid "Error: Invalid 'password': %s."
-msgstr "错误:无效属性 '%s': %s。"
-
-#: ../clients/cli/devices.c:3318
-#, fuzzy, c-format
-msgid "Error: '%s' cannot repeat."
-msgstr "错误:'%s' 设置未出现\n"
-
 #: ../clients/cli/devices.c:3399
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
-msgstr "错误:'device wifi' 命令 '%s' 无效。"
+msgstr "错误:“device wifiâ€å‘½ä»¤â€œ%sâ€æ— æ•ˆã€‚"
 
-#. Main header name
-#: ../clients/cli/devices.c:3425
-msgid "Device LLDP neighbors"
-msgstr ""
-
-#: ../clients/cli/devices.c:3528
-#, fuzzy, c-format
-msgid "Error: 'device lldp list': %s"
-msgstr "错误:'device status': %s"
-
-#: ../clients/cli/devices.c:3575
-#, fuzzy, c-format
-msgid "Error: 'device lldp' command '%s' is not valid."
-msgstr "错误:'device wifi' 命令 '%s' 无效。"
-
-#: ../clients/cli/devices.c:3770
+#: ../clients/cli/devices.c:3767
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "错误:'dev' 命令 '%s' 无效。"
+msgstr "错误:“devâ€å‘½ä»¤â€œ%sâ€æ— æ•ˆã€‚"
 
 #: ../clients/cli/general.c:34
 msgid "RUNNING"
@@ -4811,22 +4547,22 @@ msgstr "è¿è¡Œä¸­"
 #. 0
 #: ../clients/cli/general.c:35
 msgid "VERSION"
-msgstr "VERSION"
+msgstr "版本"
 
 #. 2
 #: ../clients/cli/general.c:37
 msgid "STARTUP"
-msgstr "STARTUP"
+msgstr "å¯åЍ"
 
 #. 3
 #: ../clients/cli/general.c:38
 msgid "CONNECTIVITY"
-msgstr "CONNECTIVITY"
+msgstr "连接"
 
 #. 4
 #: ../clients/cli/general.c:39
 msgid "NETWORKING"
-msgstr "NETWORKING"
+msgstr "网络"
 
 #. 5
 #: ../clients/cli/general.c:40
@@ -4860,21 +4596,21 @@ msgstr "WIMAX"
 
 #: ../clients/cli/general.c:61
 msgid "PERMISSION"
-msgstr "PERMISSION"
+msgstr "æƒé™"
 
 #. 0
 #: ../clients/cli/general.c:62
 msgid "VALUE"
-msgstr "VALUE"
+msgstr "值"
 
 #: ../clients/cli/general.c:70
 msgid "LEVEL"
-msgstr "LEVEL"
+msgstr "级别"
 
 #. 0
 #: ../clients/cli/general.c:71
 msgid "DOMAINS"
-msgstr "DOMAINS"
+msgstr "域"
 
 #: ../clients/cli/general.c:85
 #, c-format
@@ -4918,7 +4654,7 @@ msgstr ""
 "用法:nmcli general status { help }\n"
 "\n"
 "显示 NetworkManager 的总体状æ€ã€‚\n"
-"'status' æ˜¯é»˜è®¤åŠ¨ä½œï¼Œå³ 'nmcli gen' 调用 'nmcli gen status'\n"
+"“statusâ€ æ˜¯é»˜è®¤åŠ¨ä½œï¼Œå³ â€œnmcli gen†调用 “nmcli gen statusâ€\n"
 "\n"
 
 #: ../clients/cli/general.c:105
@@ -5049,28 +4785,7 @@ msgstr ""
 "ARGUMENTS := [check]\n"
 "\n"
 "获得网络连接性状æ€ã€‚\n"
-"å¯é€‰çš„ 'check' 傿•°å¯è®© NetworkManager 釿–°æ£€æŸ¥è¿žæŽ¥æ€§ã€‚\n"
-"\n"
-
-#: ../clients/cli/general.c:176
-#, fuzzy, c-format
-msgid ""
-"Usage: nmcli radio { COMMAND | help }\n"
-"\n"
-"COMMAND := { all | wifi | wwan }\n"
-"\n"
-"  all | wifi | wwan [ on | off ]\n"
-"\n"
-msgstr ""
-"用法:nmcli radio { COMMAND | help }\n"
-"\n"
-"COMMAND := { all | wifi | wwan | wimax }\n"
-"\n"
-"  all | wifi | wwan | wimax [ on | off ]\n"
-"\n"
-"COMMAND := { all | wifi | wwan }\n"
-"\n"
-"  all | wifi | wwan [ on | off ]\n"
+"å¯é€‰çš„ “checkâ€ å‚æ•°å¯è®© NetworkManager 釿–°æ£€æŸ¥è¿žæŽ¥æ€§ã€‚\n"
 "\n"
 
 #: ../clients/cli/general.c:185
@@ -5124,16 +4839,6 @@ msgstr ""
 "获得移动宽带å•选按钮状æ€ï¼Œæˆ–者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:215
-#, c-format
-msgid ""
-"Usage: nmcli monitor\n"
-"\n"
-"Monitor NetworkManager changes.\n"
-"Prints a line whenever a change occurs in NetworkManager\n"
-"\n"
-msgstr ""
-
 #: ../clients/cli/general.c:233
 msgid "asleep"
 msgstr "ç¡çœ "
@@ -5144,11 +4849,11 @@ msgstr "连接中"
 
 #: ../clients/cli/general.c:237
 msgid "connected (local only)"
-msgstr "已连接(åªåœ¨æœ¬åœ°ï¼‰"
+msgstr "已连接(仅本地)"
 
 #: ../clients/cli/general.c:239
 msgid "connected (site only)"
-msgstr "已连接(åªåœ¨ç½‘站)"
+msgstr "已连接(仅站点)"
 
 #: ../clients/cli/general.c:243
 msgid "disconnecting"
@@ -5160,341 +4865,248 @@ msgstr "å…¥å£"
 
 #: ../clients/cli/general.c:281
 msgid "limited"
-msgstr "有é™çš„"
+msgstr "å—é™"
 
 #: ../clients/cli/general.c:283
 msgid "full"
-msgstr "全部"
+msgstr "完全"
 
 #: ../clients/cli/general.c:334
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "错误:åªå…许使用这些字段:%s"
 
-#: ../clients/cli/general.c:360
+#: ../clients/cli/general.c:357
 msgid "NetworkManager status"
 msgstr "网络管ç†å™¨çжæ€"
 
-#: ../clients/cli/general.c:365
+#: ../clients/cli/general.c:362
 msgid "running"
 msgstr "è¿è¡Œä¸­"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "starting"
-msgstr "å¯åЍ䏭"
+msgstr "正在å¯åЍ"
 
-#: ../clients/cli/general.c:368
+#: ../clients/cli/general.c:365
 msgid "started"
-msgstr "å·²å¯åЍ"
+msgstr "开始时间"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "enabled"
 msgstr "å·²å¯ç”¨"
 
-#: ../clients/cli/general.c:370 ../clients/cli/general.c:371
-#: ../clients/cli/general.c:372 ../clients/cli/general.c:373
-#: ../clients/cli/general.c:374
+#: ../clients/cli/general.c:367 ../clients/cli/general.c:368
+#: ../clients/cli/general.c:369 ../clients/cli/general.c:370
+#: ../clients/cli/general.c:371
 msgid "disabled"
 msgstr "å·²ç¦ç”¨"
 
-#: ../clients/cli/general.c:446
+#: ../clients/cli/general.c:443
 msgid "auth"
 msgstr "认è¯"
 
-#: ../clients/cli/general.c:475
+# XXX: 这里考虑一下è¦ä¸è¦ç¿»è¯‘
+# XXX: Should we translate this?
+#: ../clients/cli/general.c:472
 #, c-format
 msgid "Error: 'general permissions': %s"
-msgstr "错误:'general permissions': %s"
+msgstr "错误:“general permissionsâ€: %s"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:486
 msgid "NetworkManager permissions"
-msgstr "NetworkManager æƒé™"
+msgstr "网络管ç†å™¨æƒé™"
 
-#: ../clients/cli/general.c:530
+#: ../clients/cli/general.c:527
 #, c-format
 msgid "Error: 'general logging': %s"
-msgstr "错误:'general logging': %s"
+msgstr "错误:“general loggingâ€: %s"
 
-#: ../clients/cli/general.c:545
+#: ../clients/cli/general.c:542
 msgid "NetworkManager logging"
 msgstr "NetworkManager 日志"
 
-#: ../clients/cli/general.c:567
-#, fuzzy, c-format
+#: ../clients/cli/general.c:564
+#, c-format
 msgid "Error: failed to set hostname: %s"
-msgstr "错误:设定主机å失败:(%d) %s"
+msgstr "错误:无法设置主机å:%s"
 
-#: ../clients/cli/general.c:680
-#, fuzzy, c-format
+#: ../clients/cli/general.c:677
+#, c-format
 msgid "Error: failed to set logging: %s"
-msgstr "错误:拒ç»è®¾ç½®æ—¥å¿—的访问;%s"
+msgstr "错误:无法设置日志:%s"
 
-#: ../clients/cli/general.c:689
+#: ../clients/cli/general.c:686
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
-msgstr "错误:'general' 命令 '%s' 无效。"
+msgstr "错误:“general†命令 “%s†无效。"
 
-#: ../clients/cli/general.c:707
+#: ../clients/cli/general.c:704
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
-msgstr "错误:'--fields' 值 '%s' 在此无效(å…许的字段:%s)"
+msgstr "错误:“--fieldsâ€å€¼â€œ%sâ€åœ¨æ­¤æ— æ•ˆ(å…许的字段:%s)"
 
-#: ../clients/cli/general.c:732
+#: ../clients/cli/general.c:729
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
-msgstr "错误:无效 '%s' 傿•°ï¼š'%s'(使用 on/off)。"
+msgstr "错误:无效的“%sâ€å‚数:“%sâ€ï¼ˆä½¿ç”¨ on/off)。"
 
-#: ../clients/cli/general.c:743
+#: ../clients/cli/general.c:740
 msgid "Connectivity"
-msgstr "连接性"
+msgstr "连接"
 
-#: ../clients/cli/general.c:758
+#: ../clients/cli/general.c:755
 msgid "Networking"
-msgstr "è”网"
+msgstr "网络"
 
-#: ../clients/cli/general.c:783
+#: ../clients/cli/general.c:780
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
-msgstr "错误:'networking connectivity' 命令 '%s' 无效。"
+msgstr "错误:“networking connectivity†命令 “%s†无效。"
 
-#: ../clients/cli/general.c:799
+#: ../clients/cli/general.c:796
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
-msgstr "错误:'networking' 命令 '%s' 无效。"
+msgstr "错误:“networking†命令 “%s†无效。"
 
-#: ../clients/cli/general.c:828 ../clients/cli/general.c:848
+#: ../clients/cli/general.c:825 ../clients/cli/general.c:845
 msgid "Radio switches"
-msgstr "收音机开关"
+msgstr "无线开关"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:866
+#: ../clients/cli/general.c:863
 msgid "Wi-Fi radio switch"
-msgstr "Wi-Fi 收音机开关"
+msgstr "Wi-Fi 无线开关"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:882
+#: ../clients/cli/general.c:879
 msgid "WWAN radio switch"
-msgstr "WWAN 收音机开关"
+msgstr "WWAN 无线开关"
 
-#: ../clients/cli/general.c:893
+#: ../clients/cli/general.c:890
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
-msgstr "错误:'radio' 命令 '%s' 无效。"
+msgstr "错误:“radio†命令 “%s†无效。"
 
-#: ../clients/cli/general.c:914
-#, fuzzy
+#: ../clients/cli/general.c:911
 msgid "NetworkManager has started"
-msgstr "网络管ç†å™¨çжæ€"
+msgstr "网络管ç†å™¨å·²å¯åЍ"
 
-#: ../clients/cli/general.c:917
-#, fuzzy
+#: ../clients/cli/general.c:914
 msgid "NetworkManager has stopped"
-msgstr "网络管ç†å™¨çжæ€"
-
-#: ../clients/cli/general.c:931
-#, fuzzy, c-format
-msgid "Hostname set to '%s'\n"
-msgstr "将主机å设定为 '%s'"
-
-#: ../clients/cli/general.c:946
-#, fuzzy, c-format
-msgid "'%s' is now the primary connection\n"
-msgstr "该连接中未显示设置 '%s'。\n"
-
-#: ../clients/cli/general.c:948
-#, fuzzy, c-format
-msgid "There's no primary connection\n"
-msgstr "确认连接:%s\n"
-
-#: ../clients/cli/general.c:960
-#, fuzzy, c-format
-msgid "Connectivity is now '%s'\n"
-msgstr "连接性"
-
-#: ../clients/cli/general.c:973
-#, fuzzy, c-format
-msgid "Networkmanager is now in the '%s' state\n"
-msgstr "NetworkManager 未è¿è¡Œã€‚"
-
-#: ../clients/cli/general.c:984
-#, fuzzy, c-format
-msgid "Error: 'monitor' command '%s' is not valid."
-msgstr "错误:'radio' 命令 '%s' 无效。"
-
-#: ../clients/cli/general.c:998
-#, fuzzy
-msgid "Networkmanager is not running (waiting for it)\n"
-msgstr "NetworkManager 未è¿è¡Œã€‚"
+msgstr "网络管ç†å™¨å·²åœæ­¢"
 
-#: ../clients/cli/nmcli.c:83
-#, fuzzy, 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"
-"  -c[olors] auto|yes|no                      whether to use colors in "
-"output\n"
-"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
-"  -e[scape] yes|no                           escape columns separators in "
-"values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
-"  -a[sk]                                     ask for missing parameters\n"
-"  -s[how-secrets]                            allow displaying passwords\n"
-"  -w[ait] <seconds>                          set timeout waiting for "
-"finishing operations\n"
-"  -v[ersion]                                 show program version\n"
-"  -h[elp]                                    print this help\n"
-"\n"
-"OBJECT\n"
-"  g[eneral]       NetworkManager's general status and operations\n"
-"  n[etworking]    overall networking control\n"
-"  r[adio]         NetworkManager radio switches\n"
-"  c[onnection]    NetworkManager's connections\n"
-"  d[evice]        devices managed by NetworkManager\n"
-"  a[gent]         NetworkManager secret agent or polkit agent\n"
-"  m[onitor]       monitor NetworkManager changes\n"
-"\n"
-msgstr ""
-"用法:%s [OPTIONS] OBJECT { COMMAND | help }\n"
-"\n"
-"OPTIONS\n"
-"  -t[erse]                                   terse output\n"
-"  -p[retty]                                  pretty output\n"
-"  -m[ode] tabular|multiline                  output mode\n"
-"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
-"  -e[scape] yes|no                           escape columns separators in "
-"values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
-"  -a[sk]                                     ask for missing parameters\n"
-"  -w[ait] <seconds>                          set timeout waiting for "
-"finishing operations\n"
-"  -v[ersion]                                 show program version\n"
-"  -h[elp]                                    print this help\n"
-"\n"
-"OBJECT\n"
-"  g[eneral]       NetworkManager's general status and operations\n"
-"  n[etworking]    overall networking control\n"
-"  r[adio]         NetworkManager radio switches\n"
-"  c[onnection]    NetworkManager's connections\n"
-"  d[evice]        devices managed by NetworkManager\n"
-"\n"
-
-#: ../clients/cli/nmcli.c:143
+#: ../clients/cli/nmcli.c:142
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "错误:对象 '%s' 未知,å°è¯• 'nmcli help'。"
+msgstr "错误:对象“%sâ€æœªçŸ¥ï¼Œè¯·å°è¯•“nmcli helpâ€ã€‚"
 
-#: ../clients/cli/nmcli.c:173
+#: ../clients/cli/nmcli.c:172
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "错误:第二次指定选项 '--terse'。"
+msgstr "错误:第二次指定选项 “--terseâ€ã€‚"
 
-#: ../clients/cli/nmcli.c:178
+#: ../clients/cli/nmcli.c:177
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "错误:选项 '--terse' 与 '--pretty' 相互排斥。"
+msgstr "错误:选项 “--terse†与 “--pretty†相互排斥。"
 
-#: ../clients/cli/nmcli.c:186
+#: ../clients/cli/nmcli.c:185
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "错误:第二次指定选项 '--pretty'。"
+msgstr "错误:第二次指定选项 “--prettyâ€ã€‚"
 
-#: ../clients/cli/nmcli.c:191
+#: ../clients/cli/nmcli.c:190
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "错误:选项 '--pretty' 与 '--terse' 相互排斥。"
+msgstr "错误:选项 “--pretty†与 “--terse†相互排斥。"
 
-#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217
-#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:266
+#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216
+#: ../clients/cli/nmcli.c:234 ../clients/cli/nmcli.c:265
 #, c-format
 msgid "Error: missing argument for '%s' option."
-msgstr "错误:'%s' é€‰é¡¹ç¼ºå°‘å‚æ•°ã€‚"
+msgstr "错误:“%sâ€ é€‰é¡¹ç¼ºå°‘å‚æ•°ã€‚"
 
-#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:227
+#: ../clients/cli/nmcli.c:243
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "错误:'%s' 䏿˜¯ '%s' é€‰é¡¹çš„æœ‰æ•ˆå‚æ•°ã€‚"
+msgstr "错误:“%sâ€ ä¸æ˜¯ “%sâ€ é€‰é¡¹çš„æœ‰æ•ˆå‚æ•°ã€‚"
 
-#: ../clients/cli/nmcli.c:251
+#: ../clients/cli/nmcli.c:250
 #, c-format
 msgid "Error: fields for '%s' options are missing."
-msgstr "错误:缺少 '%s' 选项字段。"
+msgstr "错误:缺少 “%s†选项字段。"
 
-#: ../clients/cli/nmcli.c:271
+#: ../clients/cli/nmcli.c:270
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
-msgstr "错误:'%s' 䏿˜¯ '%s' 选项的有效超时。"
+msgstr "错误:对于 “%2$s†选项,“%1$sâ€ ä¸æ˜¯æœ‰æ•ˆçš„超时。"
 
-#: ../clients/cli/nmcli.c:278
+#: ../clients/cli/nmcli.c:277
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具,版本 %s\n"
 
-#: ../clients/cli/nmcli.c:284
+#: ../clients/cli/nmcli.c:283
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "错误:选项 '%s' 未知,å°è¯• 'nmcli -help'。"
+msgstr "错误:选项 “%s†未知,å°è¯• “nmcli -helpâ€ã€‚"
 
-#: ../clients/cli/nmcli.c:367 ../clients/cli/nmcli.c:377
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:366 ../clients/cli/nmcli.c:376
+#, c-format
 msgid ""
 "\n"
 "Error: nmcli terminated by signal %s (%d)\n"
 msgstr ""
 "\n"
-"错误:nmcli è¢«ä¿¡å· %d 终止。"
+"错误:nmcli ç»ˆæ­¢äºŽä¿¡å· %s (%d)\n"
 
-#: ../clients/cli/nmcli.c:408
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:407
+#, c-format
 msgid "Failed to set signal mask: %d\n"
-msgstr "è®¾å®šä¿¡å·æŽ©ç å¤±è´¥ï¼š%d"
+msgstr "æ— æ³•è®¾ç½®ä¿¡å·æŽ©ç ï¼š%d\n"
 
-#: ../clients/cli/nmcli.c:415
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:414
+#, c-format
 msgid "Failed to create signal handling thread: %d\n"
-msgstr "创建信å·å¤„ç†çº¿ç¨‹å¤±è´¥ï¼š%d"
+msgstr "无法创建信å·å¤„ç†çº¿ç¨‹ï¼š%d\n"
 
-#: ../clients/cli/nmcli.c:512 ../clients/nm-online.c:193
-#, fuzzy, c-format
+#: ../clients/cli/nmcli.c:511 ../clients/nm-online.c:193
+#, c-format
 msgid "Error: Could not create NMClient object: %s."
-msgstr "错误:无法创建 NMClient 对象。"
+msgstr "错误:无法创建 NMClient 对象:%s。"
 
-#: ../clients/cli/nmcli.c:529
+#: ../clients/cli/nmcli.c:528
 msgid "Success"
 msgstr "æˆåŠŸ"
 
 #: ../clients/cli/polkit-agent.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication message: %s\n"
-msgstr "认è¯"
+msgstr "认è¯ä¿¡æ¯ï¼š%s\n"
 
 #: ../clients/cli/polkit-agent.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication error: %s\n"
-msgstr "认è¯"
+msgstr "认è¯é”™è¯¯ï¼š%s\n"
 
 #: ../clients/cli/polkit-agent.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
-msgstr "调制解调器åˆå§‹åŒ–失败"
+msgstr "警告:polkit 代ç†åˆå§‹åŒ–失败:%s\n"
 
 #: ../clients/cli/settings.c:790
-#, fuzzy, c-format
+#, c-format
 msgid "%d (key)"
-msgstr "%d (hex-ascii-key)"
+msgstr "%d(密钥)"
 
 #: ../clients/cli/settings.c:792
-#, fuzzy, c-format
+#, c-format
 msgid "%d (passphrase)"
-msgstr "%d (104/128 ä½å¯†ç çŸ­è¯­)"
+msgstr "%d(密ç çŸ­è¯­ï¼‰"
 
 #: ../clients/cli/settings.c:795 ../clients/cli/settings.c:881
 #, c-format
@@ -5503,24 +5115,23 @@ msgstr "%d (未知)"
 
 #: ../clients/cli/settings.c:824
 msgid "0 (NONE)"
-msgstr "0 (NONE)"
+msgstr "0 (æ— )"
 
 #: ../clients/cli/settings.c:830
 msgid "REORDER_HEADERS, "
-msgstr "REORDER_HEADERS, "
+msgstr "记录头ã€"
 
 #: ../clients/cli/settings.c:832
 msgid "GVRP, "
-msgstr "GVRP, "
+msgstr "GVRPã€"
 
 #: ../clients/cli/settings.c:834
 msgid "LOOSE_BINDING, "
-msgstr "LOOSE_BINDING, "
+msgstr "LOOSE_BINDING, "
 
 #: ../clients/cli/settings.c:836
-#, fuzzy
 msgid "MVRP, "
-msgstr "GVRP, "
+msgstr "MVRPã€"
 
 #: ../clients/cli/settings.c:875
 #, c-format
@@ -5538,59 +5149,59 @@ msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (å·²å¯ç”¨ï¼Œé¦–选临时 IP)"
 
 #: ../clients/cli/settings.c:894
-#, fuzzy, c-format
+#, c-format
 msgid "%d (no)"
-msgstr "%d (未知)"
+msgstr "%d(å¦ï¼‰"
 
 #: ../clients/cli/settings.c:896
 #, c-format
 msgid "%d (yes)"
-msgstr ""
+msgstr "%d(是)"
 
 #: ../clients/cli/settings.c:899 ../clients/cli/settings.c:1554
-#, fuzzy, c-format
+#, c-format
 msgid "%d (default)"
-msgstr "(默认)"
+msgstr "%d(默认)"
 
 #: ../clients/cli/settings.c:912
 msgid "0 (none)"
-msgstr "0 (none)"
+msgstr "0(无)"
 
 #: ../clients/cli/settings.c:918
 msgid "agent-owned, "
-msgstr "ä»£ç†æ‹¥æœ‰çš„"
+msgstr "ä¸ºä»£ç†æ‹¥æœ‰ã€"
 
 #: ../clients/cli/settings.c:920
 msgid "not saved, "
-msgstr "未ä¿å­˜çš„"
+msgstr "未ä¿å­˜ã€"
 
 #: ../clients/cli/settings.c:922
 msgid "not required, "
-msgstr "æœªè¦æ±‚çš„"
+msgstr "ä¸å¿…é¡»ã€"
 
 #: ../clients/cli/settings.c:971 ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
-msgstr "(默认)"
+msgstr "(默认)"
 
 #: ../clients/cli/settings.c:1252
 msgid "0 (disabled)"
-msgstr "0 (ç¦ç”¨)"
+msgstr "0(ç¦ç”¨ï¼‰"
 
 #: ../clients/cli/settings.c:1258
 msgid "enabled, "
-msgstr "å·²å¯ç”¨ï¼Œ"
+msgstr "å·²å¯ç”¨ã€"
 
 #: ../clients/cli/settings.c:1260
 msgid "advertise, "
-msgstr "广告,"
+msgstr "广告, "
 
 #: ../clients/cli/settings.c:1262
 msgid "willing, "
-msgstr "æ„¿æ„,"
+msgstr "willing, "
 
 #: ../clients/cli/settings.c:1290
 msgid "-1 (unset)"
-msgstr "-1 (未设置)"
+msgstr "-1(未设)"
 
 #: ../clients/cli/settings.c:1422 ../clients/cli/settings.c:1724
 #: ../clients/cli/settings.c:1864
@@ -5602,113 +5213,79 @@ msgid "default"
 msgstr "默认"
 
 #: ../clients/cli/settings.c:1556
-#, fuzzy, c-format
-msgid "%d (off)"
-msgstr "%d (未知)"
-
-#: ../clients/cli/settings.c:1770
 #, c-format
-msgid ""
-"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
-"'none'"
-msgstr ""
-
-#: ../clients/cli/settings.c:1781
-msgid "'default' and 'ignore' are incompatible with other flags"
-msgstr ""
-
-#: ../clients/cli/settings.c:1817
-#, fuzzy, c-format
-msgid "invalid mode '%s', use one of %s"
-msgstr "无效字段 '%s'; å…许的字段为:%s"
-
-#: ../clients/cli/settings.c:1899
-#, c-format
-msgid "always"
-msgstr ""
-
-#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
-#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
-#: ../libnm-core/nm-keyfile-reader.c:573
-#, fuzzy, c-format
-msgid "invalid option '%s', use one of [%s]"
-msgstr "无效选项 '%s' 或其值 '%s'"
+msgid "%d (off)"
+msgstr "%d(关)"
 
 #: ../clients/cli/settings.c:2116
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "您还è¦å°† '%s' 设定为 '%s' å— [yes]:"
+msgstr "您还è¦å°† “%s†设定为 “%sâ€ å— [yes]:"
 
 #: ../clients/cli/settings.c:2118
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "æ‚¨è¿˜è¦æ¸…除 '%s' å—? [yes]:"
+msgstr "æ‚¨è¿˜è¦æ¸…除 “%s†å—? [yes]:"
 
 #: ../clients/cli/settings.c:2279
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr ""
+msgstr "警告:%s.%s è®¾ç½®æˆ â€œ%sâ€ï¼Œå®ƒå¯èƒ½åœ¨åŸºç¡€æ¨¡å¼ä¸­è¢«å¿½ç•¥\n"
 
 #: ../clients/cli/settings.c:2298
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr ""
+msgstr "警告:设置 %s.%s 需è¦å޻除 IPv4 å’Œ IPv6 设置\n"
 
 #: ../clients/cli/settings.c:2300
-#, fuzzy
 msgid "Do you want to remove them? [yes] "
-msgstr "æ‚¨è¦æä¾›å®ƒä»¬å—?(yes/no)[yes]"
+msgstr "您想è¦åˆ é™¤ä»–们å—? [是] "
 
 #: ../clients/cli/settings.c:2396 ../clients/cli/settings.c:2791
 #: ../clients/cli/settings.c:5182
 #, c-format
 msgid "'%s' is not valid"
-msgstr "'%s' 无效"
+msgstr "“%s†无效"
 
 #: ../clients/cli/settings.c:2419
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
-msgstr "'%d' 无效;请使用 <%d-%d>"
+msgstr "“%d†无效;请使用 <%d-%d>"
 
 #: ../clients/cli/settings.c:2441
-#, fuzzy, c-format
+#, c-format
 msgid "'%lld' is not valid; use <%lld-%lld>"
-msgstr "'%d' 无效;请使用 <%d-%d>"
+msgstr "“%lld†无效;使用 <%lld-%lld>"
 
 #: ../clients/cli/settings.c:2463
-#, fuzzy, c-format
+#, c-format
 msgid "'%u' is not valid; use <%u-%u>"
-msgstr "'%u' 无效;请使用 <%d-%d>"
-
-#: ../clients/cli/settings.c:2502
-#, fuzzy, c-format
-msgid "'%u' flags are not valid; use combination of %s"
-msgstr "'%s' 无效,请使用 [%s] 或者 [%s]"
+msgstr "“%u†无效;使用 <%u-%u>"
 
 #: ../clients/cli/settings.c:2569
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
-msgstr "'%s' 无效,请使用 <option>=<value>"
+msgstr "“%s†无效,请使用 <option>=<value>"
 
 #: ../clients/cli/settings.c:2603
 #, c-format
 msgid "index '%s' is not valid"
-msgstr "索引 '%s' 无效"
+msgstr "目录“%sâ€æ˜¯æ— æ•ˆçš„"
 
 #: ../clients/cli/settings.c:2608 ../clients/cli/settings.c:2633
 msgid "no item to remove"
-msgstr "未删除任何项目"
+msgstr "没有è¦åˆ é™¤çš„项"
 
 #: ../clients/cli/settings.c:2612 ../clients/cli/settings.c:2637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
-msgstr "索引 '%d' ä¸åœ¨èŒƒå›´ <0-%d> 中"
+msgstr "索引“%dâ€è¶…出了范围 <0-%d>"
 
 #: ../clients/cli/settings.c:2652
 #, c-format
 msgid "invalid option '%s'"
-msgstr "无效选项 '%s'"
+msgstr "无效选项“%sâ€"
 
 #: ../clients/cli/settings.c:2654
 msgid "missing option"
@@ -5718,17 +5295,17 @@ msgstr "缺少选项"
 #: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
-msgstr "'%s' 是无效数字(或超出范围)"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„值(或超出范围)"
 
 #: ../clients/cli/settings.c:2775
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid value; use -1, 0 or 1"
-msgstr "'%s' 无效,请使用 0ã€1 或者 2。"
+msgstr "“%sâ€ ä¸æ˜¯æœ‰æ•ˆå€¼ï¼›ä½¿ç”¨ -1ã€0 或 1"
 
 #: ../clients/cli/settings.c:2807
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆä»¥å¤ªç½‘ MAC"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„以太网 MAC"
 
 #: ../clients/cli/settings.c:2832 ../libnm-core/nm-setting-connection.c:864
 #: ../libnm-core/nm-setting-infiniband.c:255
@@ -5736,38 +5313,38 @@ msgstr "'%s' 䏿˜¯æœ‰æ•ˆä»¥å¤ªç½‘ MAC"
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆæŽ¥å£åç§°"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æŽ¥å£åç§°"
 
 #: ../clients/cli/settings.c:2856
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s' 是无效频é“,请使用 <1-13>。"
+msgstr "“%s†是无效的标志å·ï¼›ä½¿ç”¨ <0-%d>"
 
 #: ../clients/cli/settings.c:2868
 #, c-format
 msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
-msgstr ""
+msgstr "警告:“%s†的总和大于所有标识设置\n"
 
 #: ../clients/cli/settings.c:2909
 #, c-format
 msgid "'%s' is not a valid hex character"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆå六进制字符串"
+msgstr "“%sâ€ ä¸æ˜¯æœ‰æ•ˆå六进制字符串"
 
 #: ../clients/cli/settings.c:2939
 #, c-format
 msgid "'%s' is not a valid MAC"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆ MAC"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ MAC 地å€"
 
 #: ../clients/cli/settings.c:2965 ../libnm-core/nm-setting-connection.c:853
 #: ../libnm-util/nm-setting-connection.c:791
 #, c-format
 msgid "'%s' is not a valid UUID"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆçš„ UUID"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ UUID"
 
 #: ../clients/cli/settings.c:3032
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…嫿ƒé™ “%sâ€"
 
 #: ../clients/cli/settings.c:3044
 msgid ""
@@ -5787,32 +5364,32 @@ msgstr ""
 #: ../clients/cli/settings.c:3063
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆä¸»æŽ¥å£ï¼›ä½¿ç”¨ ifname 或者连接 UUID"
+msgstr "“%sâ€ ä¸æ˜¯æœ‰æ•ˆä¸»æŽ¥å£ï¼›ä½¿ç”¨ ifname 或者连接 UUID"
 
 #: ../clients/cli/settings.c:3107
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
-msgstr ""
+msgstr "警告:%s 䏿˜¯ä»»ä½•现有连接é…置文件的 UUID \n"
 
 #: ../clients/cli/settings.c:3111 ../clients/cli/settings.c:3127
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a VPN connection profile"
-msgstr "错误: '%s' 为无效连接类型。"
+msgstr "“%sâ€ ä¸æ˜¯ä¸€ä¸ª VPN 连接é…置文件"
 
 #: ../clients/cli/settings.c:3120
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a name of any exiting profile"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆå›¢é˜Ÿé…置或者文件å。"
+msgstr "“%sâ€ä¸æ˜¯ä»»ä½•现有é…置文件的åå­—"
 
 #: ../clients/cli/settings.c:3154
-#, fuzzy, c-format
+#, c-format
 msgid "the value '%s' is not a valid UUID"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆçš„ UUID"
+msgstr "“%sâ€ çš„å€¼ä¸æ˜¯æœ‰æ•ˆçš„ UUID"
 
 #: ../clients/cli/settings.c:3161
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å« UUID “%sâ€"
 
 #: ../clients/cli/settings.c:3173
 msgid ""
@@ -5826,24 +5403,22 @@ msgid ""
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 msgstr ""
-
-#: ../clients/cli/settings.c:3240
-msgid ""
-"Enter a value which indicates whether the connection is subject to a data\n"
-"quota, usage costs or other limitations. Accepted options are:\n"
-"'true','yes','on' to set the connection as metered\n"
-"'false','no','off' to set the connection as not metered\n"
-"'unknown' to let NetworkManager choose a value using some heuristics\n"
-msgstr ""
+"输入辅助连接,当激活此连接时,辅助连接应该被激活。\n"
+"连接å¯ä»¥é€šè¿‡ UUID 或 ID(åç§°ï¼‰æ¥æŒ‡å®šã€‚\n"
+"nmcli 逿˜Žåœ°å°†å称转æ¢ä¸º UUID。\n"
+"请注æ„,NetworkManager æš‚æ—¶åªæ”¯æŒ VPN 作为辅助连接。\n"
+"该项å¯ä»¥ç”¨é€—å·æˆ–空格隔开。\n"
+"\n"
+"例如: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
 #: ../clients/cli/settings.c:3364
 msgid "private key password not provided"
 msgstr "未æä¾›ä¸“用密钥"
 
 #: ../clients/cli/settings.c:3392
-#, fuzzy, c-format
+#, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "无法更改属性"
+msgstr "该属性ä¸åŒ…å« EAP 方法 “%sâ€"
 
 #: ../clients/cli/settings.c:3409
 msgid ""
@@ -5852,11 +5427,15 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/cacert.crt\n"
 msgstr ""
+"输入 CA è¯ä¹¦æ–‡ä»¶è·¯å¾„(å¯é€‰çš„å‰ç¼€ file://)。\n"
+"  [file://]<file path>\n"
+"请注æ„,nmcli 䏿”¯æŒæŒ‡å®šçš„è¯ä¹¦ä½œä¸ºåŽŸå§‹ blob æ•°æ®ã€‚\n"
+"例如:/home/cimrman/cacert.crt\n"
 
 #: ../clients/cli/settings.c:3428
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å«åŒ¹é… “%s†的其他主题"
 
 #: ../clients/cli/settings.c:3444
 msgid ""
@@ -5865,6 +5444,10 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara.crt\n"
 msgstr ""
+"è¾“å…¥å®¢æˆ·ç«¯è®¤è¯æ–‡ä»¶è·¯å¾„(å¯é€‰çš„å‰ç¼€ file://)。\n"
+"  [file://]<file path>\n"
+"请注æ„,nmcli 䏿”¯æŒæŒ‡å®šçš„è¯ä¹¦ä½œä¸ºåŽŸå§‹ blob æ•°æ®ã€‚\n"
+"例如:/home/cimrman/jara.crt\n"
 
 #: ../clients/cli/settings.c:3456
 msgid ""
@@ -5875,11 +5458,15 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
 msgstr ""
+"为内部认è¯è¾“å…¥ CA è¯ä¹¦æ–‡ä»¶è·¯å¾„(å¯é€‰çš„å‰ç¼€ file://)。\n"
+"  [file://]<file path>\n"
+"请注æ„,nmcli 䏿”¯æŒæŒ‡å®šçš„è¯ä¹¦ä½œä¸ºåŽŸå§‹ blob æ•°æ®ã€‚\n"
+"例如:/home/cimrman/ca-zweite-phase.crt\n"
 
 #: ../clients/cli/settings.c:3476
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr ""
+msgstr "属性ä¸åŒ…å« â€œphase2†匹é…çš„ “%s†的其他主题"
 
 #: ../clients/cli/settings.c:3492
 msgid ""
@@ -5890,18 +5477,22 @@ msgid ""
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
 msgstr ""
+"为内部认è¯è¾“å…¥å®¢æˆ·ç«¯è®¤è¯æ–‡ä»¶è·¯å¾„(å¯é€‰çš„å‰ç¼€ file://)。\n"
+"  [file://]<file path>\n"
+"请注æ„,nmcli 䏿”¯æŒæŒ‡å®šçš„è¯ä¹¦ä½œä¸ºåŽŸå§‹ blob æ•°æ®ã€‚\n"
+"例如:/home/cimrman/jara-zweite-phase.crt\n"
 
 #: ../clients/cli/settings.c:3512
-#, fuzzy
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
 "Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
-"输入专用密钥的路径和密钥密ç ï¼ˆå¦‚果尚未设置):\n"
-"  <file path> [<password>]\n"
-"Example: /home/cimrman/jara-priv-key Dardanely\n"
+"输入ç§é’¥å’Œå¯†é’¥å¯†ç è·¯å¾„(如果没有设置):\n"
+"  [file://]<file path> [<password>]\n"
+"请注æ„,nmcli 䏿”¯æŒæŒ‡å®šçš„ç§é’¥ä½œä¸ºåŽŸå§‹ blob æ•°æ®ã€‚\n"
+"例如:/home/cimrman/jara-priv-key Dardanely\n"
 
 #: ../clients/cli/settings.c:3583
 msgid ""
@@ -5944,7 +5535,7 @@ msgstr ""
 "输入绑定选项列表,格å¼ä¸ºï¼š\n"
 "  option = <value>, option = <value>,... \n"
 "有效选项为: %s\n"
-"'mode' å¯ä½œä¸ºå称或者数字æä¾›ï¼š\n"
+"“mode†å¯ä½œä¸ºå称或者数字æä¾›ï¼š\n"
 "balance-rr    = 0\n"
 "active-backup = 1\n"
 "balance-xor   = 2\n"
@@ -5958,27 +5549,27 @@ msgstr ""
 #: ../clients/cli/settings.c:3735
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
-msgstr "'%s' 是无效InfiniBand MAC"
+msgstr "“%s†是无效InfiniBand MAC"
 
 #: ../clients/cli/settings.c:3772
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
-msgstr "'%s' 是无效 IBoIP P_Key"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IBoIP P_Key"
 
 #: ../clients/cli/settings.c:3803
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
-msgstr "'%s' 无效(请使用 ip/[prefix] next-hop [metric])"
+msgstr "“%s†无效 (æ ¼å¼ä¸ºï¼šip[/prefix] [next-hop] [metric])"
 
 #: ../clients/cli/settings.c:3851 ../clients/cli/settings.c:3870
 #, c-format
 msgid "invalid IPv4 address '%s'"
-msgstr "无效 IPv4 åœ°å€ '%s'"
+msgstr "无效的 IPv4 地å€â€œ%sâ€"
 
 #: ../clients/cli/settings.c:3876 ../clients/cli/settings.c:4184
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å« DNS æœåС噍 “%sâ€"
 
 #: ../clients/cli/settings.c:3888
 msgid ""
@@ -5993,20 +5584,14 @@ msgstr ""
 #: ../clients/cli/settings.c:3924 ../clients/cli/settings.c:4238
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr ""
-
-#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
-#, c-format
-msgid "the property doesn't contain DNS option '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å« DNS æœç´¢åŸŸ “%sâ€"
 
 #: ../clients/cli/settings.c:4016 ../clients/cli/settings.c:4329
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å« IP åœ°å€ â€œ%sâ€"
 
 #: ../clients/cli/settings.c:4029
-#, fuzzy
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6014,24 +5599,23 @@ msgid ""
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
-"输入 IPv4 地å€åˆ—表,格å¼ä¸ºï¼š\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"缺少å‰ç¼€åˆ™é»˜è®¤ä¸º 32。\n"
+"输入 IPv4 地å€åˆ—表,格å¼å¦‚下:\n"
+"  ip[/prefix],ip[/prefix],...\n"
+"缺少å‰ç¼€çš„,å‰ç¼€è¢«è§†ä¸º32。\n"
 "\n"
-"示例:192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"例如:192.168.1.5/24,10.0.0.11/24\n"
 
 #: ../clients/cli/settings.c:4045 ../clients/cli/settings.c:4358
-#, fuzzy, c-format
+#, c-format
 msgid "invalid gateway address '%s'"
-msgstr "无效网关 '%s'"
+msgstr "æ— æ•ˆçš„ç½‘å…³åœ°å€ â€œ%sâ€"
 
 #: ../clients/cli/settings.c:4100 ../clients/cli/settings.c:4413
-#, fuzzy, c-format
+#, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "无法更改属性"
+msgstr "该属性ä¸åŒ…å«è·¯ç”± “%sâ€"
 
 #: ../clients/cli/settings.c:4113
-#, fuzzy
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6043,17 +5627,20 @@ msgid ""
 "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 msgstr ""
-"输入 IPv4 路由列表,格å¼ä¸ºï¼š\n"
-"  ip/[prefix] next-hop [metric],... \n"
-"缺少å‰ç¼€åˆ™é»˜è®¤ä¸º 32。\n"
-"缺少度é‡è¡¡åˆ™è§†ä¸ºåº¦é‡è¡¡ä¸º 0。\n"
+"输入 IPv4 路由列表,格å¼å¦‚下:\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
 "\n"
-"示例:192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"缺少å‰ç¼€çš„,å‰ç¼€è¢«è§†ä¸º32。\n"
+"缺少下一跳的被视为 0.0.0.0。\n"
+"ç¼ºå°‘åº¦é‡æ„味ç€é»˜è®¤ (NM/内核将设置默认值)。\n"
+"\n"
+"例如:192.168.2.0/24 192.168.2.1 3,10.1.0.0/16 10.0.0.254\n"
+"          10.1.2.0/24\n"
 
 #: ../clients/cli/settings.c:4159 ../clients/cli/settings.c:4178
 #, c-format
 msgid "invalid IPv6 address '%s'"
-msgstr "无效 IPv6 åœ°å€ '%s'"
+msgstr "无效的 IPv6 地å€â€œ%sâ€"
 
 #: ../clients/cli/settings.c:4196
 msgid ""
@@ -6066,15 +5653,14 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 msgstr ""
-"输入 DNS æœåŠ¡å™¨çš„ IPv6 地å€åˆ—表。如果 IPv6 é…置方法为 ‘auto’,这些 DNS æœåС噍"
-"将附加到哪些自动é…置返回的地å€ä¸­ï¼ˆå¦‚果有)。DNS æœåС噍ä¸èƒ½ä½¿ç”¨ 'shared' 或者 "
-"'link-local' IPv6 é…ç½®æ–¹æ³•ï¼Œå› ä¸ºå®ƒä»¬ä¸æ˜¯ä¸Šæ¸¸ç½‘络。在所有其他 IPv6 é…置方法"
+"输入 DNS æœåŠ¡å™¨çš„ IPv6 地å€åˆ—表。如果 IPv6 é…置方法为 “autoâ€ï¼Œè¿™äº› DNS æœåС噍"
+"将附加到哪些自动é…置返回的地å€ä¸­ï¼ˆå¦‚果有)。DNS æœåС噍ä¸èƒ½ä½¿ç”¨ “shared†或者 "
+"“link-local†IPv6 é…ç½®æ–¹æ³•ï¼Œå› ä¸ºå®ƒä»¬ä¸æ˜¯ä¸Šæ¸¸ç½‘络。在所有其他 IPv6 é…置方法"
 "中,这些 DNS æœåС噍å¯ä½œä¸ºè¿™ä¸ªè¿žæŽ¥çš„唯一 DNS æœåŠ¡å™¨ã€‚\n"
 "\n"
 "示例:2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
 #: ../clients/cli/settings.c:4342
-#, fuzzy
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -6082,15 +5668,14 @@ msgid ""
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
-"输入 IPv6 地å€åˆ—表,格å¼ä¸ºï¼š\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
-"缺少å‰ç¼€åˆ™é»˜è®¤ä¸º 128。\n"
+"输入 IPv6 地å€åˆ—表,格å¼å¦‚下:\n"
+"  ip[/prefix],ip[/prefix],...\n"
+"\n"
+"缺少å‰ç¼€çš„,å‰ç¼€è¢«è§†ä¸º128。\n"
 "\n"
-"示例:2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, "
-"1050:0:0:0:5:600:300c:326b\n"
+"例如:2607:f0d0:1002:51::4/64,1050:0:0:0:5:600:300c:326b\n"
 
 #: ../clients/cli/settings.c:4426
-#, fuzzy
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -6103,34 +5688,37 @@ msgid ""
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
 msgstr ""
-"输入 IPv6 路由列表,格å¼ä¸ºï¼š\n"
-"  ip/[prefix] next-hop [metric],... \n"
-"缺少å‰ç¼€åˆ™é»˜è®¤ä¸º 128。\n"
-"缺少度é‡è¡¡åˆ™è§†ä¸ºåº¦é‡è¡¡ä¸º 0。\n"
+"输入 IPv6 路由列表,格å¼å¦‚下:\n"
+"  ip[/prefix] [next-hop] [metric]。...\n"
 "\n"
-"示例:2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:"
+"缺少å‰ç¼€çš„,å‰ç¼€è¢«è§†ä¸º128。\n"
+"缺少下一跳被看作是 “::†。\n"
+"ç¼ºå°‘åº¦é‡æ„味ç€é»˜è®¤ (NM/内核将设置默认值)。\n"
+"\n"
+"例如:2001:db8:beef:2::/64 2001:db8:beef::2,2001:db8:beef:3::/64 2001:db8:"
 "beef::3 2\n"
+"          abbe::/64 55\n"
 
 #: ../clients/cli/settings.c:4443 ../libnm-core/nm-setting-gsm.c:363
 #: ../libnm-util/nm-setting-gsm.c:364
 #, c-format
 msgid "'%s' is not a number"
-msgstr "'%s' 䏿˜¯ä¸€ä¸ªæ•°å­—"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ•°å­—"
 
 #: ../clients/cli/settings.c:4450
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
-msgstr "'%s' 无效,请使用 0ã€1 或者 2。"
+msgstr "“%s†无效,请使用 0ã€1 或者 2。"
 
 #: ../clients/cli/settings.c:4497
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
-msgstr "'%s' 是无效频é“,请使用 <1-13>。"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ä¿¡é“;请使用 <1-13>"
 
 #: ../clients/cli/settings.c:4534
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
-msgstr "'%s' 无效,请使用 [e, o, n]。"
+msgstr "“%s†无效,请使用 [e, o, n]。"
 
 #: ../clients/cli/settings.c:4562
 msgid ""
@@ -6156,23 +5744,18 @@ msgstr "未删除任何优先级"
 #: ../clients/cli/settings.c:4606
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
-msgstr "索引 '%d' ä¸åœ¨èŒƒå›´ <0-%d> 中"
+msgstr "索引“%dâ€è¶…出了范围 <0-%d>"
 
 #: ../clients/cli/settings.c:4645
 #, c-format
 msgid ""
 "Warning: only one mapping at a time is supported; taking the first one (%s)\n"
-msgstr ""
+msgstr "警告:在åŒä¸€æ—¶é—´åªæœ‰ä¸€ä¸ªæ˜ å°„支æŒï¼›å–第一个 (%s)\n"
 
 #: ../clients/cli/settings.c:4652
-#, fuzzy, c-format
+#, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "无法更改属性"
-
-#: ../clients/cli/settings.c:4700
-#, fuzzy, c-format
-msgid "'%s' cannot be empty"
-msgstr "'%s' 选项为空"
+msgstr "该属性ä¸åŒ…嫿˜ å°„ “%sâ€"
 
 #: ../clients/cli/settings.c:4774 ../clients/cli/settings.c:4941
 #: ../libnm-core/nm-setting-wired.c:651 ../libnm-core/nm-setting-wireless.c:820
@@ -6181,33 +5764,27 @@ msgstr "'%s' 选项为空"
 #: ../libnm-util/nm-setting-wireless.c:873
 #, c-format
 msgid "'%s' is not a valid MAC address"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆ MAC 地å€"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ MAC 地å€"
 
 #: ../clients/cli/settings.c:4780 ../clients/cli/settings.c:4947
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å« MAC åœ°å€ â€œ%sâ€"
 
 #: ../clients/cli/settings.c:4799
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
-msgstr "'%s' 无效;应æä¾›ä¸‰ä¸ªå­—符串。"
+msgstr "“%s†无效;应æä¾› 2 个或 3 个字符串"
 
 #: ../clients/cli/settings.c:4813
-#, fuzzy
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
-"输入三个频é“åˆ—è¡¨ï¼ˆç”¨é€—å·æˆ–者空格分开)。\n"
+"输入 IPv4 地å€åˆ—表 (ç”¨åˆ†å·æˆ–空格分隔)。\n"
 "\n"
-"示例:0.0.0e20 0.0.0e21 0.0.0e22\n"
-
-#: ../clients/cli/settings.c:4835
-#, c-format
-msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr ""
+"例如: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
 #: ../clients/cli/settings.c:4867
 #, c-format
@@ -6223,45 +5800,40 @@ msgstr ""
 #: ../clients/cli/settings.c:4913
 #, c-format
 msgid "'%s' is not a valid channel"
-msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„频é“"
+msgstr "“%s†是无效的通é“"
 
 #: ../clients/cli/settings.c:4919
 #, c-format
 msgid "'%ld' is not a valid channel"
-msgstr "'%ld' 䏿˜¯æœ‰æ•ˆé¢‘é“"
-
-#: ../clients/cli/settings.c:5013
-#, fuzzy, c-format
-msgid "invalid option '%s', use 'default', 'never' or 'always'"
-msgstr "无效选项 '%s' 或其值 '%s'"
+msgstr "“%ldâ€ä¸æ˜¯æœ‰æ•ˆé¢‘é“"
 
 #: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113
 #: ../clients/cli/settings.c:5152
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr ""
+msgstr "该属性ä¸åŒ…å«åè®® “%sâ€"
 
 #: ../clients/cli/settings.c:5191
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr ""
+msgstr "“%s†与 %s “%s†ä¸å…¼å®¹ï¼Œè¯·æ›´æ”¹å¯†é’¥æˆ–先正确设置 %s æƒé™ã€‚"
 
 #: ../clients/cli/settings.c:5199
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
-msgstr "猜测 WEP 密钥为 '%s'\n"
+msgstr "猜测 WEP 密钥为 “%sâ€\n"
 
 #: ../clients/cli/settings.c:5201
-#, fuzzy, c-format
+#, c-format
 msgid "WEP key index set to '%d'\n"
-msgstr "猜测 WEP 密钥为 '%s'\n"
+msgstr "WEP 密钥索引设置为 “%dâ€\n"
 
 #: ../clients/cli/settings.c:5224
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
-msgstr "'%s' 䏿˜¯ [0 (unknown), 1 (key), 2 (passphrase)]"
+msgstr "“%sâ€ ä¸æ˜¯ [0 (unknown), 1 (key), 2 (passphrase)]"
 
 #: ../clients/cli/settings.c:5240 ../clients/cli/settings.c:5243
 #: ../clients/cli/settings.c:5246 ../clients/cli/settings.c:5249
@@ -6269,7 +5841,7 @@ msgstr "'%s' 䏿˜¯ [0 (unknown), 1 (key), 2 (passphrase)]"
 msgid ""
 "Warning: '%s' is not compatible with '%s' type, please change or delete the "
 "key.\n"
-msgstr ""
+msgstr "警告:“%s†与 “%s†类型ä¸å…¼å®¹ï¼Œè¯·æ›´æ”¹æˆ–删除密钥。\n"
 
 #: ../clients/cli/settings.c:5262
 #, c-format
@@ -6283,17 +5855,17 @@ msgstr ""
 #: ../clients/cli/settings.c:5275
 #, c-format
 msgid "'%s' is not a valid PSK"
-msgstr "'%s' 是无效 PSK"
+msgstr "“%s†是无效 PSK"
 
 #: ../clients/cli/settings.c:5319
 #, c-format
 msgid "'%s' is not a valid DCB flag"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆ DCB 标签"
+msgstr "“%sâ€ ä¸æ˜¯æœ‰æ•ˆ DCB 标签"
 
 #: ../clients/cli/settings.c:5342
 #, c-format
 msgid "'%s' is not a DCB app priority"
-msgstr "'%s' 䏿˜¯ DCB app 优先æƒ"
+msgstr "“%sâ€ ä¸æ˜¯ DCB app 优先æƒ"
 
 #: ../clients/cli/settings.c:5368
 msgid "must contain 8 comma-separated numbers"
@@ -6302,12 +5874,12 @@ msgstr "å¿…é¡»åŒ…å« 8 个用逗å·åˆ†å¼€çš„æ•°å­—"
 #: ../clients/cli/settings.c:5385
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
-msgstr "'%s' 䏿˜¯ 0 å’Œ %u (包å«è¯¥æ•°å­—) 或者 %u 之间的数字"
+msgstr "“%sâ€ ä¸æ˜¯ 0 å’Œ %u (包å«è¯¥æ•°å­—) 或者 %u 之间的数字"
 
 #: ../clients/cli/settings.c:5388
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
-msgstr "'%s' 䏿˜¯ 0 å’Œ %u (包å«è¯¥æ•°å­—) 之间的数字"
+msgstr "“%sâ€ ä¸æ˜¯ 0 å’Œ %u (包å«è¯¥æ•°å­—) 之间的数字"
 
 #: ../clients/cli/settings.c:5410
 #, c-format
@@ -6315,7 +5887,7 @@ msgid ""
 "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
-"è­¦å‘Šï¼šé™¤éž '%s' 包括 1 (å¯ç”¨),å¦åˆ™æ›´æ”¹æ— æ³•生效。\n"
+"è­¦å‘Šï¼šé™¤éž â€œ%s†包括 1 (å¯ç”¨),å¦åˆ™æ›´æ”¹æ— æ³•生效。\n"
 "\n"
 
 #: ../clients/cli/settings.c:5463
@@ -6323,15 +5895,6 @@ msgstr ""
 msgid "bandwidth percentages must total 100%%"
 msgstr "贷款百分比必须为 100%%"
 
-#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
-msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
-
-#: ../clients/cli/settings.c:5598
-#, fuzzy, c-format
-msgid "invalid option '%s', use '%s' or '%s'"
-msgstr "无效选项 '%s' 或其值 '%s'"
-
 #: ../clients/cli/settings.c:7644
 msgid "don't know how to get the property value"
 msgstr "ä¸çŸ¥é“如何获得属性值"
@@ -6341,9 +5904,8 @@ msgid "the property can't be changed"
 msgstr "无法更改属性"
 
 #: ../clients/cli/settings.c:7821
-#, fuzzy
 msgid "(not available)"
-msgstr "ä¸å¯ç”¨"
+msgstr "(ä¸å¯ç”¨ï¼‰"
 
 #: ../clients/cli/settings.c:7846
 msgid "[NM property description]"
@@ -6356,55 +5918,42 @@ msgstr "[nmcli 具体æè¿°]"
 #. ----------------------------------------------------------------------------
 #: ../clients/cli/settings.c:7900
 msgid "<hidden>"
-msgstr ""
+msgstr "<éšè—>"
 
 #: ../clients/cli/utils.c:124
 #, c-format
 msgid "Error: value for '%s' argument is required."
-msgstr "é”™è¯¯ï¼šéœ€è¦ '%s' 傿•°å€¼ã€‚"
+msgstr "é”™è¯¯ï¼šéœ€è¦ â€œ%sâ€ å‚æ•°å€¼ã€‚"
 
 #: ../clients/cli/utils.c:149
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
-msgstr "错误:需è¦å‚æ•° '%s' 但给出的是 '%s'。"
+msgstr "错误:需è¦å‚æ•° “%s†但给出的是 “%sâ€ã€‚"
 
 #: ../clients/cli/utils.c:152
 #, c-format
 msgid "Error: Unexpected argument '%s'"
-msgstr "错误:æ„外傿•° '%s'"
+msgstr "错误:æ„外傿•° “%sâ€"
 
 #: ../clients/cli/utils.c:202
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
-msgstr "å°† IP4 åœ°å€ '0x%X' 转æ¢ä¸ºæ–‡æœ¬æ ¼å¼å‡ºé”™"
+msgstr "è½¬æ¢ IP4 地å€â€œ0x%Xâ€åˆ°æ–‡æœ¬å½¢å¼æ—¶å‡ºé”™"
 
 #: ../clients/cli/utils.c:230
 #, c-format
 msgid "Error converting IP6 address '%s' to text form"
-msgstr "å°† IP6 åœ°å€ '%s' 转æ¢ä¸ºæ–‡æœ¬æ ¼å¼å‡ºé”™"
-
-#. Translators: the first %s is the partial value entered by
-#. * the user, the second %s a list of compatible values.
-#.
-#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
-#, fuzzy, c-format
-msgid "'%s' is ambiguous (%s)"
-msgstr "'%s' å«ä¹‰æ¨¡ç³Š (%s x %s)"
+msgstr "è½¬æ¢ IP6 地å€â€œ%sâ€åˆ°æ–‡æœ¬å½¢å¼æ—¶å‡ºé”™"
 
 #: ../clients/cli/utils.c:556
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
-msgstr "'%s' 无效,请使用 [%s] 或者 [%s]"
-
-#: ../clients/cli/utils.c:589
-#, fuzzy, c-format
-msgid "'%s' is not valid; use [%s], [%s] or [%s]"
-msgstr "'%s' 无效,请使用 [%s] 或者 [%s]"
+msgstr "“%s†无效,请使用 [%s] 或者 [%s]"
 
 #: ../clients/cli/utils.c:688
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
-msgstr "'%s' å«ä¹‰æ¨¡ç³Š (%s x %s)"
+msgstr "“%s†å«ä¹‰æ¨¡ç³Š (%s x %s)"
 
 #: ../clients/cli/utils.c:700
 #, c-format
@@ -6414,43 +5963,25 @@ msgstr "缺少å称,请å°è¯•使用 [%s] 之一。"
 #: ../clients/cli/utils.c:964
 #, c-format
 msgid "field '%s' has to be alone"
-msgstr "字段 '%s' 必须是å•独的"
+msgstr "字段“%sâ€å¿…须是å•独的"
 
 #: ../clients/cli/utils.c:967
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
-msgstr "无效字段 '%s'; å…许的字段为:%s"
+msgstr "无效字段“%sâ€ï¼›å…许字段:%s"
 
 #: ../clients/cli/utils.c:1024
 msgid "Option '--terse' requires specifying '--fields'"
-msgstr "选项 '--terse' è¦æ±‚指定 '--fields'"
+msgstr "选项 “--terseâ€ è¦æ±‚指定 “--fieldsâ€"
 
 #: ../clients/cli/utils.c:1028
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "选项 '--terse' 需è¦ç‰¹å®š '--fields' é€‰é¡¹å€¼ï¼Œä¸æ˜¯ '%s'"
-
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"警告:nmcli (%s) å’Œ NetworkManager (%s) 版本ä¸åŒ¹é…。请使用 --nocheck 抑制警"
-"告。\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"错误:nmcli (%s) å’Œ NetworkManager (%s) 版本ä¸åŒ¹é…。强制执行请使用 --"
-"nocheck,但结果无法预测。"
+msgstr "选项 “--terse†需è¦ç‰¹å®š “--fieldsâ€ é€‰é¡¹å€¼ï¼Œä¸æ˜¯ “%sâ€"
 
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
-msgstr ""
+msgstr "身份认è¯ä¼šè¯å·²ç»åœ¨è¿›è¡Œã€‚"
 
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. * is not visible here since we only care about phase2 authentication
@@ -6483,7 +6014,7 @@ msgstr "身份"
 
 #: ../clients/common/nm-secret-agent-simple.c:248
 msgid "Private key password"
-msgstr "专用密钥密ç "
+msgstr "ç§é’¥å¯†ç "
 
 #: ../clients/common/nm-secret-agent-simple.c:289
 #: ../clients/tui/nmt-page-wifi.c:289
@@ -6497,14 +6028,14 @@ msgstr "æœåŠ¡"
 
 #: ../clients/common/nm-secret-agent-simple.c:448
 msgid "Authentication required by wireless network"
-msgstr "无线网络所需认è¯"
+msgstr "æ— çº¿ç½‘ç»œè¦æ±‚身份认è¯"
 
 #: ../clients/common/nm-secret-agent-simple.c:449
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr "访问无线网络 '%s' 需è¦å¯†é’¥æˆ–者加密密钥。"
+msgstr "需è¦å¯†ç æˆ–密钥æ¥è®¿é—®æ— æ•ˆç½‘络“%sâ€ã€‚"
 
 #: ../clients/common/nm-secret-agent-simple.c:457
 msgid "Wired 802.1X authentication"
@@ -6520,7 +6051,7 @@ msgstr "DSL 认è¯"
 
 #: ../clients/common/nm-secret-agent-simple.c:477
 msgid "PIN code required"
-msgstr "所需 PIN 代ç "
+msgstr "éœ€è¦ PIN ç "
 
 #: ../clients/common/nm-secret-agent-simple.c:478
 msgid "PIN code is needed for the mobile broadband device"
@@ -6542,22 +6073,20 @@ msgstr "移动宽带网络密ç "
 #: ../clients/common/nm-secret-agent-simple.c:542
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "连接到“%sâ€éœ€è¦å¯†ç ã€‚"
+msgstr "需è¦å¯†ç æ¥è¿žæŽ¥åˆ°â€œ%sâ€ã€‚"
 
 #: ../clients/common/nm-secret-agent-simple.c:537
-#, fuzzy
 msgid "VPN password required"
-msgstr "所需 PIN 代ç "
+msgstr "éœ€è¦ VPN 密ç "
 
 #: ../clients/common/nm-vpn-helpers.c:61
 msgid "could not get VPN plugin info"
-msgstr ""
+msgstr "æ— æ³•èŽ·å– VPN æ’ä»¶ä¿¡æ¯"
 
 #: ../clients/common/nm-vpn-helpers.c:103
 #: ../clients/common/nm-vpn-helpers.c:106
-#, fuzzy
 msgid "Group password"
-msgstr "显示密ç "
+msgstr "组密ç "
 
 #: ../clients/common/nm-vpn-helpers.c:108 ../clients/tui/nmt-page-ip4.c:143
 #: ../clients/tui/nmt-page-ip6.c:143
@@ -6566,35 +6095,29 @@ msgstr "网关"
 
 #: ../clients/common/nm-vpn-helpers.c:109
 msgid "Cookie"
-msgstr ""
-
-#: ../clients/common/nm-vpn-helpers.c:110
-msgid "Gateway certificate hash"
-msgstr ""
+msgstr "Cookie"
 
 #: ../clients/nm-online.c:94
 msgid "Connecting"
-msgstr "连接中"
+msgstr "正在连接"
 
 #: ../clients/nm-online.c:147
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
-msgstr "等待连接的时间,å•ä½ç§’(没有此选项时默认值为 30)"
+msgstr "等待连接时间,以秒计(没有该选项时,默认为 30)"
 
 #: ../clients/nm-online.c:148
-#, fuzzy
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr "如果 NetworkManager 未è¿è¡Œåˆ™ç«‹å³é€€å‡º"
+msgstr "NetworkManager 未è¿è¡Œæˆ–未连接时,立å³é€€å‡º"
 
 #: ../clients/nm-online.c:149
 msgid "Don't print anything"
-msgstr "ä¸è¦æ˜¾ç¤ºä»»ä½•ä¿¡æ¯"
+msgstr "ä¸è¾“出任何结果"
 
 #: ../clients/nm-online.c:150
-#, fuzzy
 msgid "Wait for NetworkManager startup instead of a connection"
-msgstr "等待 NetworkManager å®Œæˆæ¿€æ´»å¯åŠ¨ç½‘ç»œè¿žæŽ¥ã€‚"
+msgstr "等待 NetworkManager å¯åŠ¨è€ŒéžæŸä¸ªè¿žæŽ¥çš„å¯åЍ"
 
 #: ../clients/nm-online.c:171
 msgid ""
@@ -6603,12 +6126,12 @@ msgstr "等待 NetworkManager å®Œæˆæ¿€æ´»å¯åŠ¨ç½‘ç»œè¿žæŽ¥ã€‚"
 
 #: ../clients/nm-online.c:178 ../clients/nm-online.c:184
 msgid "Invalid option.  Please use --help to see a list of valid options."
-msgstr "无效选项。  请使用 --help 查看有效选项列表。"
+msgstr "无效选项。请使用 --help 查看有效选项列表。"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:415
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:114
+#: ../clients/tui/nmtui.c:136
 msgid "OK"
 msgstr "确定"
 
@@ -6624,19 +6147,19 @@ msgid "Editor failed: %s"
 msgstr "编辑器失败:%s"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with status %d"
-msgstr "编辑器失败:%s"
+msgstr "ç¼–è¾‘å™¨å¤±è´¥ï¼ŒçŠ¶æ€ %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Editor failed with signal %d"
-msgstr "编辑器失败:%s"
+msgstr "ç¼–è¾‘å™¨å¤±è´¥ï¼Œä¿¡å· %d"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:379
 #, c-format
 msgid "Could not re-read file: %s"
-msgstr "æ— æ³•åˆ›æ–°è¯»å–æ–‡ä»¶ï¼š%s"
+msgstr "æ— æ³•é‡æ–°è¯»å–文件:%s"
 
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
@@ -6651,17 +6174,17 @@ msgstr "Wi-Fi 连接 %d"
 #: ../clients/tui/nm-editor-utils.c:167
 #, c-format
 msgid "InfiniBand connection %d"
-msgstr "InfiniBand 连接 %d"
+msgstr "高速网络连接 %d"
 
 #: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1859
 #: ../libnm/nm-device.c:1810
 msgid "Mobile Broadband"
-msgstr "移动带宽"
+msgstr "移动宽带"
 
 #: ../clients/tui/nm-editor-utils.c:175
 #, c-format
 msgid "Mobile broadband connection %d"
-msgstr "移动带宽连接 %d"
+msgstr "移动宽带连接 %d"
 
 #: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
 msgid "DSL"
@@ -6672,38 +6195,38 @@ msgstr "DSL"
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708
+#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1721
 #: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4190
+#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4187
 msgid "Bond"
-msgstr "æ†ç»‘"
+msgstr "绑定"
 
 #: ../clients/tui/nm-editor-utils.c:194
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712
+#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1725
 #: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4487
+#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4484
 msgid "Bridge"
 msgstr "桥接"
 
 #: ../clients/tui/nm-editor-utils.c:204
 #, c-format
 msgid "Bridge connection %d"
-msgstr "桥接连接 %d"
+msgstr "æ¡¥å¼è¿žæŽ¥ %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710
+#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1723
 #: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4296
+#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4293
 msgid "Team"
-msgstr "团队"
+msgstr "组队"
 
 #: ../clients/tui/nm-editor-utils.c:213
 #, c-format
 msgid "Team connection %d"
-msgstr "Team 连接 %d"
+msgstr "组队连接 %d"
 
 #: ../clients/tui/nm-editor-utils.c:221
 #, c-format
@@ -6717,7 +6240,7 @@ msgstr "VPN 连接 %d"
 
 #: ../clients/tui/nmt-device-entry.c:370
 msgid "Select..."
-msgstr "选择......"
+msgstr "选择..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:110
 msgid "Add"
@@ -6727,7 +6250,7 @@ msgstr "添加"
 #: ../clients/tui/nmt-page-ip4.c:169 ../clients/tui/nmt-page-ip6.c:167
 #: ../clients/tui/nmt-page-team-port.c:109 ../clients/tui/nmt-page-team.c:173
 msgid "Edit..."
-msgstr "编辑......"
+msgstr "编辑..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
 #: ../clients/tui/nmtui-edit.c:526
@@ -6745,15 +6268,14 @@ msgstr "显示"
 #: ../clients/tui/nmt-editor.c:97
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "无法为类型 '%s' 的连接 '%s'创建编辑器。"
+msgstr "无法为“%2$sâ€ç±»åž‹çš„连接“%1$sâ€åˆ›å»ºç¼–辑器。"
 
 #: ../clients/tui/nmt-editor.c:101
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
-msgstr "无法为无效连接  '%s' 创建编辑器。"
+msgstr "无法为无效的连接“%sâ€åˆ›å»ºç¼–辑器。"
 
 #: ../clients/tui/nmt-editor.c:111
-#, fuzzy
 msgid "Edit Connection"
 msgstr "编辑连接"
 
@@ -6769,12 +6291,11 @@ msgstr "无法添加新连接:%s"
 
 #: ../clients/tui/nmt-editor.c:320
 msgid "Profile name"
-msgstr "é…置文件åç§°"
+msgstr "é…ç½®åç§°"
 
 #: ../clients/tui/nmt-editor.c:331
-#, fuzzy
 msgid "Ethernet device"
-msgstr "以太网"
+msgstr "以太网设备"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Device"
@@ -6787,7 +6308,7 @@ msgstr "自动连接"
 
 #: ../clients/tui/nmt-editor.c:397
 msgid "Available to all users"
-msgstr "å¯ç”¨äºŽæ‰€æœ‰ç”¨æˆ·"
+msgstr "对所有用户有效"
 
 #: ../clients/tui/nmt-editor.c:412 ../clients/tui/nmt-password-dialog.c:171
 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:217
@@ -6801,15 +6322,15 @@ msgstr "字节"
 
 #: ../clients/tui/nmt-page-bond.c:84
 msgid "Round-robin"
-msgstr "循环"
+msgstr "轮询"
 
 #: ../clients/tui/nmt-page-bond.c:85
 msgid "Active Backup"
-msgstr "激活备份"
+msgstr "热备"
 
 #: ../clients/tui/nmt-page-bond.c:86
 msgid "XOR"
-msgstr "XOR"
+msgstr "异或"
 
 #: ../clients/tui/nmt-page-bond.c:87
 msgid "Broadcast"
@@ -6821,15 +6342,15 @@ msgstr "802.3ad"
 
 #: ../clients/tui/nmt-page-bond.c:89
 msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "适é…器传输负载å‡è¡¡ (tlb)"
+msgstr "自适应传输负载å‡è¡¡ (tlb)"
 
 #: ../clients/tui/nmt-page-bond.c:90
 msgid "Adaptive Load Balancing (alb)"
-msgstr "适é…器负载平衡 (alb)"
+msgstr "自适应负载å‡è¡¡ (alb)"
 
 #: ../clients/tui/nmt-page-bond.c:96
 msgid "MII (recommended)"
-msgstr "MII (推è)"
+msgstr "MII(推è)"
 
 #: ../clients/tui/nmt-page-bond.c:97
 msgid "ARP"
@@ -6838,25 +6359,25 @@ msgstr "ARP"
 #: ../clients/tui/nmt-page-bond.c:355 ../clients/tui/nmt-page-bridge.c:78
 #: ../clients/tui/nmt-page-team.c:152
 msgid "Slaves"
-msgstr "辅助"
+msgstr "从机"
 
 #: ../clients/tui/nmt-page-bond.c:367 ../clients/tui/nmt-page-wifi.c:230
 msgid "Mode"
-msgstr "åž‹å·"
+msgstr "模å¼"
 
 #: ../clients/tui/nmt-page-bond.c:373
 msgid "Primary"
-msgstr "主è¦"
+msgstr "主机"
 
 #: ../clients/tui/nmt-page-bond.c:379
 msgid "Link monitoring"
-msgstr "链接监控"
+msgstr "链路监控"
 
 #: ../clients/tui/nmt-page-bond.c:385 ../clients/tui/nmt-page-bond.c:392
 #: ../clients/tui/nmt-page-bond.c:399 ../clients/tui/nmt-page-bond.c:406
 msgctxt "milliseconds"
 msgid "ms"
-msgstr "ms"
+msgstr "毫秒"
 
 #: ../clients/tui/nmt-page-bond.c:386 ../clients/tui/nmt-page-bond.c:407
 msgid "Monitoring frequency"
@@ -6864,11 +6385,11 @@ msgstr "监控频率"
 
 #: ../clients/tui/nmt-page-bond.c:393
 msgid "Link up delay"
-msgstr "è”æŽ¥å»¶è¿Ÿ"
+msgstr "链接建立延时"
 
 #: ../clients/tui/nmt-page-bond.c:400
 msgid "Link down delay"
-msgstr "å–æ¶ˆè”接延迟"
+msgstr "链接断开延时"
 
 #: ../clients/tui/nmt-page-bond.c:413
 msgid "ARP targets"
@@ -6881,11 +6402,11 @@ msgstr "桥接端å£"
 #: ../clients/tui/nmt-page-bridge-port.c:67
 #: ../clients/tui/nmt-page-bridge.c:110
 msgid "Priority"
-msgstr "优先æƒ"
+msgstr "优先级"
 
 #: ../clients/tui/nmt-page-bridge-port.c:73
 msgid "Path cost"
-msgstr "è·¯å¾„æˆæœ¬"
+msgstr "路径开销"
 
 #: ../clients/tui/nmt-page-bridge-port.c:75
 msgid "Hairpin mode"
@@ -6898,27 +6419,27 @@ msgstr "ç§’"
 
 #: ../clients/tui/nmt-page-bridge.c:89
 msgid "Aging time"
-msgstr "过期时间"
+msgstr "è€åŒ–æ—¶é—´"
 
 #: ../clients/tui/nmt-page-bridge.c:91
 msgid "Enable IGMP snooping"
-msgstr ""
+msgstr "å¯ç”¨ IGMP 监å¬"
 
 #: ../clients/tui/nmt-page-bridge.c:97
 msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "å¯ç”¨ STP (扩张树åè®®)"
+msgstr "å¯ç”¨ STP(跨树å议)"
 
 #: ../clients/tui/nmt-page-bridge.c:120
 msgid "Forward delay"
-msgstr "转å‘延迟"
+msgstr "转å‘å»¶æ—¶"
 
 #: ../clients/tui/nmt-page-bridge.c:130
 msgid "Hello time"
-msgstr "ç¥è´ºæ—¶é—´"
+msgstr "问候时间"
 
 #: ../clients/tui/nmt-page-bridge.c:140
 msgid "Max age"
-msgstr "最大年龄"
+msgstr "最大寿命"
 
 #: ../clients/tui/nmt-page-ethernet.c:70
 msgid "ETHERNET"
@@ -6927,16 +6448,17 @@ msgstr "以太网"
 #: ../clients/tui/nmt-page-ethernet.c:77 ../clients/tui/nmt-page-vlan.c:122
 #: ../clients/tui/nmt-page-wifi.c:364
 msgid "Cloned MAC address"
-msgstr "克隆的 MAC 地å€"
+msgstr "å¤åˆ¶çš„ MAC 地å€"
 
 #: ../clients/tui/nmt-page-infiniband.c:47
 msgid "Datagram"
-msgstr "Datagram"
+msgstr "æ•°æ®æŠ¥"
 
 #: ../clients/tui/nmt-page-infiniband.c:48
 msgid "Connected"
 msgstr "已连接"
 
+# 专有åè¯ï¼Œå°½ç®¡æ˜¯é«˜å¸¦å®½é“¾æŽ¥ä¸”å­—é¢ä¹Ÿæ˜¯é‚£ä¸ªæ„æ€ï¼Œä½†è¿˜æ˜¯ä¸è¯¥ç¿»æˆæ— é™å¸¦å®½å•Šã€‚
 #: ../clients/tui/nmt-page-infiniband.c:81
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
@@ -6955,7 +6477,7 @@ msgstr "自动"
 
 #: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
 msgid "Link-Local"
-msgstr "è”æŽ¥-本地"
+msgstr "本地链路"
 
 #: ../clients/tui/nmt-page-ip4.c:41 ../clients/tui/nmt-page-ip6.c:42
 msgid "Manual"
@@ -6963,17 +6485,17 @@ msgstr "手动"
 
 #: ../clients/tui/nmt-page-ip4.c:42
 msgid "Shared"
-msgstr "共享的"
+msgstr "共享"
 
 #: ../clients/tui/nmt-page-ip4.c:82 ../clients/tui/nmt-page-ip6.c:82
 msgid "(No custom routes)"
-msgstr "(无自定义路线)"
+msgstr "(没有自定义路由)"
 
 #: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85
 #, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
-msgstr[0] "%d一个自定义路线"
+msgstr[0] "%d æ¡è‡ªå®šä¹‰è·¯ç”±"
 
 #: ../clients/tui/nmt-page-ip4.c:128
 msgid "IPv4 CONFIGURATION"
@@ -6993,19 +6515,19 @@ msgstr "æœç´¢åŸŸ"
 
 #: ../clients/tui/nmt-page-ip4.c:171 ../clients/tui/nmt-page-ip6.c:169
 msgid "Routing"
-msgstr "路由选择"
+msgstr "路由"
 
 #: ../clients/tui/nmt-page-ip4.c:173 ../clients/tui/nmt-page-ip6.c:171
 msgid "Never use this network for default route"
-msgstr "从ä¸ä½¿ç”¨è¿™ä¸ªç½‘络作为默认路线"
+msgstr "始终ä¸ä½¿ç”¨æ­¤ç½‘络于默认路由"
 
 #: ../clients/tui/nmt-page-ip4.c:179 ../clients/tui/nmt-page-ip6.c:177
 msgid "Ignore automatically obtained routes"
-msgstr ""
+msgstr "忽略自动获å–的路由"
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
-msgstr "è¿™ä¸ªè¿žæŽ¥éœ€è¦ IPv4 地å€"
+msgstr "éœ€è¦ IPv4 地å€å®Œæˆè¿™ä¸ªè¿žæŽ¥"
 
 #: ../clients/tui/nmt-page-ip6.c:38
 msgid "Ignore"
@@ -7013,7 +6535,7 @@ msgstr "忽略"
 
 #: ../clients/tui/nmt-page-ip6.c:40
 msgid "Automatic (DHCP-only)"
-msgstr "自动 (åªç”¨äºŽ DHCP)"
+msgstr "自动(仅 DHCP)"
 
 #: ../clients/tui/nmt-page-ip6.c:128
 msgid "IPv6 CONFIGURATION"
@@ -7021,71 +6543,67 @@ msgstr "IPv6 é…ç½®"
 
 #: ../clients/tui/nmt-page-ip6.c:185
 msgid "Require IPv6 addressing for this connection"
-msgstr "è¿™ä¸ªè¿žæŽ¥éœ€è¦ IPv6 地å€"
+msgstr "éœ€è¦ IPv6 地å€å®Œæˆè¿™ä¸ªè¿žæŽ¥"
 
 #: ../clients/tui/nmt-page-ppp.c:131
-#, fuzzy
 msgid "PPP CONFIGURATION"
-msgstr "IPv4 é…ç½®"
+msgstr "PPP é…ç½®"
 
 #: ../clients/tui/nmt-page-ppp.c:140
-#, fuzzy
 msgid "Allowed authentication methods:"
-msgstr "认è¯"
+msgstr "å…è®¸çš„è®¤è¯æ–¹æ³•:"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "LEAP"
+msgstr "EAP"
 
 #: ../clients/tui/nmt-page-ppp.c:155
-#, fuzzy
 msgid "PAP"
-msgstr "AP"
+msgstr "PAP"
 
 #: ../clients/tui/nmt-page-ppp.c:163
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:171
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: ../clients/tui/nmt-page-ppp.c:179
 msgid "MSCHAP"
-msgstr ""
+msgstr "MSCHAP"
 
 #: ../clients/tui/nmt-page-ppp.c:195
 msgid "Use point-to-point encryption (MPPE)"
-msgstr ""
+msgstr "使用点到点加密 (MPPE)"
 
 #: ../clients/tui/nmt-page-ppp.c:207
 msgid "Require 128-bit encryption"
-msgstr ""
+msgstr "éœ€è¦ 128 ä½åР坆"
 
 #: ../clients/tui/nmt-page-ppp.c:217
 msgid "Use stateful MPPE"
-msgstr ""
+msgstr "使用带有状æ€çš„ MPPE"
 
 #: ../clients/tui/nmt-page-ppp.c:229
 msgid "Allow BSD data compression"
-msgstr ""
+msgstr "å…许 BSD æ•°æ®åŽ‹ç¼©"
 
 #: ../clients/tui/nmt-page-ppp.c:237
 msgid "Allow Deflate data compression"
-msgstr ""
+msgstr "å…许 Deflate æ•°æ®åŽ‹ç¼©"
 
 #: ../clients/tui/nmt-page-ppp.c:245
 msgid "Use TCP header compression"
-msgstr ""
+msgstr "使用 TCP 头压缩"
 
 #: ../clients/tui/nmt-page-ppp.c:255
 msgid "Send PPP echo packets"
-msgstr ""
+msgstr "å‘é€ PPP 回å“包"
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
-msgstr "TEAM 端å£"
+msgstr "群组端å£"
 
 #: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163
 msgid "JSON configuration"
@@ -7097,7 +6615,7 @@ msgstr "上级"
 
 #: ../clients/tui/nmt-page-vlan.c:114
 msgid "VLAN id"
-msgstr "VLAN id"
+msgstr "VLAN 标识"
 
 #: ../clients/tui/nmt-page-wifi.c:64
 msgctxt "Wi-Fi"
@@ -7106,7 +6624,7 @@ msgstr "客户端"
 
 #: ../clients/tui/nmt-page-wifi.c:65
 msgid "Access Point"
-msgstr "切入点"
+msgstr "接入点"
 
 #: ../clients/tui/nmt-page-wifi.c:66
 msgid "Ad-Hoc Network"
@@ -7142,11 +6660,11 @@ msgstr "WPA & WPA2 ä¼ä¸š"
 
 #: ../clients/tui/nmt-page-wifi.c:83
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "WEP 40/128-bit Key (Hex 或者 ASCII)"
+msgstr "WEP 40/128 ä½å¯†é’¥(Hex 或者 ASCII)"
 
 #: ../clients/tui/nmt-page-wifi.c:84
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-字节密ç çŸ­è¯­"
+msgstr "WEP 128ä½ å¯†ç "
 
 #: ../clients/tui/nmt-page-wifi.c:85
 msgid "Dynamic WEP (802.1x)"
@@ -7159,7 +6677,7 @@ msgstr "LEAP"
 #: ../clients/tui/nmt-page-wifi.c:91
 msgctxt "WEP key index"
 msgid "1 (Default)"
-msgstr "1 (默认)"
+msgstr "1(默认)"
 
 #: ../clients/tui/nmt-page-wifi.c:92
 msgctxt "WEP key index"
@@ -7182,7 +6700,7 @@ msgstr "开放系统"
 
 #: ../clients/tui/nmt-page-wifi.c:100
 msgid "Shared Key"
-msgstr "共享的密钥"
+msgstr "共享密钥"
 
 #: ../clients/tui/nmt-page-wifi.c:214
 msgid "WI-FI"
@@ -7190,7 +6708,7 @@ msgstr "WI-FI"
 
 #: ../clients/tui/nmt-page-wifi.c:256
 msgid "Channel"
-msgstr "频é“"
+msgstr "ä¿¡é“"
 
 #: ../clients/tui/nmt-page-wifi.c:261
 msgid "Security"
@@ -7200,7 +6718,7 @@ msgstr "安全性"
 #. FIXME
 #: ../clients/tui/nmt-page-wifi.c:282
 msgid "(No support for wpa-enterprise yet...)"
-msgstr "(å°šæœªæ”¯æŒ wpa-ä¼ä¸š...)"
+msgstr "ï¼ˆè¿˜æœªæ”¯æŒ wpa-enterprise…)"
 
 #: ../clients/tui/nmt-page-wifi.c:292 ../clients/tui/nmt-page-wifi.c:311
 msgid "WEP index"
@@ -7218,7 +6736,7 @@ msgstr "(尚未支æŒåЍæ€-wep ...)"
 
 #: ../clients/tui/nmt-password-fields.c:128
 msgid "Ask for this password every time"
-msgstr "æ¯æ¬¡éƒ½è¯¢é—®å¯†ç "
+msgstr "æ¯æ¬¡éƒ½è¯¢é—®è¿™ä¸ªå¯†ç "
 
 #: ../clients/tui/nmt-password-fields.c:129
 msgid "Show password"
@@ -7226,7 +6744,7 @@ msgstr "显示密ç "
 
 #: ../clients/tui/nmt-route-table.c:191
 msgid "Destination"
-msgstr "目标ä½ç½®"
+msgstr "目标"
 
 #: ../clients/tui/nmt-route-table.c:191
 msgid "Prefix"
@@ -7238,7 +6756,7 @@ msgstr "下一步 Hop"
 
 #: ../clients/tui/nmt-route-table.c:208
 msgid "Metric"
-msgstr "公制"
+msgstr "æƒé‡"
 
 #: ../clients/tui/nmt-route-table.c:228
 msgid "No custom routes are defined."
@@ -7256,34 +6774,13 @@ msgstr "添加..."
 msgid "Remove"
 msgstr "移除"
 
-#: ../clients/tui/nmtui-connect.c:54
-msgid ""
-"openconnect will be run to authenticate.\n"
-"It will return to nmtui when completed."
-msgstr ""
-
-#: ../clients/tui/nmtui-connect.c:68
-#, fuzzy, c-format
-msgid "Error: openconnect failed: %s"
-msgstr "错误:删除连接失败:%s"
-
-#: ../clients/tui/nmtui-connect.c:75
-#, c-format
-msgid "openconnect failed with status %d"
-msgstr ""
-
-#: ../clients/tui/nmtui-connect.c:79
-#, c-format
-msgid "openconnect failed with signal %d"
-msgstr ""
-
 #: ../clients/tui/nmtui-connect.c:178
 msgid "Activation failed"
-msgstr "激活失败"
+msgstr "å¯ç”¨å¤±è´¥"
 
 #: ../clients/tui/nmtui-connect.c:233
 msgid "Connecting..."
-msgstr "连接中......"
+msgstr "正在连接…"
 
 #: ../clients/tui/nmtui-connect.c:268 ../clients/tui/nmtui-connect.c:299
 #, c-format
@@ -7296,21 +6793,25 @@ msgstr "激活"
 
 #: ../clients/tui/nmtui-connect.c:361
 msgid "Deactivate"
-msgstr "å–æ¶ˆæ¿€æ´»"
+msgstr "ç¦ç”¨"
 
 #: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:108
+#: ../clients/tui/nmtui.c:130
 msgid "Quit"
 msgstr "退出"
 
+#: ../clients/tui/nmtui-connect.c:413 ../clients/tui/nmtui-edit.c:120
+msgid "Back"
+msgstr "返回"
+
 #: ../clients/tui/nmtui-connect.c:436
 #, c-format
 msgid "No such connection '%s'"
-msgstr "没有此类连接 '%s'"
+msgstr "无此连接“%sâ€"
 
 #: ../clients/tui/nmtui-connect.c:438
 msgid "Connection is already active"
-msgstr "连接已激活"
+msgstr "è¿žæŽ¥å·²ç»æ¿€æ´»"
 
 #: ../clients/tui/nmtui-edit.c:225
 msgid "Create"
@@ -7325,12 +6826,12 @@ msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
-"如果您è¦åˆ›å»ºä»¥ä¾¿ VPN,且这个您想è¦åˆ›å»ºçš„ VPN 连接没有出现在列表中,您å¯èƒ½ä¹°æœ‰"
-"安装正确的 VPN æ’件。"
+"如果您想创建一个 VPN 但列表中没有您想è¦åˆ›å»ºçš„ VPN 类型,这很å¯èƒ½æ˜¯æ‚¨æ²¡æœ‰å®‰è£…"
+"正确的 VPN æ’件。"
 
 #: ../clients/tui/nmtui-edit.c:411 ../clients/tui/nmtui-edit.c:427
 msgid "New Connection"
-msgstr "新连接"
+msgstr "新建连接"
 
 #: ../clients/tui/nmtui-edit.c:466
 #, c-format
@@ -7338,18 +6839,18 @@ msgid "Unable to delete connection: %s"
 msgstr "无法删除连接:%s"
 
 #: ../clients/tui/nmtui-edit.c:505
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete connection '%s': %s"
-msgstr "无法删除连接:%s"
+msgstr "无法删除连接“%sâ€ï¼š%s"
 
 #: ../clients/tui/nmtui-edit.c:527
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "您确定è¦åˆ é™¤è¿žæŽ¥ '%s' å—?"
+msgstr "您确定è¦åˆ é™¤è¿žæŽ¥ “%s†å—?"
 
 #: ../clients/tui/nmtui-hostname.c:45
 msgid "Set Hostname"
-msgstr "设定主机å"
+msgstr "设置主机å"
 
 #: ../clients/tui/nmtui-hostname.c:53
 msgid "Hostname"
@@ -7359,12 +6860,12 @@ msgstr "主机å"
 #: ../clients/tui/nmtui-hostname.c:116
 #, c-format
 msgid "Set hostname to '%s'"
-msgstr "将主机å设定为 '%s'"
+msgstr "主机å已设为“%sâ€"
 
 #: ../clients/tui/nmtui-hostname.c:118
 #, c-format
 msgid "Unable to set hostname: %s"
-msgstr "无法设定主机å:%s"
+msgstr "无法设置主机å:%s"
 
 #: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
 msgid "connection"
@@ -7376,7 +6877,7 @@ msgstr "编辑连接"
 
 #: ../clients/tui/nmtui.c:57
 msgid "Activate a connection"
-msgstr "激活连接"
+msgstr "å¯ç”¨è¿žæŽ¥"
 
 #: ../clients/tui/nmtui.c:59
 msgid "new hostname"
@@ -7384,32 +6885,32 @@ msgstr "新主机å"
 
 #: ../clients/tui/nmtui.c:60
 msgid "Set system hostname"
-msgstr "设定系统主机å"
+msgstr "设置系统主机å"
 
-#: ../clients/tui/nmtui.c:83
+#: ../clients/tui/nmtui.c:104
 msgid "NetworkManager TUI"
-msgstr "NetworkManager TUI"
+msgstr "网络管ç†å™¨ TUI"
 
-#: ../clients/tui/nmtui.c:91
+#: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
-msgstr "请选择一个选项"
+msgstr "请选择选项"
 
-#: ../clients/tui/nmtui.c:143
+#: ../clients/tui/nmtui.c:160
 msgid "Usage"
-msgstr "用é‡"
+msgstr "用法"
 
-#: ../clients/tui/nmtui.c:224
+#: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
 msgstr "无法解æžå‚æ•°"
 
-#: ../clients/tui/nmtui.c:234
-#, fuzzy, c-format
+#: ../clients/tui/nmtui.c:251
+#, c-format
 msgid "Could not contact NetworkManager: %s.\n"
-msgstr "无法激活连接:%s"
+msgstr "无法连接 NetworkManager:%s。\n"
 
-#: ../clients/tui/nmtui.c:239
+#: ../clients/tui/nmtui.c:256
 msgid "NetworkManager is not running."
-msgstr "NetworkManager 未è¿è¡Œã€‚"
+msgstr "网络管ç†å™¨æœªè¿è¡Œã€‚"
 
 #: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
@@ -7449,7 +6950,7 @@ msgstr "错误的 PEM 文件格å¼ï¼šDEK-Info 标签中的åˆå§‹å‘釿 ¼å¼æ— æ
 #: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
-msgstr "对 PEM 文件进行æ“作:未知专用密钥 '%s'。"
+msgstr "对 PEM 文件进行æ“作:未知专用密钥 “%sâ€ã€‚"
 
 #: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
 #, c-format
@@ -7458,16 +6959,16 @@ msgstr "无法解ç ç§é’¥ã€‚"
 
 #: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
 msgid "Failed to find expected PKCS#8 start tag."
-msgstr "查找预期的 PKCS#8 起始标签失败。"
+msgstr "无法找到 PKCS#8 起始标记。"
 
 #: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
-msgstr "查找预期的 PKCS#8 终止标签 '%s' 失败。"
+msgstr "无法找到 PKCS#8 ç»“æŸæ ‡è®°â€œ%sâ€ã€‚"
 
 #: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
 msgid "Failed to decode PKCS#8 private key."
-msgstr "è§£ç  PKCS#8 ç§é’¥å¤±è´¥ã€‚"
+msgstr "æ— æ³•è§£ç  PKCS#8 ç§é’¥ã€‚"
 
 #: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
 #, c-format
@@ -7486,7 +6987,7 @@ msgstr "åˆå§‹å‘é‡ä¸­åŒ…å«éžå六进制数字。"
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
-msgstr "æœªçŸ¥ä¸“ç”¨å¯†é’¥å¯†ç  '%s'。"
+msgstr "未知专用密钥密ç â€œ%sâ€ã€‚"
 
 #: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
 #, c-format
@@ -7496,17 +6997,17 @@ msgstr "无法确定ç§é’¥ç±»åž‹ã€‚"
 #: ../libnm-core/crypto.c:502
 #, c-format
 msgid "Password provided, but key was not encrypted."
-msgstr ""
+msgstr "æä¾›äº†å¯†ç ï¼Œä½†å¯†é’¥ä¸åŠ å¯†ã€‚"
 
 #: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
-msgstr "PEM è¯ä¹¦æ–‡ä»¶æ²¡æœ‰èµ·å§‹æ ‡ç­¾ '%s'。"
+msgstr "PEM è¯ä¹¦æ²¡æœ‰èµ·å§‹æ ‡è®°â€œ%sâ€ã€‚"
 
 #: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
-msgstr "PEM è¯ä¹¦æ–‡ä»¶æ²¡æœ‰ç»ˆæ­¢æ ‡ç­¾ '%s'。"
+msgstr "PEM è¯ä¹¦æ²¡æœ‰ç»“æŸæ ‡è®°â€œ%sâ€ã€‚"
 
 #: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
 #, c-format
@@ -7522,16 +7023,6 @@ msgstr "åˆå§‹åŒ–加密引擎失败。"
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "无效åˆå§‹å‘é‡é•¿åº¦(至少为为 %zd)。"
 
-#: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
-#, fuzzy, c-format
-msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr "åˆå§‹åŒ–解密计算内容失败:%s / %s。"
-
-#: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
-#, fuzzy, c-format
-msgid "Failed to decrypt the private key: %s (%s)"
-msgstr "解密ç§é’¥å¤±è´¥ï¼š%s / %s"
-
 #: ../libnm-core/crypto_gnutls.c:134 ../libnm-core/crypto_nss.c:202
 #: ../libnm-util/crypto_gnutls.c:194 ../libnm-util/crypto_nss.c:252
 #, c-format
@@ -7544,16 +7035,6 @@ msgstr "解密ç§é’¥å¤±è´¥ï¼šæ„外的填充长度。"
 msgid "Failed to decrypt the private key."
 msgstr "解密ç§é’¥å¤±è´¥ã€‚"
 
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
-#, fuzzy, c-format
-msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr "åˆå§‹åŒ–加密计算内容失败:%s / %s。"
-
-#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
-#, fuzzy, c-format
-msgid "Failed to encrypt the data: %s (%s)"
-msgstr "加密数æ®å¤±è´¥ï¼š%s / %s。"
-
 #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332
 #, c-format
 msgid "Error initializing certificate data: %s"
@@ -7627,7 +7108,7 @@ msgstr "解密ç§é’¥å¤±è´¥ï¼š%d。"
 #: ../libnm-core/crypto_nss.c:180 ../libnm-util/crypto_nss.c:230
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "解密ç§é’¥å¤±è´¥ï¼šè§£å¯†æ•°æ®å¤ªå¤§ã€‚"
+msgstr "解密ç§é’¥å¤±è´¥ï¼šè§£å¯†åŽçš„æ•°æ®å¤ªå¤§ã€‚"
 
 #: ../libnm-core/crypto_nss.c:191 ../libnm-util/crypto_nss.c:241
 #, c-format
@@ -7637,7 +7118,7 @@ msgstr "结æŸè§£å¯†ç§é’¥å¤±è´¥ï¼š%d。"
 #: ../libnm-core/crypto_nss.c:299 ../libnm-util/crypto_nss.c:345
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr "åˆå§‹åŒ–åŠ å¯†è®¡ç®—æ’æ§½å¤±è´¥ã€‚"
+msgstr "åˆå§‹åŒ–åŠ å¯†è®¡ç®—æ’æ§½ç©ºé—´å¤±è´¥ã€‚"
 
 #: ../libnm-core/crypto_nss.c:307 ../libnm-util/crypto_nss.c:353
 #, c-format
@@ -7672,7 +7153,7 @@ msgstr "无法解ç è¯ä¹¦ï¼š%d"
 #: ../libnm-core/crypto_nss.c:420
 #, c-format
 msgid "Password must be UTF-8"
-msgstr ""
+msgstr "密ç å¿…须是 UTF-8 ç¼–ç "
 
 #: ../libnm-core/crypto_nss.c:450 ../libnm-util/crypto_nss.c:488
 #, c-format
@@ -7695,42 +7176,33 @@ msgstr "无法生æˆéšæœºæ•°æ®ã€‚"
 
 #: ../libnm-core/nm-connection.c:224
 msgid "wrong type; should be a list of strings."
-msgstr ""
+msgstr "错误类型;应该是一个字符串列表。"
 
 #: ../libnm-core/nm-connection.c:294
-#, fuzzy
 msgid "unknown setting name"
-msgstr "错误:ä½ç½®è®¾ç½® '%s'\n"
-
-#: ../libnm-core/nm-connection.c:306
-#, fuzzy
-msgid "duplicate setting name"
-msgstr "错误:ä½ç½®è®¾ç½® '%s'\n"
+msgstr "未知的设置åç§°"
 
-#: ../libnm-core/nm-connection.c:873
+#: ../libnm-core/nm-connection.c:886
 msgid "setting not found"
-msgstr ""
+msgstr "找ä¸åˆ°è®¾ç½®"
 
-#: ../libnm-core/nm-connection.c:937
-#, fuzzy
+#: ../libnm-core/nm-connection.c:950
 msgid "setting not allowed in slave connection"
-msgstr "该连接中未显示设置 '%s'。\n"
+msgstr "在从属连接中ä¸å…许设置"
 
-#: ../libnm-core/nm-connection.c:948
+#: ../libnm-core/nm-connection.c:961
 msgid "setting is required for non-slave connections"
-msgstr ""
+msgstr "éžä»Žå±žè¿žæŽ¥ä¸­éœ€è¦è®¾ç½®"
 
-#: ../libnm-core/nm-connection.c:1042
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1055
 msgid "Unexpected failure to verify the connection"
-msgstr "无法删除连接:%s"
+msgstr "验è¯è¿žæŽ¥æ„外失败"
 
-#: ../libnm-core/nm-connection.c:1075
-#, fuzzy
+#: ../libnm-core/nm-connection.c:1088
 msgid "Unexpected failure to normalize the connection"
-msgstr "无法删除连接:%s"
+msgstr "标准化连接æ„外失败"
 
-#: ../libnm-core/nm-connection.c:1576 ../libnm-core/nm-setting-8021x.c:2411
+#: ../libnm-core/nm-connection.c:1589 ../libnm-core/nm-setting-8021x.c:2411
 #: ../libnm-core/nm-setting-8021x.c:2428 ../libnm-core/nm-setting-8021x.c:2459
 #: ../libnm-core/nm-setting-8021x.c:2476 ../libnm-core/nm-setting-8021x.c:2518
 #: ../libnm-core/nm-setting-8021x.c:2530 ../libnm-core/nm-setting-8021x.c:2548
@@ -7741,7 +7213,7 @@ msgstr "无法删除连接:%s"
 #: ../libnm-core/nm-setting-connection.c:837
 #: ../libnm-core/nm-setting-connection.c:876
 #: ../libnm-core/nm-setting-connection.c:989
-#: ../libnm-core/nm-setting-ip-config.c:2162
+#: ../libnm-core/nm-setting-ip-config.c:2167
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419
 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126
@@ -7769,213 +7241,200 @@ msgstr "无法删除连接:%s"
 msgid "property is missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-dbus-utils.c:188
-#, c-format
-msgid "Method returned type '%s', but expected '%s'"
-msgstr ""
-
 #: ../libnm-core/nm-keyfile-reader.c:136
 msgid "ignoring missing number"
-msgstr ""
+msgstr "忽略缺失的数字"
 
 #: ../libnm-core/nm-keyfile-reader.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid number '%s'"
-msgstr "æ— æ•ˆåº¦é‡ '%s'"
+msgstr "忽略无效的数字 “%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s address: %s"
-msgstr "无效 IPv4 åœ°å€ '%s'"
+msgstr "忽略无效的 %s 地å€ï¼š%s"
 
 #: ../libnm-core/nm-keyfile-reader.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
-msgstr "无效网关 '%s'"
+msgstr "对 %2$s 路由忽略无效网关 “%1$sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid %s route: %s"
-msgstr "无效 IPv4 路由 '%s'"
+msgstr "忽略无效的 %s 路由:%s"
 
 #: ../libnm-core/nm-keyfile-reader.c:343
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
-msgstr ""
+msgstr "æ„外字符 “%câ€(åœ°å€ %s): “%s†(ä½ç½® %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:353
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
-msgstr ""
+msgstr "æ„外字符 “%c†(%s): “%s†(ä½ç½® %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:362
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr ""
+msgstr "æ„外字符 “%câ€(在 %s çš„å‰ç¼€é•¿åº¦ä¸­): “%s†(ä½ç½® %td)"
 
 #: ../libnm-core/nm-keyfile-reader.c:373
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
-msgstr ""
+msgstr "在值 %s 的结尾有垃圾:“%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:379
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
-msgstr ""
+msgstr "在 %s 值结尾ä¸èµžæˆä½¿ç”¨åˆ†å·: “%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:394
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "%s “%s†无效å‰ç¼€é•¿åº¦ï¼Œé»˜è®¤ä¸º %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:401
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
-msgstr ""
+msgstr "%s “%s†缺少å‰ç¼€é•¿åº¦ï¼Œé»˜è®¤ä¸º %d"
 
 #: ../libnm-core/nm-keyfile-reader.c:504
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "无效 IPv4 åœ°å€ '%s'"
+msgstr "忽略无效的 DNS æœåС噍 IPv4 åœ°å€ â€œ%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:543
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "无效 IPv6 åœ°å€ '%s'"
+msgstr "忽略无效的 DNS æœåС噍 IPv6 åœ°å€ â€œ%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:628 ../libnm-core/nm-keyfile-reader.c:769
 #: ../libnm-core/nm-keyfile-reader.c:1446
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr ""
+msgstr "忽略无效字节元素 “%dâ€ï¼ˆä¸åœ¨ 0 å’Œ 255 之间)"
 
 #: ../libnm-core/nm-keyfile-reader.c:642
-#, fuzzy
 msgid "ignoring invalid MAC address"
-msgstr "䏿˜¯æœ‰æ•ˆ MAC 地å€"
+msgstr "忽略无效的 MAC 地å€"
 
 #: ../libnm-core/nm-keyfile-reader.c:758
-#, fuzzy
 msgid "ignoring invalid binary property"
-msgstr "错误:无效属性:%s\n"
+msgstr "忽略无效的二进制属性"
 
 #: ../libnm-core/nm-keyfile-reader.c:801
 msgid "ignoring invalid SSID"
-msgstr ""
+msgstr "忽略无效的 SSID"
 
 #: ../libnm-core/nm-keyfile-reader.c:817
 msgid "ignoring invalid raw password"
-msgstr ""
+msgstr "忽略无效的原始密ç "
 
 #: ../libnm-core/nm-keyfile-reader.c:892 ../libnm-core/nm-keyfile-reader.c:1058
 #, c-format
 msgid "certificate or key file '%s' does not exist"
-msgstr ""
+msgstr "è¯ä¹¦æˆ–密钥文件 “%s†ä¸å­˜åœ¨"
 
 #: ../libnm-core/nm-keyfile-reader.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key/cert value path \"%s\""
-msgstr "无效 '%s' 或其值 '%s'"
+msgstr "无效的密钥/è¯ä¹¦å€¼è·¯å¾„ “%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:935
 msgid "invalid key/cert value data:;base64, is not base64"
-msgstr ""
+msgstr "无效的密钥/è¯ä¹¦å€¼æ•°æ®:;base64ï¼Œä¸æ˜¯ base64"
 
 #: ../libnm-core/nm-keyfile-reader.c:948
 msgid "invalid key/cert value data:;base64,file://"
-msgstr ""
+msgstr "无效的密钥/è¯ä¹¦å€¼æ•°æ®:;base64,file://"
 
 #: ../libnm-core/nm-keyfile-reader.c:1095
 msgid "invalid key/cert value is not a valid blob"
-msgstr ""
+msgstr "无效的 key/cert 值是无效的 blob"
 
 #: ../libnm-core/nm-keyfile-reader.c:1100
-#, fuzzy
 msgid "invalid key/cert value"
-msgstr "无效 '%s' 或其值 '%s'"
+msgstr "无效的密钥/è¯ä¹¦å€¼"
 
 #: ../libnm-core/nm-keyfile-reader.c:1147
-#, fuzzy, c-format
+#, c-format
 msgid "invalid parity value '%s'"
-msgstr "无效 '%s' 或其值 '%s'"
+msgstr "æ— æ•ˆçš„å¥‡å¶æ ¡éªŒå€¼ “%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error loading setting value: %s"
-msgstr "错误:无效设置åç§°ï¼›%s\n"
+msgstr "读å–设定值出错:%s"
 
 #: ../libnm-core/nm-keyfile-reader.c:1379
-#, fuzzy, c-format
+#, c-format
 msgid "invalid negative value (%i)"
-msgstr "无效网关 '%s'"
+msgstr "无效的负值 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#, c-format
 msgid "invalid char value (%i)"
-msgstr "无效 '%s' 或其值 '%s'"
+msgstr "无效字符值 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "invalid int64 value (%s)"
-msgstr "无效 '%s' 或其值 '%s'"
+msgstr "int64 值无效 (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1482
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr ""
+msgstr "FLAGS 属性 “%s†(%llu) 太大"
 
 #: ../libnm-core/nm-keyfile-reader.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "错误:无效 <setting>。<property> '%s'。"
+msgstr "未处ç†çš„设置属性类型 “%sâ€"
 
 #: ../libnm-core/nm-keyfile-reader.c:1526
-#, fuzzy, c-format
+#, c-format
 msgid "invalid setting name '%s'"
-msgstr "错误:无效设置åç§°ï¼›%s\n"
+msgstr "设置å称无效 “%sâ€"
 
 #: ../libnm-core/nm-setting-8021x.c:414
-#, fuzzy
 msgid "data missing"
-msgstr "缺少的属性"
+msgstr "æ•°æ®ç¼ºå¤±"
 
 #: ../libnm-core/nm-setting-8021x.c:448
 msgid "binary data missing"
-msgstr ""
+msgstr "二进制数æ®ç¼ºå¤±"
 
 #: ../libnm-core/nm-setting-8021x.c:465
 msgid "file:// URI not NUL terminated"
-msgstr ""
+msgstr "file:// URI éž NUL 结尾"
 
 #: ../libnm-core/nm-setting-8021x.c:474
 msgid "file:// URI is empty"
-msgstr ""
+msgstr "file:// URI 为空"
 
 #: ../libnm-core/nm-setting-8021x.c:482
-#, fuzzy
 msgid "file:// URI is not valid UTF-8"
-msgstr "索引 '%s' 无效"
+msgstr "file:// URI 为无效的 UTF-8 ç¼–ç "
 
 #: ../libnm-core/nm-setting-8021x.c:681 ../libnm-util/nm-setting-8021x.c:639
 msgid "CA certificate must be in X.509 format"
-msgstr ""
+msgstr "CA è¯ä¹¦å¿…须是 X.509 æ ¼å¼"
 
 #: ../libnm-core/nm-setting-8021x.c:1012 ../libnm-core/nm-setting-8021x.c:1276
 #: ../libnm-core/nm-setting-8021x.c:1612 ../libnm-util/nm-setting-8021x.c:957
 #: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
-#, fuzzy
 msgid "invalid certificate format"
-msgstr "åˆå§‹åŒ–è¯ä¹¦æ•°æ®å‡ºé”™ï¼š%s"
+msgstr "无效的è¯ä¹¦æ ¼å¼"
 
 #: ../libnm-core/nm-setting-8021x.c:1895 ../libnm-util/nm-setting-8021x.c:1812
-#, fuzzy
 msgid "invalid private key"
-msgstr "无效网关 '%s'"
+msgstr "无效的ç§é’¥"
 
 #: ../libnm-core/nm-setting-8021x.c:2207 ../libnm-util/nm-setting-8021x.c:2123
-#, fuzzy
 msgid "invalid phase2 private key"
-msgstr "解密ç§é’¥å¤±è´¥ã€‚"
+msgstr "无效的第二阶段ç§é’¥"
 
 #: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2435
 #: ../libnm-core/nm-setting-8021x.c:2466 ../libnm-core/nm-setting-8021x.c:2483
@@ -7986,7 +7445,7 @@ msgstr "解密ç§é’¥å¤±è´¥ã€‚"
 #: ../libnm-core/nm-setting-connection.c:844
 #: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281
 #: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2174
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158
@@ -8018,12 +7477,12 @@ msgstr "属性为空"
 #: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
-msgstr "必须为 PKCS#12 ç¬¦åˆ '%s' 属性"
+msgstr "PKCS#12:必须匹é…“%sâ€å±žæ€§"
 
 #: ../libnm-core/nm-setting-8021x.c:2723
-#, fuzzy, c-format
+#, c-format
 msgid "certificate is invalid: %s"
-msgstr "属性无效"
+msgstr "è¯ä¹¦æ— æ•ˆï¼š%s"
 
 #: ../libnm-core/nm-setting-8021x.c:2758
 #: ../libnm-core/nm-setting-bluetooth.c:129
@@ -8078,52 +7537,52 @@ msgstr "属性无效"
 #: ../libnm-util/nm-setting-wireless-security.c:900
 #, c-format
 msgid "'%s' is not a valid value for the property"
-msgstr "'%s' 䏿˜¯è¯¥å±žæ€§æœ‰æ•ˆå€¼"
+msgstr "“%sâ€ä¸æ˜¯è¯¥å±žæ€§çš„æœ‰æ•ˆå–值"
 
 #: ../libnm-core/nm-setting-bluetooth.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
-msgstr "éœ€è¦ '%s' 或者 '%s' 设置"
+msgstr "“%sâ€ è¿žæŽ¥éœ€è¦ â€œ%s†或 “%s†设置"
 
 #: ../libnm-core/nm-setting-bond.c:485 ../libnm-util/nm-setting-bond.c:502
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
-msgstr "无效选项 '%s' 或其值 '%s'"
+msgstr "无效选项“%sâ€æˆ–值“%sâ€"
 
 #: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:521
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
-msgstr "åªèƒ½è®¾ç½® '%s' å’Œ '%s' 中的一个"
+msgstr "åªèƒ½è®¾ç½®â€œ%sâ€å’Œâ€œ%sâ€ä¸­çš„一个"
 
 #: ../libnm-core/nm-setting-bond.c:523 ../libnm-util/nm-setting-bond.c:532
 #, c-format
 msgid "mandatory option '%s' is missing"
-msgstr "缺少强制选项 '%s'"
+msgstr "缺少强制选项 “%sâ€"
 
 #: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:541
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
-msgstr "'%s' 䏿˜¯ '%s' 的有效值"
+msgstr "“%sâ€ä¸æ˜¯â€œ%sâ€çš„æœ‰æ•ˆå–值"
 
 #: ../libnm-core/nm-setting-bond.c:547 ../libnm-util/nm-setting-bond.c:554
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
-msgstr "'%s=%s' 与ä¸å…¼å®¹ '%s > 0'"
+msgstr "“%s=%sâ€ä¸Žâ€œ%s > 0â€ä¸å…¼å®¹"
 
 #: ../libnm-core/nm-setting-bond.c:560 ../libnm-util/nm-setting-bond.c:567
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "'%s' 䏿˜¯ '%s' 选项的有效接å£å"
+msgstr "“%sâ€ ä¸æ˜¯ “%s†选项的有效接å£å"
 
 #: ../libnm-core/nm-setting-bond.c:570 ../libnm-util/nm-setting-bond.c:577
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
-msgstr "'%s' 选项åªèƒ½åœ¨ '%s=%s' 中使用"
+msgstr "“%s†选项åªèƒ½åœ¨ “%s=%s†中使用"
 
 #: ../libnm-core/nm-setting-bond.c:583 ../libnm-util/nm-setting-bond.c:590
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
-msgstr "'%s=%s' 䏿˜¯ '%s' 的有效é…ç½®"
+msgstr "“%s=%sâ€ä¸æ˜¯â€œ%sâ€çš„æœ‰æ•ˆé…ç½®"
 
 #: ../libnm-core/nm-setting-bond.c:596 ../libnm-core/nm-setting-bond.c:605
 #: ../libnm-core/nm-setting-bond.c:625 ../libnm-core/nm-setting-bond.c:661
@@ -8131,32 +7590,27 @@ msgstr "'%s=%s' 䏿˜¯ '%s' 的有效é…ç½®"
 #: ../libnm-util/nm-setting-bond.c:632 ../libnm-util/nm-setting-bond.c:668
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
-msgstr "'%s' 选项需è¦è®¾ç½® '%s' 选项"
+msgstr "“%s†选项需è¦è®¾ç½® “%s†选项"
 
 #: ../libnm-core/nm-setting-bond.c:636 ../libnm-util/nm-setting-bond.c:643
 #, c-format
 msgid "'%s' option is empty"
-msgstr "'%s' 选项为空"
+msgstr "“%sâ€é€‰é¡¹ä¸ºç©º"
 
 #: ../libnm-core/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:655
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
-msgstr "'%s' 䏿˜¯ '%s' 选项的有效 IPv4 地å€"
+msgstr "“%sâ€ä¸æ˜¯â€œ%sâ€é€‰é¡¹çš„æœ‰æ•ˆ IPv4 地å€ã€‚"
 
 #: ../libnm-core/nm-setting-bond.c:676 ../libnm-util/nm-setting-bond.c:682
-#, fuzzy, c-format
-msgid "'%s' option is only valid with mode '%s'"
-msgstr "'%s' 选项åªèƒ½åœ¨ '%s=%s' 中使用"
-
-#: ../libnm-core/nm-setting-bond.c:687
 #, c-format
-msgid "'%s' and '%s' cannot have different values"
-msgstr ""
+msgid "'%s' option is only valid with mode '%s'"
+msgstr "“%sâ€ é€‰é¡¹ä»…å¯¹æ¨¡å¼ â€œ%s†有效"
 
 #: ../libnm-core/nm-setting-bond.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' option should be string"
-msgstr "'%s' 选项为空"
+msgstr "“%s†选项应该是字符串"
 
 #: ../libnm-core/nm-setting-bridge-port.c:124
 #: ../libnm-core/nm-setting-bridge-port.c:136
@@ -8164,91 +7618,86 @@ msgstr "'%s' 选项为空"
 #: ../libnm-util/nm-setting-bridge-port.c:166
 #, c-format
 msgid "'%d' is not a valid value for the property (should be <= %d)"
-msgstr "'%d' 䏿˜¯è¯¥å±žæ€§æœ‰æ•ˆå€¼ï¼ˆåº”为 <= %d)"
+msgstr "“%dâ€ä¸æ˜¯è¯¥å±žæ€§çš„æœ‰æ•ˆå–值(应 <= %d)"
 
 #: ../libnm-core/nm-setting-bridge-port.c:154
-#: ../libnm-core/nm-setting-team-port.c:97
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team-port.c:109
+#, c-format
 msgid "missing setting"
-msgstr "缺少选项"
+msgstr "缺少设置"
 
 #: ../libnm-core/nm-setting-bridge-port.c:165
-#: ../libnm-core/nm-setting-team-port.c:108
+#: ../libnm-core/nm-setting-team-port.c:120
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr ""
+msgstr "使用 “%s†设置的连接必须将从属类型设置为 “%sâ€ã€‚相å,它是 “%sâ€"
 
 #: ../libnm-core/nm-setting-bridge.c:227 ../libnm-util/nm-setting-bridge.c:269
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
-msgstr "值 '%d' 在 <%d-%d> 范围之外 "
+msgstr "值“%dâ€è¶…出了范围 <%d-%d>"
 
 #: ../libnm-core/nm-setting-bridge.c:244 ../libnm-core/nm-setting-wired.c:639
 #: ../libnm-core/nm-setting-wired.c:699 ../libnm-core/nm-setting-wired.c:727
 #: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
 #: ../libnm-util/nm-setting-wired.c:691
 msgid "is not a valid MAC address"
-msgstr "䏿˜¯æœ‰æ•ˆ MAC 地å€"
+msgstr "䏿˜¯æœ‰æ•ˆçš„ MAC 地å€"
 
 #: ../libnm-core/nm-setting-connection.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "setting required for connection of type '%s'"
-msgstr "无法为类型 '%s' 的连接 '%s'创建编辑器。"
+msgstr "“%sâ€ç±»åž‹çš„连接需è¦è®¾ç½®"
 
 #: ../libnm-core/nm-setting-connection.c:897
-#, fuzzy, c-format
+#, c-format
 msgid "connection type '%s' is not valid"
-msgstr "索引 '%s' 无效"
+msgstr "连接类型 “%s†无效"
 
 #: ../libnm-core/nm-setting-connection.c:932
 #: ../libnm-util/nm-setting-connection.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown slave type '%s'"
-msgstr "未知日志等级 '%s'"
+msgstr "未知的从类型 “%sâ€"
 
 #: ../libnm-core/nm-setting-connection.c:942
 #: ../libnm-util/nm-setting-connection.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "Slave connections need a valid '%s' property"
-msgstr "'%s' 连接需è¦åœ¨è¿™ä¸ªå±žæ€§ä¸­æœ‰ '%s'"
+msgstr "从属连接需è¦ä¸€ä¸ªæœ‰æ•ˆçš„ “%s†属性"
 
 #: ../libnm-core/nm-setting-connection.c:963
 #: ../libnm-util/nm-setting-connection.c:897
 #, c-format
 msgid "Cannot set '%s' without '%s'"
-msgstr ""
-
-#: ../libnm-core/nm-setting-connection.c:977
-#, fuzzy, c-format
-msgid "metered value %d is not valid"
-msgstr "索引 '%s' 无效"
+msgstr "没有 “%2$sâ€ï¼Œæ— æ³•设置 “%1$sâ€"
 
 #: ../libnm-core/nm-setting-connection.c:998
 #, c-format
 msgid "property type should be set to '%s'"
-msgstr ""
+msgstr "属性类型应该设置为 “%sâ€"
 
 #: ../libnm-core/nm-setting-connection.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr "需è¦åœ¨è¯¥è¿žæŽ¥ä¸­æœ‰ '%s' 设置"
+msgstr "在连接中从属类型 “%sâ€ éœ€è¦ â€œ%s†设置"
 
 #: ../libnm-core/nm-setting-connection.c:1023
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
-msgstr ""
+msgstr "检测到从属连接使用 “%s†设置和 “%s†端å£ç±»åž‹ã€‚“%sâ€ åº”è¯¥è®¾ç½®æˆ â€œ%sâ€"
 
 #: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
 msgid "flags invalid"
-msgstr "标签无效"
+msgstr "标志无效"
 
 #: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
 msgid "flags invalid - disabled"
-msgstr "标签无效 - å·²ç¦ç”¨"
+msgstr "标志无效 - å·²ç¦ç”¨"
 
 #: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
 #: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
@@ -8266,40 +7715,31 @@ msgstr "sum 䏿˜¯ 100%"
 #: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
 #: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
 msgid "property invalid"
-msgstr "无效属性"
+msgstr "属性无效"
 
 #: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
 msgid "property missing"
-msgstr "缺少的属性"
+msgstr "缺少属性"
 
 #: ../libnm-core/nm-setting-gsm.c:294 ../libnm-util/nm-setting-gsm.c:295
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
-msgstr "属性值 '%s' 为空或者太长 (>64)"
+msgstr "属性值“%sâ€ä¸ºç©ºæˆ–过长(>64)"
 
 #: ../libnm-core/nm-setting-gsm.c:326 ../libnm-util/nm-setting-gsm.c:327
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
-msgstr "'%s' åŒ…å«æ— æ•ˆå­—符(请使用 [A-Za-z._-])"
+msgstr "“%sâ€åŒ…嫿— æ•ˆå­—符(请使用 [A-Za-z._-])"
 
 #: ../libnm-core/nm-setting-gsm.c:352 ../libnm-util/nm-setting-gsm.c:353
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr "'%s' 长度无效(应为 5 或者 6 个数字)"
-
-#: ../libnm-core/nm-setting-gsm.c:397
-#, fuzzy
-msgid "property is empty or wrong size"
-msgstr "属性为空"
-
-#: ../libnm-core/nm-setting-gsm.c:407
-msgid "property must contain only digits"
-msgstr ""
+msgstr "“%sâ€é•¿åº¦æ— æ•ˆï¼ˆåº”为5使ˆ–6使•°ï¼‰"
 
 #: ../libnm-core/nm-setting-infiniband.c:217
 #: ../libnm-util/nm-setting-infiniband.c:231
 msgid "not a valid interface name"
-msgstr "䏿˜¯æœ‰æ•ˆæŽ¥å£å"
+msgstr "䏿˜¯æœ‰æ•ˆçš„æŽ¥å£åç§°"
 
 #: ../libnm-core/nm-setting-infiniband.c:225
 #: ../libnm-util/nm-setting-infiniband.c:239
@@ -8317,94 +7757,73 @@ msgstr "InfiniBand P_Key 连接未指定上级接å£å"
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr ""
+msgstr "软件 infiniband 设备接å£å称必须为 “%s†或 unset (而ä¸èƒ½æ˜¯çŽ°åœ¨çš„ “%sâ€)"
 
 #: ../libnm-core/nm-setting-infiniband.c:286
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
-msgid "Missing IPv4 address"
-msgstr "无效 IPv4 åœ°å€ '%s'"
-
-#: ../libnm-core/nm-setting-ip-config.c:133
-#, fuzzy, c-format
-msgid "Missing IPv6 address"
-msgstr "无效 IPv6 åœ°å€ '%s'"
+msgstr "ä¼ è¾“æ¨¡å¼ â€œ%s†的mtu å¯å¤§å¯ä¸º %d,但它为 %d"
 
 #: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid IPv4 address '%s'"
-msgstr "无效 IPv4 åœ°å€ '%s'"
-
-#: ../libnm-core/nm-setting-ip-config.c:138
-#, fuzzy, c-format
-msgid "Invalid IPv6 address '%s'"
-msgstr "无效 IPv6 åœ°å€ '%s'"
+msgstr "无效的 IPv4 åœ°å€ â€œ%sâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:152
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:153
+#, c-format
 msgid "Invalid IPv4 address prefix '%u'"
-msgstr "无效 IPv4 åœ°å€ '%s'"
-
-#: ../libnm-core/nm-setting-ip-config.c:152
-#, fuzzy, c-format
-msgid "Invalid IPv6 address prefix '%u'"
-msgstr "无效 IPv6 åœ°å€ '%s'"
+msgstr "无效的 IPv4 地å€å‰ç¼€ “%uâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:170
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:168
+#, c-format
 msgid "Invalid routing metric '%s'"
-msgstr "æ— æ•ˆåº¦é‡ '%s'"
+msgstr "æ— æ•ˆçš„è·¯ç”±åº¦é‡ â€œ%sâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:2182
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2187
+#, c-format
 msgid "%d. DNS server address is invalid"
-msgstr "%d。IPv4 åœ°å€æ— æ•ˆã€‚"
+msgstr "%d。DNS æœåŠ¡å™¨åœ°å€æ— æ•ˆ"
 
-#: ../libnm-core/nm-setting-ip-config.c:2198
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2203
+#, c-format
 msgid "%d. IP address is invalid"
-msgstr "%d。IPv4 åœ°å€æ— æ•ˆã€‚"
+msgstr "%d。IP åœ°å€æ— æ•ˆ"
 
-#: ../libnm-core/nm-setting-ip-config.c:2210
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2215
+#, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr "%d。IPv4 åœ°å€æœ‰æ— æ•ˆå‰ç¼€ã€‚"
+msgstr "%d。IP åœ°å€æ— æ•ˆç±»åž‹çš„ “lableâ€(标签)属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:2219
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-ip-config.c:2224
+#, c-format
 msgid "%d. IP address has invalid label '%s'"
-msgstr "%d。IPv4 åœ°å€æœ‰æ— æ•ˆå‰ç¼€ã€‚"
+msgstr "%d。IP 地å€å…·æœ‰æ— æ•ˆçš„æ ‡ç­¾ “%sâ€"
 
-#: ../libnm-core/nm-setting-ip-config.c:2233
+#: ../libnm-core/nm-setting-ip-config.c:2238
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr ""
+msgstr "如果没有已é…置的地å€ï¼Œæ— æ³•设置网关"
 
-#: ../libnm-core/nm-setting-ip-config.c:2242
-#, fuzzy
+#: ../libnm-core/nm-setting-ip-config.c:2247
 msgid "gateway is invalid"
-msgstr "属性无效"
+msgstr "网关无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2256
+#: ../libnm-core/nm-setting-ip-config.c:2261
 #, c-format
 msgid "%d. route is invalid"
-msgstr "%d。路由无效。"
+msgstr "%d。路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:2265
+#: ../libnm-core/nm-setting-ip-config.c:2270
 #, c-format
 msgid "%d. route cannot be a default route"
-msgstr ""
+msgstr "%d。ä¸èƒ½æ˜¯é»˜è®¤è·¯ç”±"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
 #: ../libnm-core/nm-setting-ip6-config.c:144
 #: ../libnm-util/nm-setting-ip4-config.c:879
 #: ../libnm-util/nm-setting-ip6-config.c:843
-#, fuzzy, c-format
+#, c-format
 msgid "this property cannot be empty for '%s=%s'"
-msgstr "'%s=%s' ä¸å…许使用这个属性"
+msgstr "“%s=%s†的这个属性ä¸èƒ½ä¸ºç©º"
 
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
@@ -8420,65 +7839,27 @@ msgstr "'%s=%s' ä¸å…许使用这个属性"
 #: ../libnm-util/nm-setting-ip6-config.c:875
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
-msgstr "'%s=%s' ä¸å…许使用这个属性"
-
-#: ../libnm-core/nm-setting-ip4-config.c:214
-#, fuzzy, c-format
-msgid "'%s' is not a valid FQDN"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆçš„ UUID"
-
-#: ../libnm-core/nm-setting-ip4-config.c:223
-msgid "property cannot be set when dhcp-hostname is also set"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:318
-#, fuzzy, c-format
-msgid "'%d' is not a valid tunnel mode"
-msgstr "'%d' 是无效频é“"
+msgstr "此属性ä¸å…许用于“%s=%sâ€"
 
 #: ../libnm-core/nm-setting-ip-tunnel.c:330
 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647
 #: ../libnm-core/nm-setting-vxlan.c:403 ../libnm-util/nm-setting-vlan.c:567
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
-msgstr "'%s' 䏿˜¯ UUID ä¹Ÿä¸æ˜¯æŽ¥å£å"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:341
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
-#, fuzzy, c-format
-msgid "'%s' is not a valid IPv%c address"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆ MAC 地å€"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:366
-msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:379
-#: ../libnm-core/nm-setting-ip-tunnel.c:395
-#, fuzzy, c-format
-msgid "'%s' is not a valid tunnel key"
-msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„频é“"
-
-#: ../libnm-core/nm-setting-ip-tunnel.c:407
-msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
-msgstr ""
+msgstr "“%sâ€ä¸æ˜¯ UUID 或接å£åç§°"
 
 #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661
 #: ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
-msgstr "未指定属性或者 '%s:%s'"
-
-#: ../libnm-core/nm-setting-macvlan.c:192
-msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr ""
+msgstr "å±žæ€§æœªæŒ‡å®šæˆ–ä¸æ˜¯â€œ%s:%sâ€"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
 #: ../libnm-core/nm-setting-wireless.c:739
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
 #: ../libnm-util/nm-setting-wireless.c:778
 msgid "SSID length is out of range <1-32> bytes"
-msgstr "SSID 长度超过 <1-32> 字节"
+msgstr "SSID 长度超出范围<1-32>字节"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:139
 #: ../libnm-core/nm-setting-wireless.c:779
@@ -8486,348 +7867,178 @@ msgstr "SSID 长度超过 <1-32> 字节"
 #: ../libnm-util/nm-setting-wireless.c:818
 #, c-format
 msgid "'%d' is not a valid channel"
-msgstr "'%d' 是无效频é“"
+msgstr "“%dâ€ä¸æ˜¯æœ‰æ•ˆçš„ä¿¡é“"
 
 #: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
-msgstr "'%d' 超出有效范围 <128-16384>"
+msgstr "“%dâ€è¶…出范围<128-16384>"
 
 #: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
-msgstr "设置这个属性需è¦ä¸€ä¸ªéžé›¶çš„ '%s' 属性"
-
-#: ../libnm-core/nm-setting-tun.c:187
-#, fuzzy, c-format
-msgid "'%u': invalid mode"
-msgstr "'%s' 是无效 Wi-Fi 模å¼"
-
-#: ../libnm-core/nm-setting-tun.c:197
-#, fuzzy, c-format
-msgid "'%s': invalid user ID"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆçš„ UUID"
-
-#: ../libnm-core/nm-setting-tun.c:208
-#, fuzzy, c-format
-msgid "'%s': invalid group ID"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆçš„ UUID"
+msgstr "è®¾ç½®æ­¤å±žæ€§è¦æ±‚“%sâ€å±žæ€§ä¸ä¸ºé›¶"
 
 #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
-msgstr "'%s' 值与 '%s=%s' ä¸åŒ¹é…"
+msgstr "“%sâ€å€¼ä¸Žâ€œ%s=%sâ€ä¸ç¬¦"
 
 #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
-msgstr ""
+msgstr "vlan id 必须在范围 0-4094 但现在是 %u"
 
 #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591
 msgid "flags are invalid"
-msgstr "标签无效"
+msgstr "标志无效"
 
 #: ../libnm-core/nm-setting-vpn.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "secret was empty"
-msgstr "属性为空"
+msgstr "密钥为空"
 
 #: ../libnm-core/nm-setting-vpn.c:490
 msgid "setting contained a secret with an empty name"
-msgstr ""
+msgstr "设置包å«äº†ä¸€ä¸ªå¸¦ç©ºå称的密钥"
 
 #: ../libnm-core/nm-setting-vpn.c:498
 #, c-format
 msgid "secret value was empty"
-msgstr ""
+msgstr "密钥数值为空"
 
 #: ../libnm-core/nm-setting-vpn.c:545 ../libnm-core/nm-setting.c:1784
 msgid "not a secret property"
-msgstr ""
+msgstr "ä¸ä¸ºä¸€é¡¹å¯†é’¥å±žæ€§"
 
 #: ../libnm-core/nm-setting-vpn.c:551
 msgid "secret is not of correct type"
-msgstr ""
+msgstr "å¯†é’¥ç±»åž‹ä¸æ­£ç¡®"
 
 #: ../libnm-core/nm-setting-vpn.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "错误:删除 '%s' 值失败:%s\n"
+msgstr "è½¬æ¢æ•°å€¼ “%s†到 uint 失败"
 
 #: ../libnm-core/nm-setting-vpn.c:594
 msgid "secret flags property not found"
-msgstr ""
+msgstr "secret 标志属性未找到"
 
 #: ../libnm-core/nm-setting-vxlan.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP address"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆ MAC 地å€"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IP 地å€"
 
 #: ../libnm-core/nm-setting-vxlan.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid IP%c address"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆ MAC 地å€"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IP%c 地å€"
 
 #: ../libnm-core/nm-setting-vxlan.c:415
 #, c-format
 msgid "%d is greater than local port max %d"
-msgstr ""
+msgstr "%d å¤§äºŽæœ¬åœ°ç«¯å£æœ€å¤§å€¼ %d"
 
 #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid Ethernet port value"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆä»¥å¤ªç½‘端å£å€¼"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„以太网端å£å€¼"
 
 #: ../libnm-core/nm-setting-wired.c:629 ../libnm-util/nm-setting-wired.c:623
 #, c-format
 msgid "'%s' is not a valid duplex value"
-msgstr "'%s' 䏿˜¯æœ‰æ•ˆé‡å¤å€¼"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„åŒå·¥å€¼"
 
 #: ../libnm-core/nm-setting-wired.c:688 ../libnm-util/nm-setting-wired.c:680
 #, c-format
 msgid "invalid '%s' or its value '%s'"
-msgstr "无效 '%s' 或其值 '%s'"
+msgstr "“%sâ€æˆ–其值“%sâ€æ— æ•ˆ"
 
 #: ../libnm-core/nm-setting-wired.c:709
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
+msgstr "ç½‘ç»œå”¤é†’æ¨¡å¼ â€œdefault†和 “ignore†为排他性标志"
 
 #: ../libnm-core/nm-setting-wired.c:718
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr ""
+msgstr "网络唤醒密ç åªèƒ½åœ¨é­”法å°åŒ…模å¼ä¸‹ä½¿ç”¨"
 
 #: ../libnm-core/nm-setting-wireless-security.c:882
 #: ../libnm-util/nm-setting-wireless-security.c:912
 #, c-format
 msgid "'%s' security requires '%s=%s'"
-msgstr "'%s' å®‰å…¨æ€§éœ€è¦ '%s=%s'"
+msgstr "“%sâ€å®‰å…¨è¦æ±‚“%s=%sâ€"
 
 #: ../libnm-core/nm-setting-wireless-security.c:903
 #: ../libnm-util/nm-setting-wireless-security.c:933
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
-msgstr "'%s' å®‰å…¨æ€§éœ€è¦ '%s' 有设置"
+msgstr "“%sâ€å®‰å…¨è¦æ±‚“%sâ€è®¾ç½®å­˜åœ¨"
 
 #: ../libnm-core/nm-setting-wireless-security.c:924
 #: ../libnm-util/nm-setting-wireless-security.c:954
 #, c-format
 msgid "'%d' value is out of range <0-3>"
-msgstr "'%d' 值超出范围 <0-3>"
+msgstr "“%dâ€å€¼è¶…出范围 <0-3>"
 
 #: ../libnm-core/nm-setting-wireless-security.c:979
 #: ../libnm-util/nm-setting-wireless-security.c:1009
 #, c-format
 msgid "'%s' connections require '%s' in this property"
-msgstr "'%s' 连接需è¦åœ¨è¿™ä¸ªå±žæ€§ä¸­æœ‰ '%s'"
+msgstr "“%sâ€è¿žæŽ¥è¦æ±‚此属性中的“%sâ€"
 
 #: ../libnm-core/nm-setting-wireless-security.c:1009
 #: ../libnm-util/nm-setting-wireless-security.c:1039
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
-msgstr "'%s' ä¸èƒ½ä¸Ž '%s=%s' (WEP) 一åŒä½¿ç”¨"
+msgstr "“%sâ€åªèƒ½ä¸Žâ€œ%s=%sâ€(WEP)共用"
 
 #: ../libnm-core/nm-setting-wireless.c:748
 #: ../libnm-util/nm-setting-wireless.c:787
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
-msgstr "'%s' 是无效 Wi-Fi 模å¼"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ Wi-Fi 模å¼"
 
 #: ../libnm-core/nm-setting-wireless.c:758
 #: ../libnm-util/nm-setting-wireless.c:797
 #, c-format
 msgid "'%s' is not a valid band"
-msgstr "'%s' 是无效æ†ç»‘"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆæ³¢æ®µ"
 
 #: ../libnm-core/nm-setting-wireless.c:768
-#, fuzzy, c-format
-msgid "'%s' requires setting '%s' property"
-msgstr "需è¦è®¾ç½® '%s' 属性"
-
-#: ../libnm-core/nm-setting.c:837
 #, c-format
-msgid "duplicate property"
-msgstr ""
+msgid "'%s' requires setting '%s' property"
+msgstr "“%s†需è¦è®¾ç½® “%s†属性"
 
 #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr ""
-
-#: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
-#, fuzzy, c-format
-msgid "failed to set property: %s"
-msgstr "错误:设定 '%s' 属性失败:%s\n"
-
-#: ../libnm-core/nm-setting.c:926
-#, fuzzy, c-format
-msgid "can not set property: %s"
-msgstr "错误:设定 '%s' 属性失败:%s\n"
-
-#: ../libnm-core/nm-setting.c:942
-#, fuzzy, c-format
-msgid "unknown property"
-msgstr "未知错误"
+msgstr "无法设置类型 “%s†的属性(从类型为“%sâ€çš„值)"
 
 #: ../libnm-core/nm-setting.c:1682
 msgid "secret not found"
-msgstr ""
+msgstr "未找到密钥"
 
 #: ../libnm-core/nm-setting.c:1774
 msgid "secret is not set"
-msgstr ""
-
-#: ../libnm-core/nm-utils.c:2447
-#, fuzzy, c-format
-msgid "failed stat file %s: %s"
-msgstr "è®¾å®šä¿¡å·æŽ©ç å¤±è´¥ï¼š%d"
-
-#: ../libnm-core/nm-utils.c:2456
-#, fuzzy, c-format
-msgid "not a file (%s)"
-msgstr "无法载入文件 '%s'\n"
-
-#: ../libnm-core/nm-utils.c:2467
-#, fuzzy, c-format
-msgid "invalid file owner %d for %s"
-msgstr "无效字段 '%s'; å…许的字段为:%s"
-
-#: ../libnm-core/nm-utils.c:2478
-#, c-format
-msgid "file permissions for %s"
-msgstr ""
+msgstr "未设置密钥"
 
-#: ../libnm-core/nm-utils.c:2488
+#: ../libnm-core/nm-utils.c:2460
 #, c-format
-msgid "reject %s"
-msgstr ""
-
-#: ../libnm-core/nm-utils.c:2508
-#, c-format
-msgid "path is not absolute (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-utils.c:2522
-#, c-format
-msgid "Plugin file does not exist (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-utils.c:2530
-#, fuzzy, c-format
-msgid "Plugin is not a valid file (%s)"
-msgstr "'%s' 䏿˜¯ '%s' 的有效值"
-
-#: ../libnm-core/nm-utils.c:2540
-#, c-format
-msgid "libtool archives are not supported (%s)"
-msgstr ""
+msgid "not a file (%s)"
+msgstr "䏿˜¯ä¸€ä¸ªæ–‡ä»¶ (%s)"
 
-#: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815
+#: ../libnm-core/nm-utils.c:2626 ../libnm-util/nm-utils.c:1815
 #, c-format
 msgid "Could not find \"%s\" binary"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:132
-#, c-format
-msgid "cannot load plugin %s"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:160
-#, c-format
-msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:167
-#, c-format
-msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:183
-#, c-format
-msgid "unknown error initializing plugin %s"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:195
-#, c-format
-msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:256
-#, c-format
-msgid "the plugin does not support import capability"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-editor-plugin.c:276
-#, c-format
-msgid "the plugin does not support export capability"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:109
-#, fuzzy, c-format
-msgid "missing filename"
-msgstr "缺少选项"
-
-#: ../libnm-core/nm-vpn-plugin-info.c:117
-#, c-format
-msgid "filename must be an absolute path (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:126
-#, c-format
-msgid "filename has invalid format (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:383
-#, c-format
-msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:421
-#, c-format
-msgid "there exists a conflicting plugin with the same name (%s)"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:740
-#, fuzzy, c-format
-msgid "missing \"plugin\" setting"
-msgstr "缺少选项"
-
-#: ../libnm-core/nm-vpn-plugin-info.c:750
-#, c-format
-msgid "%s: don't retry loading plugin which already failed previously"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:842
-msgid "missing filename to load VPN plugin info"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:854
-msgid "missing name for VPN plugin info"
-msgstr ""
-
-#: ../libnm-core/nm-vpn-plugin-info.c:863
-msgid "missing service for VPN plugin info"
-msgstr ""
+msgstr "找ä¸åˆ° “%s†二进制"
 
 #: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804
 msgid "Bluetooth"
 msgstr "è“牙"
 
-#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
-#, fuzzy
-msgid "MACVLAN"
-msgstr "VLAN"
-
-#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
-msgid "IPTunnel"
-msgstr ""
-
-#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
-msgid "Veth"
-msgstr ""
-
 #: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864
 msgid "Wired"
-msgstr "有线的"
+msgstr "有线连接"
 
 #: ../libnm-glib/nm-device.c:1944 ../libnm/nm-device.c:1895
 msgid "PCI"
@@ -8851,19 +8062,8 @@ msgid "%s %s"
 msgstr "%s %s"
 
 #: ../libnm-glib/nm-remote-connection.c:149
-#, fuzzy
 msgid "Disconnected by D-Bus"
-msgstr "已断开"
-
-#: ../libnm-util/crypto_gnutls.c:84
-#, c-format
-msgid "Hash length too long (%d > %d)."
-msgstr ""
-
-#: ../libnm-util/crypto_gnutls.c:115
-#, fuzzy, c-format
-msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "åˆå§‹åŒ– MD5 引擎失败:%s / %s。"
+msgstr "ç”± D-Bus æ–­å¼€"
 
 #: ../libnm-util/crypto_nss.c:99
 #, c-format
@@ -8878,250 +8078,187 @@ msgstr "无法将密ç è½¬æ¢ä¸º USC2 æ–¹å¼ï¼š%d"
 #: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
-msgstr "éœ€è¦ '%s' 或者 '%s' 设置"
+msgstr "è¦æ±‚“%sâ€æˆ–“%sâ€è®¾ç½®"
 
 #: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
-msgstr "需è¦åœ¨è¯¥è¿žæŽ¥ä¸­æœ‰ '%s' 设置"
+msgstr "è¦æ±‚连接中存在“%sâ€è®¾ç½®"
 
 #: ../libnm-util/nm-setting-ip4-config.c:957
 #, c-format
 msgid "%d. IPv4 address is invalid"
-msgstr "%d。IPv4 åœ°å€æ— æ•ˆã€‚"
+msgstr "%d。IPv4 åœ°å€æ— æ•ˆ"
 
 #: ../libnm-util/nm-setting-ip4-config.c:967
 #, c-format
 msgid "%d. IPv4 address has invalid prefix"
-msgstr "%d。IPv4 åœ°å€æœ‰æ— æ•ˆå‰ç¼€ã€‚"
+msgstr "%d。IPv4 地å€å‰ç¼€æ— æ•ˆ"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
 #: ../libnm-util/nm-setting-ip6-config.c:936
 #, c-format
 msgid "%d. route has invalid prefix"
-msgstr "%d。路由有无效å‰ç¼€ã€‚"
+msgstr "%d。路由å‰ç¼€æ— æ•ˆ"
 
 #: ../libnm-util/nm-setting-ip6-config.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d。IPv4 åœ°å€æ— æ•ˆã€‚"
+msgstr "%d。IPv6 åœ°å€æ— æ•ˆ"
 
 #: ../libnm-util/nm-setting-ip6-config.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d。IPv4 åœ°å€æœ‰æ— æ•ˆå‰ç¼€ã€‚"
+msgstr "%d。IPv6 地å€å…·æœ‰æ— æ•ˆçš„å‰ç¼€"
 
 #: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr ""
+msgstr "è½¬æ¢ â€œ%s†的值 “%s†为 uint 类型失败"
 
 #: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr ""
+msgstr "Secret 标志属性 “%s†未找到"
 
 #: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
-msgstr "需è¦è®¾ç½® '%s' 属性"
+msgstr "è¦æ±‚设置“%sâ€å±žæ€§"
 
 #: ../libnm/nm-device-adsl.c:74
-#, fuzzy
 msgid "The connection was not an ADSL connection."
-msgstr "连接中(开始二次连接)"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª ADSL 连接。"
 
 #: ../libnm/nm-device-bond.c:112
-#, fuzzy
 msgid "The connection was not a bond connection."
-msgstr "连接中(开始二次连接)"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªç»‘定连接。"
 
 #: ../libnm/nm-device-bridge.c:112
-#, fuzzy
 msgid "The connection was not a bridge connection."
-msgstr "连接中(开始二次连接)"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªæ¡¥æŽ¥è¿žæŽ¥ã€‚"
 
 #: ../libnm/nm-device-bt.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not a Bluetooth connection."
-msgstr "'bluetooth' 连接类型有 1 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯è“牙连接。"
 
 #: ../libnm/nm-device-bt.c:146
 msgid "Invalid device Bluetooth address."
-msgstr ""
+msgstr "无效的设备è“牙地å€ã€‚"
 
 #: ../libnm/nm-device-bt.c:153
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr ""
+msgstr "设备的è“牙地å€ä¸Žè¿žæŽ¥ä¸åŒ¹é…。"
 
 #: ../libnm/nm-device-bt.c:162
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
-msgstr ""
+msgstr "该设备缺ä¹è¿žæŽ¥æ‰€éœ€çš„è“牙功能。"
 
 #: ../libnm/nm-device-ethernet.c:207
-#, fuzzy
 msgid "The connection was not an Ethernet or PPPoE connection."
-msgstr "'PPPoE' 连接类型有四个å¯é€‰å‚数。\n"
-
-#: ../libnm/nm-device-ethernet.c:222
-msgid "The connection and device differ in S390 subchannels."
-msgstr ""
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªä»¥å¤ªç½‘或 PPPoE 连接。"
 
 #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102
 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326
-#, fuzzy
 msgid "Invalid device MAC address."
-msgstr "䏿˜¯æœ‰æ•ˆ MAC 地å€"
-
-#: ../libnm/nm-device-ethernet.c:237
-msgid "The MACs of the device and the connection do not match."
-msgstr ""
-
-#: ../libnm/nm-device-ethernet.c:247
-#, c-format
-msgid "Invalid MAC in the blacklist: %s."
-msgstr ""
-
-#: ../libnm/nm-device-ethernet.c:253
-#, c-format
-msgid "Device MAC (%s) is blacklisted by the connection."
-msgstr ""
+msgstr "无效的设备 MAC 地å€ã€‚"
 
 #: ../libnm/nm-device-generic.c:91
-#, fuzzy
 msgid "The connection was not a generic connection."
-msgstr "连接中(开始二次连接)"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªé€šç”¨è¿žæŽ¥ã€‚"
 
 #: ../libnm/nm-device-generic.c:98
-#, fuzzy
 msgid "The connection did not specify an interface name."
-msgstr "InfiniBand P_Key 连接未指定上级接å£å"
-
-#: ../libnm/nm-device-tun.c:209
-#, fuzzy
-msgid "The connection was not a tun connection."
-msgstr "连接中(开始二次连接)"
-
-#: ../libnm/nm-device-tun.c:218
-#, fuzzy
-msgid "The mode of the device and the connection didn't match"
-msgstr "该设备的活跃连接消失"
+msgstr "连接未指定接å£å称。"
 
 #: ../libnm/nm-device-infiniband.c:94
-#, fuzzy
 msgid "The connection was not an InfiniBand connection."
-msgstr "'InfiniBand' 连接类型有 5 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª InfiniBand 连接。"
 
 #: ../libnm/nm-device-infiniband.c:110 ../libnm/nm-device-wifi.c:611
 #: ../libnm/nm-device-wimax.c:333
 msgid "The MACs of the device and the connection didn't match."
-msgstr ""
-
-#: ../libnm/nm-device-ip-tunnel.c:254
-#, fuzzy
-msgid "The connection was not an IP tunnel connection."
-msgstr "连接中(开始二次连接)"
-
-#: ../libnm/nm-device-macvlan.c:159
-msgid "The connection was not a MAC-VLAN connection."
-msgstr ""
+msgstr "设备的 MAC 地å€ä¸Žè¿žæŽ¥ä¸åŒ¹é…。"
 
 #: ../libnm/nm-device-modem.c:120
-#, fuzzy
 msgid "The connection was not a modem connection."
-msgstr "连接被删除"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªè°ƒåˆ¶è§£è°ƒå™¨è¿žæŽ¥è¿žæŽ¥ã€‚"
 
 #: ../libnm/nm-device-modem.c:128
-#, fuzzy
 msgid "The connection was not a valid modem connection."
-msgstr "连接中(开始二次连接)"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„调制解调器连接。"
 
 #: ../libnm/nm-device-modem.c:135
 msgid "The device is lacking capabilities required by the connection."
-msgstr ""
+msgstr "该设备缺ä¹è¿žæŽ¥æ‰€éœ€çš„功能。"
 
 #: ../libnm/nm-device-olpc-mesh.c:115
-#, fuzzy
 msgid "The connection was not an OLPC Mesh connection."
-msgstr "'OLPC Mesh' 连接类型有 2 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª OLPC 网格连接。"
 
 #: ../libnm/nm-device-team.c:118
-#, fuzzy
 msgid "The connection was not a team connection."
-msgstr "连接被删除"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ªç¾¤ç»„连接。"
 
 #: ../libnm/nm-device-vlan.c:128
-#, fuzzy
 msgid "The connection was not a VLAN connection."
-msgstr "'VLAN' 连接类型有 4 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª VLAN 连接。"
 
 #: ../libnm/nm-device-vlan.c:135
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "VLAN 设备标识符与连接ä¸åŒ¹é…。"
 
 #: ../libnm/nm-device-vlan.c:148
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
-
-#: ../libnm/nm-device-vxlan.c:387
-#, fuzzy
-msgid "The connection was not a VXLAN connection."
-msgstr "'VLAN' 连接类型有 4 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
-
-#: ../libnm/nm-device-vxlan.c:394
-msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr ""
+msgstr "设备的硬件地å€ä¸Žè¿žæŽ¥ä¸åŒ¹é…。"
 
 #: ../libnm/nm-device-wifi.c:595
 msgid "The connection was not a Wi-Fi connection."
-msgstr ""
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª Wi-Fi 连接。"
 
 #: ../libnm/nm-device-wifi.c:631
 msgid "The device is lacking WPA capabilities required by the connection."
-msgstr ""
+msgstr "该设备缺ä¹ç”±è¿žæŽ¥æ‰€éœ€ WPA 功能。"
 
 #: ../libnm/nm-device-wifi.c:638
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr ""
+msgstr "该设备缺ä¹ç”±è¿žæŽ¥æ‰€éœ€ WPA2/RSN 功能。"
 
 #: ../libnm/nm-device-wimax.c:317
-#, fuzzy
 msgid "The connection was not a WiMAX connection."
-msgstr "'WiMax' 连接类型有 1 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª WiMAX 连接。"
 
 #: ../libnm/nm-device.c:2729
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "错误:连接无效:%s\n"
+msgstr "此连接无效:%s"
 
 #: ../libnm/nm-device.c:2738
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr ""
+msgstr "设备的接å£å称与连接ä¸åŒ¹é…。"
 
 #: ../libnm/nm-manager.c:874
-#, fuzzy
 msgid "Active connection could not be attached to the device"
-msgstr "没有活跃连接或者设备"
+msgstr "活动连接无法连接到设备"
 
 #: ../libnm/nm-manager.c:1098
-#, fuzzy
 msgid "Active connection removed before it was initialized"
-msgstr "活跃连接详情"
+msgstr "在它åˆå§‹åŒ–之å‰ï¼Œåˆ é™¤æ´»åŠ¨è¿žæŽ¥"
 
 #: ../libnm/nm-object.c:1545 ../libnm/nm-object.c:1691
 msgid "Caller did not specify D-Bus path for object"
-msgstr ""
+msgstr "访问者无法指定 D-Bus 路径或者对象"
 
 #: ../libnm/nm-remote-settings.c:261
 msgid "Connection removed before it was initialized"
-msgstr ""
+msgstr "在它åˆå§‹åŒ–之å‰ï¼Œè¿žæŽ¥åˆ é™¤"
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:978
-#, fuzzy
 msgid "No service name specified"
-msgstr "错误:未指定接å£ã€‚"
+msgstr "未指定æœåŠ¡åç§°"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -9135,11 +8272,11 @@ msgstr "系统策略阻止å¯ç”¨æˆ–ç¦ç”¨ç³»ç»Ÿç½‘络"
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
-msgstr "挂起或唤醒 NetworkManager (应仅用于系统电æºç®¡ç†)"
+msgstr "挂起或唤醒网络管ç†å™¨(应仅用于系统电æºç®¡ç†)"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr "系统策略阻止挂起或唤醒 NetworkManager"
+msgstr "系统策略阻止挂起或唤醒网络管ç†å™¨"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid "Enable or disable WiFi devices"
@@ -9159,12 +8296,12 @@ msgstr "系统策略阻止å¯ç”¨æˆ–ç¦ç”¨ç§»åŠ¨å®½å¸¦è®¾å¤‡"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
-msgstr "å¯ç”¨æˆ–者ç¦ç”¨ WiMAX 移动宽带设备"
+msgstr "å¯ç”¨/ç¦ç”¨ WiMAX 移动宽带设备"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr "阻止å¯ç”¨æˆ–ç¦ç”¨ WiMAX 移动宽带设备的系统策略"
+msgstr "系统策略阻止å¯ç”¨æˆ–ç¦ç”¨ WiMAX 移动宽带设备"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
@@ -9184,27 +8321,27 @@ msgstr "系统策略阻止使用å—ä¿æŠ¤çš„ WiFi 网络共享连接"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
 msgid "Connection sharing via an open WiFi network"
-msgstr "通过公开 WiFi 网络共享连接"
+msgstr "通过开放 WiFi 网络共享连接"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
 msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "系统策略阻止使用公开 WiFi 网络共享连接"
+msgstr "系统策略阻止使用开放 WiFi 网络共享连接"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
 msgid "Modify personal network connections"
-msgstr "修改个人网络连接"
+msgstr "更改个人网络连接"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid "System policy prevents modification of personal network settings"
-msgstr "防止修改个人网络设置的系统策略"
+msgstr "系统策略阻止更改个人网络设置"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Modify network connections for all users"
-msgstr "为所有用户修改网络连接"
+msgstr "更改所有用户的网络连接"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents modification of network settings for all users"
-msgstr "系统策略防止为所有用户修改网络设置"
+msgstr "系统策略阻止更改全部用户的共用网络设置"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify persistent system hostname"
@@ -9214,137 +8351,81 @@ msgstr "更改系统固有主机å"
 msgid "System policy prevents modification of the persistent system hostname"
 msgstr "系统策略阻止更改系统固有主机å"
 
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
-msgid "Modify persistent global DNS configuration"
-msgstr ""
-
-#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
-#, fuzzy
-msgid ""
-"System policy prevents modification of the persistent global DNS "
-"configuration"
-msgstr "系统策略阻止更改系统固有主机å"
-
-#: ../shared/nm-shared-utils.c:174
-#, c-format
-msgid "object class '%s' has no property named '%s'"
-msgstr ""
-
-#: ../shared/nm-shared-utils.c:181
-#, c-format
-msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
-
-#: ../shared/nm-shared-utils.c:188
-#, c-format
-msgid ""
-"construct property \"%s\" for object '%s' can't be set after construction"
-msgstr ""
-
-#: ../shared/nm-shared-utils.c:196
-#, c-format
-msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr ""
-
-#: ../shared/nm-shared-utils.c:205
-#, c-format
-msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr ""
-
-#: ../shared/nm-shared-utils.c:216
-#, c-format
-msgid ""
-"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
-"type '%s'"
-msgstr ""
-
 #. Translators: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
 #: ../src/NetworkManagerUtils.c:111
-#, fuzzy, c-format
+#, c-format
 msgctxt "connection id fallback"
 msgid "%s %d"
-msgstr "%s %s"
-
-#: ../src/main.c:220 ../src/main.c:358
-#, fuzzy, c-format
-msgid "Failed to read configuration: %s\n"
-msgstr "读å–é…置失败:(%d)%s\n"
+msgstr "%s %d"
 
 #. Logging/debugging
-#: ../src/main.c:234 ../src/nm-iface-helper.c:297
+#: ../src/main.c:163 ../src/nm-iface-helper.c:298
 msgid "Print NetworkManager version and exit"
-msgstr "显示 NetworkManager 版本并退出"
+msgstr "输出网络管ç†å™¨ç‰ˆæœ¬å¹¶é€€å‡º"
 
-#: ../src/main.c:235 ../src/nm-iface-helper.c:298
+#: ../src/main.c:164 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon"
-msgstr "ä¸è¦æˆä¸ºå®ˆæŠ¤è¿›ç¨‹"
+msgstr "䏿ˆä¸ºå®ˆæŠ¤è¿›ç¨‹"
 
-#: ../src/main.c:236 ../src/nm-iface-helper.c:300
+#: ../src/main.c:165 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log level: one of [%s]"
-msgstr "日志等级: [%s] 之一"
+msgstr "æ—¥å¿—çº§åˆ«ï¼šå– [%s] 之一"
 
-#: ../src/main.c:238 ../src/nm-iface-helper.c:302
+#: ../src/main.c:167 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "以 ',' 分开的日志域:å¯ä»¥æ˜¯ [%s] 的任æ„组åˆ"
+msgstr "以 “,†分开的日志域:å¯ä»¥æ˜¯ [%s] 的任æ„组åˆ"
 
-#: ../src/main.c:240 ../src/nm-iface-helper.c:304
+#: ../src/main.c:169 ../src/nm-iface-helper.c:305
 msgid "Make all warnings fatal"
-msgstr "置所有警告为致命错误"
+msgstr "视所有警告为致命错误"
 
-#: ../src/main.c:241
+#: ../src/main.c:170
 msgid "Specify the location of a PID file"
-msgstr "指定 PID 文件ä½ç½®"
-
-#: ../src/main.c:242
-msgid "State file location"
-msgstr "çŠ¶æ€æ–‡ä»¶ä½ç½®"
+msgstr "指定一个 PID 文件的ä½ç½®"
 
-#: ../src/main.c:244
-#, fuzzy
+#: ../src/main.c:172
 msgid "Print NetworkManager configuration and exit"
-msgstr "显示 NetworkManager 版本并退出"
+msgstr "输出网络管ç†å™¨é…置并退出"
 
-#: ../src/main.c:254
+#: ../src/main.c:182
 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:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392
+#: ../src/main.c:269 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/main.c:348 ../src/nm-iface-helper.c:397
+#: ../src/main.c:274 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "忽略命令行中给出的无法识别的日志域 '%s'。\n"
+msgstr "正在忽略传给命令行的未识别日志域“%sâ€\n"
 
-#: ../src/main.c:373
+#: ../src/main.c:299
 #, c-format
 msgid "Error in configuration file: %s.\n"
-msgstr "é…置文件出错:%s。\n"
+msgstr "é…置文件有错误:%s。\n"
 
-#: ../src/main.c:378
+#: ../src/main.c:304
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr "忽略é…置文件中无法识别的日志域 '%s'。\n"
+msgstr "正在忽略æ¥è‡ªé…置文件的未识别日志域“%sâ€ã€‚\n"
 
-#: ../src/main.c:389 ../src/nm-iface-helper.c:407
+#: ../src/main.c:315 ../src/nm-iface-helper.c:408
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
-msgstr "无法守护进程化:%s [error %u]\n"
+msgstr "无法设为守护进程:%s [错误 %u]\n"
 
 #: ../src/main-utils.c:99
 #, c-format
@@ -9364,17 +8445,19 @@ msgstr "关闭 %s 失败:%s\n"
 #: ../src/main-utils.c:145
 #, c-format
 msgid "Cannot create '%s': %s"
-msgstr ""
+msgstr "无法创建“%sâ€ï¼š%s"
 
 #: ../src/main-utils.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "%s is already running (pid %ld)\n"
-msgstr "NetworkManager 已在è¿è¡Œä¸­ (pid %ld)\n"
+msgstr "%s 已在è¿è¡Œä¸­ (pid %ld)\n"
 
 #: ../src/main-utils.c:207
-#, fuzzy, c-format
+#, c-format
 msgid "You must be root to run %s!\n"
-msgstr "è¿è¡Œ NetworkManager 必须是 root 用户ï¼\n"
+msgstr ""
+"您必须以 root 用户身份è¿è¡Œ %s\n"
+"ï¼\n"
 
 #: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:213
 msgid "# Created by NetworkManager\n"
@@ -9390,858 +8473,1424 @@ msgstr ""
 "\n"
 
 #: ../src/devices/adsl/nm-device-adsl.c:133
-#, fuzzy
 msgid "ADSL connection"
-msgstr "ADSL 连接 %d"
+msgstr "ADSL 连接"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:197
+#: ../src/devices/bluetooth/nm-bluez-device.c:199
 #, c-format
 msgid "%s Network"
 msgstr "%s 网络"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:253
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
+msgstr "PAN 已请求,但è“ç‰™è®¾å¤‡ä¸æ”¯æŒ NAP"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:263
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
-msgstr ""
+msgstr "PAN 连接无法指定 GSMã€CDMA 或串行设置"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:276
-#, fuzzy
 msgid "PAN connection"
-msgstr "PAN 连接 %d"
+msgstr "个人局域网 (PAN) 连接"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:283
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
+msgstr "DUN 已请求,但è“ç‰™è®¾å¤‡ä¸æ”¯æŒ DUN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:293
 msgid "DUN connection must include a GSM or CDMA setting"
-msgstr ""
+msgstr "DUN 连接必须包å«ä¸€ä¸ª GSM 或 CDMA 设置"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:303
 #: ../src/devices/wwan/nm-modem-broadband.c:655
-#, fuzzy
 msgid "GSM connection"
-msgstr "GSM 连接 %d"
+msgstr "GSM 连接"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:307
 #: ../src/devices/wwan/nm-modem-broadband.c:679
-#, fuzzy
 msgid "CDMA connection"
-msgstr "CDMA 连接 %d"
+msgstr "CDMA 连接"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:315
 msgid "Unknown/unhandled Bluetooth connection type"
-msgstr ""
+msgstr "未知/未处ç†çš„è“牙连接类型"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:336
-#: ../src/devices/nm-device-ethernet.c:1415
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../src/devices/nm-device-ethernet.c:1420
+#: ../src/devices/nm-device-infiniband.c:193
 #: ../src/devices/wifi/nm-device-wifi.c:872
-#, fuzzy
 msgid "connection does not match device"
-msgstr "没有活跃连接或者设备"
+msgstr "连接ä¸åŒ¹é…设备"
 
 #: ../src/devices/nm-device-bond.c:105
-#, fuzzy
 msgid "Bond connection"
-msgstr "绑定连接 %d"
+msgstr "绑定连接"
 
 #: ../src/devices/nm-device-bridge.c:111
-#, fuzzy
 msgid "Bridge connection"
-msgstr "桥接连接 %d"
+msgstr "æ¡¥å¼è¿žæŽ¥"
 
-#: ../src/devices/nm-device-ethernet.c:1396
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "PPPoE connection"
-msgstr "PPPoE 连接 %d"
+msgstr "PPPoE 连接"
 
-#: ../src/devices/nm-device-ethernet.c:1396
-#, fuzzy
+#: ../src/devices/nm-device-ethernet.c:1401
 msgid "Wired connection"
-msgstr "有线连接 %d"
+msgstr "有线连接"
 
 #: ../src/devices/nm-device-ethernet-utils.c:39
 #, c-format
 msgid "Wired connection %d"
 msgstr "有线连接 %d"
 
-#: ../src/devices/nm-device-infiniband.c:174
-#, fuzzy
+#: ../src/devices/nm-device-infiniband.c:175
 msgid "InfiniBand connection"
-msgstr "InfiniBand 连接 %d"
+msgstr "InfiniBand 连接"
 
 #: ../src/devices/nm-device-ip-tunnel.c:346
-#, fuzzy
 msgid "IP tunnel connection"
-msgstr "编辑连接"
+msgstr "IP éš§é“连接"
 
-#: ../src/devices/nm-device-macvlan.c:428
-#, fuzzy
+#: ../src/devices/nm-device-macvlan.c:435
 msgid "MACVLAN connection"
-msgstr "VLAN 连接 %d"
+msgstr "MACVLAN 连接"
 
 #: ../src/devices/nm-device-tun.c:129
-#, fuzzy
 msgid "TUN connection"
-msgstr "DUN 连接 %d"
+msgstr "TUN 连接"
 
-#: ../src/devices/nm-device-vlan.c:447
-#, fuzzy
+#: ../src/devices/nm-device-vlan.c:457
 msgid "VLAN connection"
-msgstr "VLAN 连接 %d"
+msgstr "VLAN 连接"
 
 #: ../src/devices/nm-device-vxlan.c:373
-#, fuzzy
 msgid "VXLAN connection"
-msgstr "VLAN 连接 %d"
+msgstr "VXLAN 连接"
 
-#: ../src/devices/team/nm-device-team.c:115
-#, fuzzy
+#: ../src/devices/team/nm-device-team.c:116
 msgid "Team connection"
-msgstr "Team 连接 %d"
+msgstr "组队连接"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:146
-#, fuzzy
 msgid "Mesh"
-msgstr "Mesh %d"
+msgstr "网格"
 
 #: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr ""
+msgstr "WPA Ad-Hoc 由于内核缺陷被ç¦ç”¨"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:42
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with static WEP keys"
-msgstr "'%s=%s' 与ä¸å…¼å®¹ '%s > 0'"
+msgstr "%s ä¸Žé™æ€ WEP 密钥ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:76
-#, fuzzy
 msgid "LEAP authentication requires a LEAP username"
-msgstr "无线网络所需认è¯"
+msgstr "LEAP 验è¯éœ€è¦ LEAP 用户å"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:86
 msgid "LEAP username requires 'leap' authentication"
-msgstr ""
+msgstr "LEAP 用户åéœ€è¦ â€œleap†验è¯"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:99
 msgid "LEAP authentication requires IEEE 802.1x key management"
-msgstr ""
+msgstr "LEAP 验è¯éœ€è¦ IEEE 802.1x 密钥管ç†"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:119
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
-msgstr ""
+msgstr "LEAP 验è¯ä¸Ž Ad-Hoc 模å¼ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:131
 msgid "LEAP authentication is incompatible with 802.1x setting"
-msgstr ""
+msgstr "LEAP 验è¯ä¸Ž 802.1x 设置ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:153
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr ""
-
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:164
-#, c-format
-msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr ""
-
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:180
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:197
-#, c-format
-msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr ""
-
-#: ../src/devices/wifi/nm-wifi-ap-utils.c:209
-#, c-format
-msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr ""
+msgstr "一个使用 “%s†认è¯çš„连接无法使用 WPA 密钥管ç†"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:240
-#, fuzzy
 msgid "Dynamic WEP requires an 802.1x setting"
-msgstr "åŠ¨æ€ WEP (802.1x)"
+msgstr "åŠ¨æ€ WEP 需è¦å¯¹ 802.1x 设置"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:250
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:278
 msgid "Dynamic WEP requires 'open' authentication"
-msgstr ""
+msgstr "åŠ¨æ€ WEP éœ€è¦ â€œopen†认è¯"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:265
 msgid "Dynamic WEP requires 'ieee8021x' key management"
-msgstr ""
+msgstr "åŠ¨æ€ WEP éœ€è¦ â€œieee8021xâ€ å¯†é’¥ç®¡ç† "
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:312
 msgid "WPA-PSK authentication is incompatible with 802.1x"
-msgstr ""
+msgstr "WPA-PSK èº«ä»½è®¤è¯ ä¸Ž 802.1x ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:322
-#, fuzzy
 msgid "WPA-PSK requires 'open' authentication"
-msgstr "有线 802.1X 认è¯"
+msgstr "WPA-PSK 需è¦â€œå¼€æ”¾â€è®¤è¯"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:334
 msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr ""
+msgstr "WPA Ad-Hoc 认è¯éœ€è¦ä¸€ä¸ª Ad-Hoc 模å¼çš„ AP"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:347
 msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr ""
+msgstr "WPA Ad-Hoc 认è¯éœ€è¦ç”¨ “wpa†åè®®"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:359
-#, fuzzy
 msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "无线网络所需认è¯"
+msgstr "WPA Ad-Hoc 认è¯è¦æ±‚ “none†æˆå¯¹å¯†ç "
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:371
 msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr ""
+msgstr "WPA  Ad-Hoc éœ€è¦ â€œTKIP†加密组"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:385
 msgid "Access point does not support PSK but setting requires it"
-msgstr ""
+msgstr "æŽ¥å…¥ç‚¹ä¸æ”¯æŒ PSK,但设置需è¦å®ƒ"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:415
 msgid "WPA-EAP authentication requires an 802.1x setting"
-msgstr ""
+msgstr "WPA-EAP 身份验è¯éœ€è¦è¿›è¡Œ 802.1x 设置"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:425
-#, fuzzy
 msgid "WPA-EAP requires 'open' authentication"
-msgstr "有线 802.1X 认è¯"
+msgstr "WPA-EAP éœ€è¦ â€œopen†认è¯"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:436
 msgid "802.1x setting requires 'wpa-eap' key management"
-msgstr ""
+msgstr "802.1x è®¾ç½®éœ€è¦ â€œWPA-EAP†密钥管ç†"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:449
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr ""
+msgstr "æŽ¥å…¥ç‚¹ä¸æ”¯æŒ 802.1x,但设置需è¦å®ƒ"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:477
 msgid ""
 "Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr ""
+msgstr "æŽ¥å…¥ç‚¹æ¨¡å¼æ˜¯ Ad-Hoc ,但设置需è¦åŸºç¡€è®¾æ–½å®‰å…¨ "
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:487
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
-msgstr ""
+msgstr "Ad-Hoc 模å¼ä¸Ž 802.1x 安全ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:496
 msgid "Ad-Hoc mode is incompatible with LEAP security"
-msgstr ""
+msgstr "Ad-Hoc 模å¼ä¸Ž LEAP 安全ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:506
 msgid "Ad-Hoc mode requires 'open' authentication"
-msgstr ""
+msgstr "Ad-Hoc 模å¼éœ€è¦ “open†认è¯"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:516
 msgid ""
 "Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr ""
+msgstr "æŽ¥å…¥ç‚¹æ¨¡å¼æ˜¯åŸºç¡€è®¾æ–½ï¼Œä½†è®¾ç½®è¦æ±‚ Ad-Hoc 安全"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:558
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:588
 #, c-format
 msgid "connection does not match access point"
-msgstr ""
+msgstr "连接ä¸åŒ¹é…接入点"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:612
 msgid "Access point is unencrypted but setting specifies security"
-msgstr ""
+msgstr "接入点ä¸åŠ å¯†ï¼Œä½†è®¾ç½®æŒ‡å®šäº†å®‰å…¨è®¾ç½®"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:701
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
-msgstr ""
+msgstr "WPA 身份认è¯ä¸Žéž EAP (原始) LEAP æˆ–è€…åŠ¨æ€ WEP ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:711
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr ""
+msgstr "WPA 身份认è¯ä¸Žå…±äº«å¯†é’¥è®¤è¯ä¸å…¼å®¹"
 
 #: ../src/devices/wifi/nm-wifi-ap-utils.c:758
-#, fuzzy
 msgid "Failed to determine AP security information"
-msgstr "为解密设置对称密钥失败。"
+msgstr "未能确定 AP 的安全信æ¯"
 
 #: ../src/devices/wwan/nm-modem-broadband.c:641
-#, fuzzy
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "移动带宽连接 %d"
+msgstr "GSM ç§»åŠ¨å®½å¸¦è¿žæŽ¥éœ€è¦ â€œgsm†设置"
 
-#: ../src/nm-config.c:465
+#: ../src/nm-config.c:499
 msgid "Config file location"
 msgstr "é…置文件ä½ç½®"
 
-#: ../src/nm-config.c:466
+#: ../src/nm-config.c:500
 msgid "Config directory location"
 msgstr "é…置目录ä½ç½®"
 
-#: ../src/nm-config.c:467
-#, fuzzy
-msgid "System config directory location"
-msgstr "é…置目录ä½ç½®"
-
-#: ../src/nm-config.c:468
-#, fuzzy
-msgid "Internal config file location"
-msgstr "é…置文件ä½ç½®"
+# 本po文件里é¢ï¼Œæœ‰çš„翻译æˆâ€œå£°æ˜Žæ–‡ä»¶â€ï¼Œæœ‰çš„æ˜¯â€œçŠ¶æ€æ–‡ä»¶â€ã€‚。。
+#: ../src/nm-config.c:503
+msgid "State file location"
+msgstr "çŠ¶æ€æ–‡ä»¶ä½ç½®"
 
-#: ../src/nm-config.c:469
+#: ../src/nm-config.c:504
 msgid "State file for no-auto-default devices"
-msgstr ""
+msgstr "éžè‡ªåŠ¨é»˜è®¤è®¾å¤‡çš„çŠ¶æ€æ–‡ä»¶"
 
-#: ../src/nm-config.c:470
+#: ../src/nm-config.c:505
 msgid "List of plugins separated by ','"
-msgstr "以 ',' 分开的æ’件列表"
+msgstr "æ’件列表,以“,â€éš”å¼€"
 
-#: ../src/nm-config.c:471
-#, fuzzy
+#: ../src/nm-config.c:506
 msgid "Quit after initial configuration"
-msgstr "å½“å‰ nmcli é…置:\n"
+msgstr "åˆå§‹é…ç½®åŽé€€å‡º"
 
-#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299
+#: ../src/nm-config.c:507 ../src/nm-iface-helper.c:300
 msgid "Don't become a daemon, and log to stderr"
-msgstr "ä¸è¦æˆä¸ºå®ˆæŠ¤è¿›ç¨‹å¹¶åœ¨ stderr 中记录"
+msgstr "䏿ˆä¸ºå®ˆæŠ¤è¿›ç¨‹ï¼Œå¹¶å‘ stderr æ‰“å°æ—¥å¿—"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:475
+#: ../src/nm-config.c:510
 msgid "An http(s) address for checking internet connectivity"
-msgstr "检查互è”网连接性的 http(s)地å€"
+msgstr "检查网络连通用的 http(s) 地å€"
 
-#: ../src/nm-config.c:476
+#: ../src/nm-config.c:511
 msgid "The interval between connectivity checks (in seconds)"
-msgstr "检查连接性的时间间隔(å•ä½ç§’)"
+msgstr "网络连通检查间隔(秒)"
 
-#: ../src/nm-config.c:477
+#: ../src/nm-config.c:512
 msgid "The expected start of the response"
-msgstr "预期的å“应开始"
+msgstr "预期的å“应开头"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:280
-#, fuzzy
+#: ../src/nm-iface-helper.c:281
 msgid "The interface to manage"
-msgstr "ä¸Šçº§æŽ¥å£ [none]:"
+msgstr "接å£ç®¡ç†"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "eth0"
-msgstr ""
+msgstr "eth0"
 
-#: ../src/nm-iface-helper.c:281
-#, fuzzy
+#: ../src/nm-iface-helper.c:282
 msgid "Connection UUID"
-msgstr "连接"
+msgstr "连接 UUID"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
-msgstr ""
+msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Whether to manage IPv6 SLAAC"
-msgstr ""
+msgstr "是å¦ç®¡ç† IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Whether SLAAC must be successful"
-msgstr ""
+msgstr "æ˜¯å¦ SLAAC å¿…é¡»æˆåŠŸ"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Use an IPv6 temporary privacy address"
-msgstr ""
+msgstr "使用一个 IPv6 临时ä¿å¯†åœ°å€"
 
-#: ../src/nm-iface-helper.c:285
-#, fuzzy
+#: ../src/nm-iface-helper.c:286
 msgid "Current DHCPv4 address"
-msgstr "克隆的 MAC 地å€"
+msgstr "å½“å‰ DHCPv4 地å€"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Whether DHCPv4 must be successful"
-msgstr ""
+msgstr "æ˜¯å¦ DHCPv4 å¿…é¡»æˆåŠŸ"
 
-#: ../src/nm-iface-helper.c:287
-#, fuzzy
+#: ../src/nm-iface-helper.c:288
 msgid "Hex-encoded DHCPv4 client ID"
-msgstr "䏿”¯æŒçš„ DHCP 客户端 '%s'"
+msgstr "å六进制编ç çš„ DHCPv4 客户端 ID"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Hostname to send to DHCP server"
-msgstr ""
-
-#: ../src/nm-iface-helper.c:288
-msgid "barbar"
-msgstr ""
+msgstr "主机åå‘é€ç»™ DHCP æœåС噍"
 
 #: ../src/nm-iface-helper.c:289
-msgid "FQDN to send to DHCP server"
-msgstr ""
+msgid "barbar"
+msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "host.domain.org"
-msgstr ""
+msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:290
-#, fuzzy
+#: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv4"
-msgstr "未删除任何优先级"
+msgstr "IPv4 路由优先级"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "0"
-msgstr ""
+msgstr "0"
 
-#: ../src/nm-iface-helper.c:291
-#, fuzzy
+#: ../src/nm-iface-helper.c:292
 msgid "Route priority for IPv6"
-msgstr "未删除任何优先级"
-
-#: ../src/nm-iface-helper.c:291
-msgid "1024"
-msgstr ""
+msgstr "IPv6 路由优先级"
 
 #: ../src/nm-iface-helper.c:292
-msgid "Hex-encoded Interface Identifier"
-msgstr ""
+msgid "1024"
+msgstr "1024"
 
 #: ../src/nm-iface-helper.c:293
-msgid "IPv6 SLAAC address generation mode"
-msgstr ""
-
-#: ../src/nm-iface-helper.c:294
-msgid ""
-"The logging backend configuration value. See logging.backend in "
-"NetworkManager.conf"
-msgstr ""
+msgid "Hex-encoded Interface Identifier"
+msgstr "å六进制编ç çš„æŽ¥å£æ ‡è¯†ç¬¦"
 
-#: ../src/nm-iface-helper.c:314
+#: ../src/nm-iface-helper.c:315
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
-msgstr ""
+msgstr "nm-iface-helper 是一个å°çš„ã€ç‹¬ç«‹çš„进程,用æ¥ç®¡ç†å•独的网络接å£ã€‚"
 
-#: ../src/nm-iface-helper.c:373
+#: ../src/nm-iface-helper.c:374
 #, c-format
 msgid "An interface name and UUID are required\n"
-msgstr ""
+msgstr "éœ€è¦æŽ¥å£åç§°å’Œ UUID\n"
 
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:380
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
-msgstr ""
+msgstr "无法找到 %s (%s) 的接å£ç´¢å¼•\n"
 
-#: ../src/nm-iface-helper.c:441
+#: ../src/nm-iface-helper.c:442
 #, c-format
 msgid "(%s): Invalid IID %s\n"
-msgstr ""
+msgstr "(%s):无效的 IID %s\n"
 
 #: ../src/nm-logging.c:216
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "未知日志等级 '%s'"
+msgstr "未知日志等级“%sâ€"
 
 #: ../src/nm-logging.c:309
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "未知日志域 '%s'"
+msgstr "未知日志域“%sâ€"
 
-#: ../src/nm-manager.c:3625
-#, fuzzy
+#: ../src/nm-manager.c:3603
 msgid "VPN connection"
-msgstr "VPN 连接中"
-
-#: ../src/nm-sleep-monitor-systemd.c:131
-msgid "NetworkManager needs to turn off networks"
-msgstr "NetworkManager 需è¦å…³é—­ç½‘络"
+msgstr "VPN 连接"
 
 #: ../src/settings/plugins/ifcfg-rh/reader.c:108
 msgid "System"
 msgstr "系统"
 
+#. Ask for optional 'macvlan' arguments.
+#: ../clients/cli/connections.c:4252
 #, fuzzy
-#~ msgid "Error: unknown parameter: %s"
-#~ msgstr "æœªçŸ¥å‚æ•°ï¼š%s\n"
+msgid "macvlan"
+msgstr "MACVLAN 模å¼ï¼š"
+
+#: ../clients/cli/connections.c:4258
+#, fuzzy, c-format
+msgid "Tap %s"
+msgstr "错误:“tapâ€ï¼š%s。"
 
+#: ../clients/cli/connections.c:4529
+msgid "Group ID [none]: "
+msgstr "群组 ID [无]:"
+
+#: ../clients/cli/connections.c:7009
+#, fuzzy, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr "错误:必填的“ifnameâ€æœªåœ¨â€œ%sâ€ä¹‹å‰è§è¿‡ã€‚"
+
+#: ../clients/cli/connections.c:10555
+#, fuzzy, c-format
+msgid "Error: not all connections found."
+msgstr "错误:没有找到所有活跃连接。"
+
+#. 23
+#: ../clients/cli/devices.c:79
+msgid "METERED"
+msgstr "计费"
+
+#. 1
+#: ../clients/cli/devices.c:253
 #, fuzzy
-#~ msgid "'%s' is not a valid powersave value"
-#~ msgstr "'%s' 䏿˜¯æœ‰æ•ˆé‡å¤å€¼"
-
-#~ msgid "Failed to read configuration: (%d) %s\n"
-#~ msgstr "读å–é…置失败:(%d)%s\n"
-
-#~ msgid "no usable DHCP client could be found."
-#~ msgstr "找到无法使用的 DHCP 客户端。"
-
-#~ msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-#~ msgstr "注æ„:libc è§£æžå™¨å¯èƒ½ä¸æ”¯æŒè¶…过三个åå­—æœåŠ¡å™¨ã€‚"
-
-#~ msgid "The nameservers listed below may not be recognized."
-#~ msgstr "以下列出的åå­—æœåС噍å¯èƒ½æ— æ³•被识别。"
-
-#~ msgid "invalid prefix '%s'; <1-128> allowed"
-#~ msgstr "无效å‰ç¼€ '%s':å…许 <1-128>"
-
-#~ msgid "invalid prefix '%s'; <0-32> allowed"
-#~ msgstr "无效å‰ç¼€ '%s':å…许 <0-32>"
-
-#~ msgid "invalid next hop address '%s'"
-#~ msgstr "æ— æ•ˆä¸‹ä¸€è·³åœ°å€ '%s'"
-
-#~ msgid "invalid IPv6 route '%s'"
-#~ msgstr "无效 IPv6 路由 '%s'"
-
-#~ msgid "invalid prefix '%s'; <0-128> allowed"
-#~ msgstr "无效å‰ç¼€ '%s':å…许 <0-128>"
-
-#~ msgid ""
-#~ "Usage: nmcli connection show { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
-#~ "\n"
-#~ "Show connections which are currently used by a device to connect to a "
-#~ "network.\n"
-#~ "Without a parameter, all active connections are listed. When <ID> is "
-#~ "provided,\n"
-#~ "the connection details are displayed instead.\n"
-#~ "\n"
-#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
-#~ "\n"
-#~ "Show in-memory and on-disk connections, some of which may also be active "
-#~ "if\n"
-#~ "a device is using that connection profile. Without a parameter, all "
-#~ "profiles\n"
-#~ "are listed. When <ID> is provided, the profile details are displayed "
-#~ "instead.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "用法:nmcli connection show { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
-#~ "\n"
-#~ "Show connections which are currently used by a device to connect to a "
-#~ "network.\n"
-#~ "Without a parameter, all active connections are listed. When <ID> is "
-#~ "provided,\n"
-#~ "the connection details are displayed instead.\n"
-#~ "\n"
-#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
-#~ "\n"
-#~ "Show in-memory and on-disk connections, some of which may also be active "
-#~ "if\n"
-#~ "a device is using that connection profile. Without a parameter, all "
-#~ "profiles\n"
-#~ "are listed. When <ID> is provided, the profile details are displayed "
-#~ "instead.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nmcli connection modify { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-#~ "[<value>]\n"
-#~ "\n"
-#~ "Modify a single property in the connection profile.\n"
-#~ "The profile is identified by its name, UUID or D-Bus path.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "用法:nmcli connection modify { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-#~ "[<value>]\n"
-#~ "\n"
-#~ "Modify a single property in the connection profile.\n"
-#~ "The profile is identified by its name, UUID or D-Bus path.\n"
-#~ "\n"
-
-#~ msgid "Error: 'list configured': %s"
-#~ msgstr "错误:'list configured': %s"
-
-#~ msgid "List of configured connections"
-#~ msgstr "å·²é…置连接列表"
-
-#~ msgid "Error: 'show configured': %s"
-#~ msgstr "错误:'show configured': %s"
-
-#~ msgid "Error: 'list active': %s"
-#~ msgstr "错误:'list active': %s"
-
-#~ msgid "List of active connections"
-#~ msgstr "活跃连接列表"
-
-#~ msgid ""
-#~ "Error: Device '%s' is waiting for slaves before proceeding with "
-#~ "activation."
-#~ msgstr "错误:设备 '%s' åœ¨æ¿€æ´»å‰æ­£åœ¨ç­‰å¾…辅设备。"
-
-#~ msgid ""
-#~ "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
-#~ "connected]."
-#~ msgstr ""
-#~ "错误:'mode': '%s' 䏿˜¯æœ‰æ•ˆ InfiniBand ä¼ è¾“æ¨¡å¼ [datagram, connected]。"
-
-#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
-#~ msgstr "'%s' 连接类型有 3 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
-
-#~ msgid "Transport mode (datagram or connected) [datagram]: "
-#~ msgstr "传输模å¼ï¼ˆdatagram 或者 connected)[datagram]:"
-
-#~ msgid ""
-#~ "There are 2 optional arguments for 'mobile broadband' connection type.\n"
-#~ msgstr "'mobile broadband' 连接类型有 2 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
-
-#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
-#~ msgstr "è“牙类型(panu, dun-gsm or dun-cdma) [panu]: "
-
-#~ msgid "There are optional arguments for 'bond' connection type.\n"
-#~ msgstr "'bond' è¿žæŽ¥ç±»åž‹æœ‰è‡ªé€‰å‚æ•°ã€‚\n"
-
-#~ msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
-#~ msgstr "ç»‘å®šçš„ç›‘æŽ§æ¨¡å¼ (miimon 或者 arp) [miimon]: "
-
-#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
-#~ msgstr "'bridge' 连接类型有 6 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
-
-#~ msgid "Error: 'stp': '%s'.\n"
-#~ msgstr "错误:'stp': '%s'。\n"
-
-#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
-#~ msgstr "'bridge-slave' 连接类型有 3 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
-
-#~ msgid "Hairpin (yes/no) [yes]: "
-#~ msgstr "Hairpin (yes/no) [yes]: "
-
-#~ msgid "Error: 'hairpin': '%s'.\n"
-#~ msgstr "错误:'hairpin': '%s'。\n"
-
-#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
-#~ msgstr "'VPN' 连接类型有 1 ä¸ªè‡ªé€‰å‚æ•°ã€‚\n"
-
-#~ msgid ""
-#~ "Warning: 'type' is currently ignored. We only support ethernet slaves for "
-#~ "now.\n"
-#~ msgstr "警告:'type' ç›®å‰è¢«å¿½ç•¥ã€‚æˆ‘ä»¬çŽ°åœ¨åªæ”¯æŒä»¥å¤ªç½‘从属设备。\n"
-
-#~ msgid "Team master: "
-#~ msgstr "Team master: "
-
-#~ msgid "Bridge master: "
-#~ msgstr "桥接主机:"
-
-#~ msgid ""
-#~ "save  :: save the connection\n"
-#~ "\n"
-#~ "Sends the connection to NetworkManager that will save it.\n"
-#~ msgstr ""
-#~ "save  :: save the connection\n"
-#~ "\n"
-#~ "将连接å‘é€åˆ°å¯ä¿å­˜å®ƒçš„ NetworkManager。\n"
-
-#~ msgid ""
-#~ "remove [<index>|<option>]  :: delete the value\n"
-#~ "\n"
-#~ "Removes the property value (sets it to default).\n"
-#~ msgstr ""
-#~ "remove [<index>|<option>]  :: delete the value\n"
-#~ "\n"
-#~ "Removes the property value (sets it to default).\n"
+msgid "CHASSIS-ID"
+msgstr "ID:"
 
-#~ msgid "Error: bad color number: '%s'; use <0-8>\n"
-#~ msgstr "错误:错误颜色数:'%s'; 使用 <0-8>\n"
+#. 9
+#: ../clients/cli/devices.c:261
+#, fuzzy
+msgid "IEEE-802-1-PPVID-FLAGS"
+msgstr "IEEE-802-1-PPVID"
 
-#~ msgid ""
-#~ ">>> Command-line editing is not available. Consider installing a line "
-#~ "editing library to enable the feature. <<<\n"
-#~ "Supported libraries are:\n"
-#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-#~ "readline/rltop.html\n"
-#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-#~ msgstr ""
-#~ ">>> 命令行编辑ä¸å¯ç”¨ã€‚考虑安装编辑库的行å¯ç”¨è¯¥åŠŸèƒ½ã€‚ <<<\n"
-#~ "支æŒçš„库有:\n"
-#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-#~ "readline/rltop.html\n"
-#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
+#. 11
+#: ../clients/cli/devices.c:263
+#, fuzzy
+msgid "IEEE-802-1-VLAN-NAME"
+msgstr "IEEE-802-1-PVID"
 
-#~ msgid ""
-#~ "Error: 'configured' or 'active' command is expected for 'connection show'."
-#~ msgstr "错误:'connection show' 应显示 'configured' 或者 'active' 命令。"
+#. 12
+#: ../clients/cli/devices.c:264
+#, fuzzy
+msgid "DESTINATION"
+msgstr "目标"
 
-#~ msgid "Error: Can't obtain connections: settings service is not running."
-#~ msgstr "错误:无法获得连接:设置æœåŠ¡æœªåœ¨è¿è¡Œã€‚"
+#. 13
+#: ../clients/cli/devices.c:265
+#, fuzzy
+msgid "CHASSIS-ID-TYPE"
+msgstr "边类型的唯一标识。"
 
-#~ msgid "Home"
-#~ msgstr "主目录"
+#: ../clients/cli/devices.c:343
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli device reapply { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := <ifname> ...\n"
+"\n"
+"Attempts to update device with changes to the currently active connection\n"
+"made since it was last applied.\n"
+"\n"
+msgstr ""
+"用法:nmcli device disconnect { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := <ifname>\n"
+"\n"
+"断开该设备。\n"
+"该命令断开该设备并方å¼å…¶åœ¨æ²¡æœ‰ç”¨æˆ·/èœå•\n"
+"互动的情况下自动激活进一步的连接。\n"
+"\n"
 
-#~ msgid "Partner"
-#~ msgstr "åˆä½œä¼™ä¼´"
+#: ../clients/cli/devices.c:379
+#, c-format
+msgid ""
+"Usage: nmcli device set { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
+"DEVICE    := [ifname] <ifname> \n"
+"PROPERTY  := { autoconnect { yes | no } |\n"
+"             { managed { yes | no }\n"
+"\n"
+"Modify device properties.\n"
+"\n"
+msgstr ""
 
-#~ msgid "Roaming"
-#~ msgstr "漫游"
+#: ../clients/cli/devices.c:392
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli device monitor { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<ifname>] ...\n"
+"\n"
+"Monitor device activity.\n"
+"This command prints a line whenever the specified devices change state.\n"
+"Monitors all devices in case no interface is specified.\n"
+"\n"
+msgstr ""
+"用法:nmcli device show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<ifname>]\n"
+"\n"
+"显示设备详情。\n"
+"该命令列出所有设备或者给定设备详情。\n"
+"\n"
 
-#~ msgid "Device '%s' has been disconnected.\n"
-#~ msgstr "已断开设备 '%s' 的连接。\n"
+#: ../clients/cli/devices.c:404
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli device wifi { ARGUMENTS | help }\n"
+"\n"
+"Perform operation on Wi-Fi devices.\n"
+"\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"\n"
+"List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
+"used to list APs for a particular interface, or with a specific BSSID.\n"
+"\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
+"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
+"yes|no]\n"
+"\n"
+"Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
+"a new connection and then activates it on a device. This is a command-line\n"
+"counterpart of clicking an SSID in a GUI client. The command always creates\n"
+"a new connection and thus it is mainly useful for connecting to new Wi-Fi\n"
+"networks. If a connection for the network already exists, it is better to\n"
+"bring up the existing profile as follows: nmcli con up id <name>. Note that\n"
+"only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
+"assumed that IP configuration is obtained via DHCP.\n"
+"\n"
+"ARGUMENTS := wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <channel>] [password "
+"<password>]\n"
+"\n"
+"Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
+"to stop the hotspot.\n"
+"Parameters of the hotspot can be influenced by the optional parameters:\n"
+"ifname - Wi-Fi device to use\n"
+"con-name - name of the created hotspot connection profile\n"
+"ssid - SSID of the hotspot\n"
+"band - Wi-Fi band to use\n"
+"channel - Wi-Fi channel to use\n"
+"password - password to use for the hotspot\n"
+"\n"
+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
+"\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
+"be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
+"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
+"be\n"
+"given. Note that this command does not show the APs,\n"
+"use 'nmcli device wifi list' for that.\n"
+"\n"
+msgstr ""
+"用法:nmcli device wifi { ARGUMENTS | help }\n"
+"\n"
+"在 Wi-Fi 失败中执行æ“作。\n"
+"\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"\n"
+"列出å¯ç”¨ Wi-Fi 接入点。å¯ä½¿ç”¨ 'ifname' å’Œ 'bssid' 选项\n"
+"åˆ—å‡ºå…·ä½“æŽ¥å£æˆ–者指定 BSSID çš„ AP。\n"
+"\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
+"                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"\n"
+"连接到由 SSID 或者 BSSID 指定的 Wi-Fi 网络。该命令生æˆ\n"
+"新连接并在设备中将其激活。这是在 GUI 客户端\n"
+"中点击 SSID å½¢æˆçš„命令行副本。该命令总是生æˆä¸€ä¸ª\n"
+"新连接,因此主è¦ç”¨äºŽè¿žæŽ¥åˆ°æ–° Wi-Fi\n"
+"网络。如果该网络已存在,最好使用如下\n"
+"已存在的侧写:nmcli con up id <name>. 注:\n"
+"ç›®å‰åªæ”¯æŒ Openã€WEP å’Œ WPA-PSK ç½‘ç»œã€‚åŒæ—¶ä¹Ÿå‡è®¾\n"
+"通过 DHCP 获得 IP é…置。\n"
+"\n"
+"ARGUMENTS := rescan [[ifname] <ifname>]\n"
+"\n"
+"请求 NetworkManager ç«‹å³é‡æ–°æ‰«æå¯ç”¨æŽ¥å…¥ç‚¹ã€‚\n"
+"NetworkManager 周期性扫æ Wi-Fi 网络,但也å¯ä»¥\n"
+"å¯åŠ¨æ‰‹åŠ¨æ‰«æã€‚æ³¨ï¼šè¿™ä¸ªå‘½ä»¤ä¸æ˜¾ç¤º\n"
+"AP,使用 'nmcli device wifi list' 显示 AP。\n"
+"\n"
 
-#~ msgid "WiMAX NSP list"
-#~ msgstr "WiMAX NSP 列表"
+#: ../clients/cli/devices.c:451
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli device lldp { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [list [ifname <ifname>]]\n"
+"\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can "
+"be\n"
+"used to list neighbors for a particular interface.\n"
+"\n"
+msgstr ""
+"用法:nmcli device wimax { ARGUMENTS | help }\n"
+"\n"
+"在 WiMAX 设备中执行æ“作。\n"
+"\n"
+"ARGUMENTS := [list [ifname <ifname>] [nsp <name>]]\n"
+"\n"
+"列出å¯ç”¨ WiMAX NSP。å¯ä½¿ç”¨ 'ifname' å’Œ 'nsp' 选项\n"
+"åˆ—å‡ºå…·ä½“æŽ¥å£æˆ–者 NSP 的网络。\n"
+"\n"
 
-#~ msgid "Error: 'device wimax': %s"
-#~ msgstr "错误:'device wimax':%s"
+#: ../clients/cli/devices.c:1517
+#, fuzzy, c-format
+msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
+msgstr "错误:设定主机å失败:(%d) %s"
 
-#~ msgid "Error: NSP with name '%s' not found."
-#~ msgstr "错误:未找到 NSP 为 '%s' 的网络。"
+#: ../clients/cli/devices.c:1530
+#, fuzzy, c-format
+msgid "Error: Failed to setup a Wi-Fi hotspot"
+msgstr "错误:设定主机å失败:(%d) %s"
 
-#~ msgid "Error: Device '%s' is not a WiMAX device."
-#~ msgstr "错误:设备 '%s' 䏿˜¯ WiMAX 设备。"
+#: ../clients/cli/devices.c:1547
+#, c-format
+msgid "Hotspot '%s' activated on device '%s'\n"
+msgstr "热点 “%s†已在上设备 “%s†激活\n"
 
-#~ msgid "Error: Access point with nsp '%s' not found."
-#~ msgstr "错误:未找到 nsp '%s' 的接入点。"
+#: ../clients/cli/devices.c:1838
+#, fuzzy, c-format
+msgid "Error: not all connections reapplied."
+msgstr "é”™è¯¯ï¼šä¸æ˜¯æ‰€æœ‰çš„连接都已删除。"
 
-#~ msgid "Error: 'device wimax' command '%s' is not valid."
-#~ msgstr "错误:'device wimax' 命令 '%s' 无效。"
+#: ../clients/cli/devices.c:1839
+#, fuzzy, c-format
+msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n"
+msgstr "错误:ä¿å­˜â€œ%sâ€(%s) 连接失败:%s\n"
+
+#: ../clients/cli/devices.c:1849
+#, fuzzy, c-format
+msgid "Connection successfully reapplied to device '%s'.\n"
+msgstr "设备 “%s†已æˆåŠŸç”±â€œ%sâ€æ¿€æ´» 。\n"
+
+#: ../clients/cli/devices.c:2132
+#, fuzzy, c-format
+msgid "Error: No property specified."
+msgstr "错误:属性 %s\n"
+
+#: ../clients/cli/devices.c:2149
+#, fuzzy, c-format
+msgid "Error: 'managed': %s."
+msgstr "管ç†è€…:"
+
+#: ../clients/cli/devices.c:2174
+#, fuzzy, c-format
+msgid "Error: property '%s' is not known."
+msgstr "错误:无效的属性“%sâ€ï¼š%s。"
+
+#: ../clients/cli/devices.c:2220
+#, fuzzy, c-format
+msgid "%s: using connection '%s'\n"
+msgstr "无此连接“%sâ€"
 
-#~ msgid ""
-#~ "Usage: nmcli radio wimax { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [on | off]\n"
-#~ "\n"
-#~ "Get status of WiMAX radio switch, or turn it on/off.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "用法:nmcli radio wimax { ARGUMENTS | help }\n"
-#~ "\n"
-#~ "ARGUMENTS := [on | off]\n"
-#~ "\n"
-#~ "获得 WiMAX å•选按钮状æ€ï¼Œæˆ–者打开/关闭它。\n"
-#~ "\n"
+#: ../clients/cli/devices.c:2246
+#, c-format
+msgid "%s: device created\n"
+msgstr ""
 
-#~ msgid "not running"
-#~ msgstr "未è¿è¡Œ"
+#: ../clients/cli/devices.c:2253
+#, fuzzy, c-format
+msgid "%s: device removed\n"
+msgstr "设备 “%s†æˆåŠŸåˆ é™¤ã€‚\n"
 
-#~ msgid "Error: %s"
-#~ msgstr "错误:%s"
+#: ../clients/cli/devices.c:2802
+#, fuzzy, c-format
+msgid "Error: Failed to scan hidden SSID: %s."
+msgstr "错误:修改 %s 失败。%s: %s。"
 
-#~ msgid "WiMAX radio switch"
-#~ msgstr "WiMAX 收音机开关"
+#: ../clients/cli/devices.c:2871
+#, c-format
+msgid ""
+"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
+msgstr ""
 
-#~ msgid "0 (unknown)"
-#~ msgstr "0 (未知)"
+#: ../clients/cli/devices.c:3034
+#, fuzzy, c-format
+msgid "'%s' is not valid WPA PSK"
+msgstr "“%s†是无效 PSK"
 
-#~ msgid "any, "
-#~ msgstr "ä»»æ„,"
+#: ../clients/cli/devices.c:3051
+#, fuzzy, c-format
+msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
+msgstr "“%sâ€é•¿åº¦æ— æ•ˆ(应为5使ˆ–6使•°)"
 
-#~ msgid "900 MHz, "
-#~ msgstr "900 MHz,"
+#: ../clients/cli/devices.c:3067
+#, fuzzy, c-format
+msgid "Hotspot password: %s\n"
+msgstr "请输入 %s 在 %s 上的密ç :"
 
-#~ msgid "1800 MHz, "
-#~ msgstr "1800 MHz,"
+#: ../clients/cli/devices.c:3125
+#, fuzzy, c-format
+msgid "Error: ssid is too long."
+msgstr "错误:需è¦â€œssidâ€ã€‚"
 
-#~ msgid "1900 MHz, "
-#~ msgstr "1900 MHz,"
+#: ../clients/cli/devices.c:3137
+#, fuzzy, c-format
+msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
+msgstr "错误:wep-key-type 傿•°å€¼â€œ%sâ€æ— æ•ˆï¼Œè¯·ä½¿ç”¨â€œkeyâ€æˆ–“phraseâ€ã€‚"
 
-#~ msgid "850 MHz, "
-#~ msgstr "850 MHz,"
+#: ../clients/cli/devices.c:3161
+#, fuzzy, c-format
+msgid "Error: Unknown parameter %s."
+msgstr "æœªçŸ¥å‚æ•°ï¼š%s\n"
 
-#~ msgid "WCDMA 3GPP UMTS 2100 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 2100 MHz,"
+#: ../clients/cli/devices.c:3180
+#, fuzzy, c-format
+msgid "Error: channel requires band too."
+msgstr "é”™è¯¯ï¼šéœ€è¦ 'apn'。"
 
-#~ msgid "WCDMA 3GPP UMTS 1800 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1800 MHz,"
+#: ../clients/cli/devices.c:3186
+#, fuzzy, c-format
+msgid "Error: channel '%s' not valid for band '%s'."
+msgstr "错误:“channelâ€ï¼šâ€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„æ•°å€¼ <1-13>。\n"
 
-#~ msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1700/2100 MHz,"
+#: ../clients/cli/devices.c:3214
+#, fuzzy, c-format
+msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
+msgstr "错误:设备“%sâ€ä¸æ˜¯ WiFi 设备。"
 
-#~ msgid "WCDMA 3GPP UMTS 800 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 800 MHz,"
+#: ../clients/cli/devices.c:3249
+#, fuzzy, c-format
+msgid "Error: Invalid 'password': %s."
+msgstr "<b>é”™è¯¯ï¼šæ— æ•ˆçš„ç”¨æˆ·åæˆ–密ç </b>"
 
-#~ msgid "WCDMA 3GPP UMTS 850 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 850 MHz,"
+#: ../clients/cli/devices.c:3318
+#, fuzzy, c-format
+msgid "Error: '%s' cannot repeat."
+msgstr "错误:设置“%sâ€æ˜¯å¿…填的而且无法移除。\n"
 
-#~ msgid "WCDMA 3GPP UMTS 900 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 900 MHz,"
+#. Main header name
+#: ../clients/cli/devices.c:3425
+#, fuzzy
+msgid "Device LLDP neighbors"
+msgstr "邻国:"
 
-#~ msgid "WCDMA 3GPP UMTS 1700 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1700 MHz,"
+#: ../clients/cli/devices.c:3528
+#, fuzzy, c-format
+msgid "Error: 'device lldp list': %s"
+msgstr "错误:没有找到设备“%sâ€ã€‚"
 
-#~ msgid "WCDMA 3GPP UMTS 1900 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 1900 MHz, "
+#: ../clients/cli/devices.c:3575
+#, fuzzy, c-format
+msgid "Error: 'device lldp' command '%s' is not valid."
+msgstr "错误:“device wifiâ€å‘½ä»¤â€œ%sâ€æ— æ•ˆã€‚"
 
-#~ msgid "WCDMA 3GPP UMTS 2600 MHz, "
-#~ msgstr "WCDMA 3GPP UMTS 2600 MHz, "
+#: ../clients/cli/general.c:176
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli radio { COMMAND | help }\n"
+"\n"
+"COMMAND := { all | wifi | wwan }\n"
+"\n"
+"  all | wifi | wwan [ on | off ]\n"
+"\n"
+msgstr ""
+"用法:nmcli radio { COMMAND | help }\n"
+"\n"
+"COMMAND := { all | wifi | wwan | wimax }\n"
+"\n"
+"  all | wifi | wwan | wimax [ on | off ]\n"
+"\n"
+"COMMAND := { all | wifi | wwan }\n"
+"\n"
+"  all | wifi | wwan [ on | off ]\n"
+"\n"
 
-#~ msgid "'%s' is not valid (use ip[/prefix] [gateway])"
-#~ msgstr "'%s' 无效(请使用 ip[/prefix] [gateway])"
+#: ../clients/cli/general.c:215
+#, c-format
+msgid ""
+"Usage: nmcli monitor\n"
+"\n"
+"Monitor NetworkManager changes.\n"
+"Prints a line whenever a change occurs in NetworkManager\n"
+"\n"
+msgstr ""
 
-#~ msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
-#~ msgstr "'%s' 无效(请使用 <dest IP>/prefix <next-hop IP> [metric])"
+#: ../clients/cli/general.c:928
+#, fuzzy, c-format
+msgid "Hostname set to '%s'\n"
+msgstr "主机å已设为“%sâ€"
 
-#~ msgid "Failed to set symmetric key for decryption: %s / %s."
-#~ msgstr "为解密设定对称密钥失败:%s / %s。"
+#: ../clients/cli/general.c:943
+#, fuzzy, c-format
+msgid "'%s' is now the primary connection\n"
+msgstr "错误:“primaryâ€ï¼šâ€œ%s†是无效的接å£å称。\n"
 
-#~ msgid "Failed to set IV for decryption: %s / %s."
-#~ msgstr "为解密设置åˆå§‹å‘é‡å¤±è´¥ï¼š%s / %s。"
+#: ../clients/cli/general.c:945
+#, fuzzy, c-format
+msgid "There's no primary connection\n"
+msgstr "第一个"
 
-#~ msgid "Failed to set symmetric key for encryption: %s / %s."
-#~ msgstr "为加密设置对称密钥失败:%s / %s。"
+#: ../clients/cli/general.c:957
+#, fuzzy, c-format
+msgid "Connectivity is now '%s'\n"
+msgstr "连接"
 
-#~ msgid "Failed to set IV for encryption: %s / %s."
-#~ msgstr "为加密设置åˆå§‹å‘é‡å¤±è´¥ï¼š%s / %s。"
+#: ../clients/cli/general.c:970
+#, fuzzy, c-format
+msgid "Networkmanager is now in the '%s' state\n"
+msgstr "无法连接 NetworkManager:%s。\n"
 
-#~ msgid "'%s' doesn't match the virtual interface name '%s'"
-#~ msgstr "'%s' ä¸ä¸Žè™šæ‹ŸæŽ¥å£å '%s' 匹é…"
+#: ../clients/cli/general.c:981
+#, fuzzy, c-format
+msgid "Error: 'monitor' command '%s' is not valid."
+msgstr "错误:“general†命令“%sâ€æ— æ•ˆã€‚"
 
-#~ msgid "IPv4 configuration is not allowed for slave"
-#~ msgstr "IPv4 é…ç½®ä¸å…许在辅接å£ä¸­ä½¿ç”¨"
+#: ../clients/cli/general.c:995
+#, fuzzy
+msgid "Networkmanager is not running (waiting for it)\n"
+msgstr "错误:网络管ç†å™¨æœªè¿è¡Œã€‚"
 
-#~ msgid "IPv6 configuration is not allowed for slave"
-#~ msgstr "IPv6 é…ç½®ä¸å…许在辅接å£ä¸­ä½¿ç”¨"
+#: ../clients/cli/nmcli.c:83
+#, fuzzy, 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"
+"  -c[olors] auto|yes|no                      whether to use colors in "
+"output\n"
+"  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
+"  -e[scape] yes|no                           escape columns separators in "
+"values\n"
+"  -a[sk]                                     ask for missing parameters\n"
+"  -s[how-secrets]                            allow displaying passwords\n"
+"  -w[ait] <seconds>                          set timeout waiting for "
+"finishing operations\n"
+"  -v[ersion]                                 show program version\n"
+"  -h[elp]                                    print this help\n"
+"\n"
+"OBJECT\n"
+"  g[eneral]       NetworkManager's general status and operations\n"
+"  n[etworking]    overall networking control\n"
+"  r[adio]         NetworkManager radio switches\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
+"  a[gent]         NetworkManager secret agent or polkit agent\n"
+"  m[onitor]       monitor NetworkManager changes\n"
+"\n"
+msgstr ""
+"用法:%s [选项] 对象 { 命令 | help }\n"
+"\n"
+"选项\n"
+"  -t[erse]                                   简æ´è¾“出\n"
+"  -p[retty]                                  易读输出\n"
+"  -m[ode] tabular|multiline                  输出方å¼\n"
+"  -f[ields] <field1,field2,...>|all|common   指定输出字段\n"
+"  -e[scape] yes|no                           对值中的列分隔符进行转义\n"
+"  -n[ocheck]                                 䏿£€æµ‹ nmcli 和网络管ç†å™¨ç‰ˆæœ¬\n"
+"  -a[sk]                                     è¯¢é—®ç¼ºå°‘çš„å‚æ•°\n"
+"  -w[ait] <seconds>                          设置等待æ“作完æˆçš„æ—¶é•¿\n"
+"  -v[ersion]                                 显示程åºç‰ˆæœ¬\n"
+"  -h[elp]                                    æ‰“å°æ­¤å¸®åŠ©\n"
+"\n"
+"对象\n"
+"  g[eneral]       网络管ç†å™¨çš„常规状æ€å’Œæ“作\n"
+"  n[etworking]    整体网络控制\n"
+"  r[adio]         网络管ç†å™¨çš„æ— çº¿å¼€å…³\n"
+"  c[onnection]    网络管ç†å™¨çš„连接\n"
+"  d[evice]        网络管ç†å™¨æ‰€ç®¡ç†çš„设备\n"
+"\n"
 
-#~ msgid "'%s' not allowed for %s=%s"
-#~ msgstr "'%s=%s' ä¸å…许使用 '%s'"
+#: ../clients/cli/settings.c:1770
+#, fuzzy, c-format
+msgid ""
+"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
+"'none'"
+msgstr "无效选项“%sâ€æˆ–值“%sâ€"
 
-#~ msgid "/path/to/state.file"
-#~ msgstr "/path/to/state.file"
+#: ../clients/cli/settings.c:1781
+#, fuzzy
+msgid "'default' and 'ignore' are incompatible with other flags"
+msgstr "ç½‘ç»œå”¤é†’æ¨¡å¼ â€œdefault†和 “ignore†为排他性标志"
 
-#~ msgid "GModules are not supported on your platform!\n"
-#~ msgstr "您的平å°ä¸æ”¯æŒ GModulesï¼\n"
+#: ../clients/cli/settings.c:1817
+#, fuzzy, c-format
+msgid "invalid mode '%s', use one of %s"
+msgstr "错误:“modeâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„,使用 %s 中的一个"
 
-#~ msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-#~ msgstr "无效选项。请使用 --help 查看有效选项列表。\n"
+#: ../clients/cli/settings.c:1899
+#, fuzzy, c-format
+msgid "always"
+msgstr "(常值)"
 
-#~ msgid "State file %s parsing failed: (%d) %s\n"
-#~ msgstr "è§£æžçŠ¶æ€æ–‡ä»¶ %s 失败:(%d)%s\n"
+#: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286
+#: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981
+#: ../libnm-core/nm-keyfile-reader.c:573
+#, fuzzy, c-format
+msgid "invalid option '%s', use one of [%s]"
+msgstr "%s:无效选项 -- %c\n"
 
-#~ msgid "'dhclient' could be found."
-#~ msgstr "找到 'dhclient'。"
+#: ../clients/cli/settings.c:2502
+#, fuzzy, c-format
+msgid "'%u' flags are not valid; use combination of %s"
+msgstr "错误:“flagâ€ï¼šâ€œ%sâ€æ˜¯æ— æ•ˆçš„;使用 <0-7>。"
 
-#~ msgid "'dhcpcd' could be found."
-#~ msgstr "找到 'dhcpcd'。"
+#: ../clients/cli/settings.c:3240
+msgid ""
+"Enter a value which indicates whether the connection is subject to a data\n"
+"quota, usage costs or other limitations. Accepted options are:\n"
+"'true','yes','on' to set the connection as metered\n"
+"'false','no','off' to set the connection as not metered\n"
+"'unknown' to let NetworkManager choose a value using some heuristics\n"
+msgstr ""
 
-#~ msgid "/path/to/config.file"
-#~ msgstr "/path/to/config.file"
+#: ../clients/cli/settings.c:3962 ../clients/cli/settings.c:4276
+#, fuzzy, c-format
+msgid "the property doesn't contain DNS option '%s'"
+msgstr "该属性ä¸åŒ…å« DNS æœç´¢åŸŸâ€œ%sâ€"
 
-#~ msgid "/path/to/config/dir"
-#~ msgstr "/path/to/config/dir"
+#: ../clients/cli/settings.c:4700
+#, fuzzy, c-format
+msgid "'%s' cannot be empty"
+msgstr "“%s=%s†的这个属性ä¸èƒ½ä¸ºç©º"
 
-#~ msgid "plugin1,plugin2"
-#~ msgstr "plugin1,plugin2"
+#: ../clients/cli/settings.c:4835
+#, c-format
+msgid "'%s' string value should consist of 1 - 199 characters"
+msgstr ""
 
-#~ msgid "Bingo!"
-#~ msgstr "对了ï¼"
+#: ../clients/cli/settings.c:5013
+#, fuzzy, c-format
+msgid "invalid option '%s', use 'default', 'never' or 'always'"
+msgstr "无效选项“%sâ€æˆ–值“%sâ€"
 
-#~ msgid "error occurred while waiting for data on socket"
-#~ msgstr "ç­‰å€™å¥—æŽ¥å­—ä¸Šçš„æ•°æ®æ—¶å‘生了错误"
+#: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555
+msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
+msgstr ""
 
-#~ msgid "error processing netlink message: %s"
-#~ msgstr "处ç†ç½‘路信æ¯å‡ºé”™ï¼š%s"
+#: ../clients/cli/settings.c:5598
+#, fuzzy, c-format
+msgid "invalid option '%s', use '%s' or '%s'"
+msgstr "无效的验è¯é€‰é¡¹ï¼š%s\n"
 
-#~ msgid "unable to connect to netlink for monitoring link status: %s"
-#~ msgstr "无法为监视连接状æ€è¿žæŽ¥åˆ°ç½‘路:%s"
+#. Translators: the first %s is the partial value entered by
+#. * the user, the second %s a list of compatible values.
+#.
+#: ../clients/cli/utils.c:546 ../clients/cli/utils.c:577
+#, fuzzy, c-format
+msgid "'%s' is ambiguous (%s)"
+msgstr "“%sâ€å«ä¹‰æ¨¡ç³Šï¼ˆ%s)"
 
-#~ msgid "unable to enable netlink handle credential passing: %s"
-#~ msgstr "无法å¯ç”¨ç½‘ç»œé“¾æŽ¥å¥æŸ„è¯ä¹¦é€šè¿‡ï¼š%s"
+#: ../clients/cli/utils.c:589
+#, fuzzy, c-format
+msgid "'%s' is not valid; use [%s], [%s] or [%s]"
+msgstr "错误:“bt-typeâ€ï¼šâ€œ%sâ€æ— æ•ˆï¼›ä½¿ç”¨ [%s, %s (%s), %s]。"
 
-#~ msgid "unable to allocate netlink handle for monitoring link status: %s"
-#~ msgstr "无法为监视连接状æ€åˆ†é…ç½‘è·¯å¥æŸ„:%s"
+#: ../clients/common/nm-vpn-helpers.c:110
+#, fuzzy
+msgid "Gateway certificate hash"
+msgstr "网关"
 
-#~ msgid "unable to join netlink group: %s"
-#~ msgstr "无法加入网络链接组群:%s"
+#: ../clients/tui/nmtui-connect.c:54
+msgid ""
+"openconnect will be run to authenticate.\n"
+"It will return to nmtui when completed."
+msgstr ""
+
+#: ../clients/tui/nmtui-connect.c:68
+#, c-format
+msgid "Error: openconnect failed: %s"
+msgstr "错误:openconnect 失败:%s"
+
+#: ../clients/tui/nmtui-connect.c:75
+#, c-format
+msgid "openconnect failed with status %d"
+msgstr "openconnect å¤±è´¥ï¼ŒçŠ¶æ€ %d"
+
+#: ../clients/tui/nmtui-connect.c:79
+#, c-format
+msgid "openconnect failed with signal %d"
+msgstr "openconnect å¤±è´¥ï¼Œä¿¡å· %d"
+
+#: ../libnm-core/crypto_gnutls.c:115 ../libnm-util/crypto_gnutls.c:175
+#, fuzzy, c-format
+msgid "Failed to initialize the decryption cipher context: %s (%s)"
+msgstr "åˆå§‹åŒ–解密计算内容失败:%s / %s。"
+
+#: ../libnm-core/crypto_gnutls.c:124 ../libnm-util/crypto_gnutls.c:184
+#, fuzzy, c-format
+msgid "Failed to decrypt the private key: %s (%s)"
+msgstr "解密ç§é’¥å¤±è´¥ï¼š%d。"
+
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
+#, fuzzy, c-format
+msgid "Failed to initialize the encryption cipher context: %s (%s)"
+msgstr "åˆå§‹åŒ–加密计算内容失败:%s / %s。"
+
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292
+#, fuzzy, c-format
+msgid "Failed to encrypt the data: %s (%s)"
+msgstr "å‘逿•°æ®å¤±è´¥ï¼ŒåŽŸå› ï¼š%s"
+
+#: ../libnm-core/nm-connection.c:306
+#, fuzzy
+msgid "duplicate setting name"
+msgstr "å¤åˆ¶æ¨¡æ¿åç§°"
+
+#: ../libnm-core/nm-dbus-utils.c:188
+#, fuzzy, c-format
+msgid "Method returned type '%s', but expected '%s'"
+msgstr "方法%s%s%s类型ä¸å…¼å®¹"
+
+#: ../libnm-core/nm-setting-bond.c:687
+#, fuzzy, c-format
+msgid "'%s' and '%s' cannot have different values"
+msgstr "列表ä¸èƒ½æœ‰é»˜è®¤å€¼ï¼ˆé”®å€¼ %s)。"
+
+#: ../libnm-core/nm-setting-connection.c:977
+#, fuzzy, c-format
+msgid "metered value %d is not valid"
+msgstr "“%dâ€ä¸æ˜¯è¯¥å±žæ€§çš„æœ‰æ•ˆå–值(应 <= %d)"
+
+#: ../libnm-core/nm-setting-gsm.c:397
+#, fuzzy
+msgid "property is empty or wrong size"
+msgstr "属性为空"
+
+#: ../libnm-core/nm-setting-gsm.c:407
+#, fuzzy
+msgid "property must contain only digits"
+msgstr "设备属性 %1 å¿…é¡»åŒ…å« %2"
+
+#: ../libnm-core/nm-setting-ip-config.c:133
+#, c-format
+msgid "Missing IPv4 address"
+msgstr "缺少 IPv4 地å€"
+
+#: ../libnm-core/nm-setting-ip-config.c:133
+#, c-format
+msgid "Missing IPv6 address"
+msgstr "缺少 IPv6 地å€"
+
+#: ../libnm-core/nm-setting-ip-config.c:138
+#, c-format
+msgid "Invalid IPv6 address '%s'"
+msgstr "无效的 IPv6 地å€â€œ%sâ€"
+
+#: ../libnm-core/nm-setting-ip-config.c:153
+#, c-format
+msgid "Invalid IPv6 address prefix '%u'"
+msgstr "无效的 IPv6 地å€å‰ç¼€â€œ%uâ€"
+
+#: ../libnm-core/nm-setting-ip-config.c:2281
+#, fuzzy, c-format
+msgid "a gateway is incompatible with '%s'"
+msgstr "错误:无效的网关地å€â€œ%sâ€\n"
+
+#: ../libnm-core/nm-setting-ip4-config.c:214
+#, c-format
+msgid "'%s' is not a valid FQDN"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ FQDN"
+
+#: ../libnm-core/nm-setting-ip4-config.c:223
+msgid "property cannot be set when dhcp-hostname is also set"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:318
+#, fuzzy, c-format
+msgid "'%d' is not a valid tunnel mode"
+msgstr "éš§é“æ¨¡å¼ï¼š"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:341
+#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#, fuzzy, c-format
+msgid "'%s' is not a valid IPv%c address"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IP%c 地å€"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:366
+msgid "tunnel keys can only be specified for GRE tunnels"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:379
+#: ../libnm-core/nm-setting-ip-tunnel.c:395
+#, fuzzy, c-format
+msgid "'%s' is not a valid tunnel key"
+msgstr "“%sâ€ä¸æ˜¯æœ‰æ•ˆçš„ IBoIP P_Key"
+
+#: ../libnm-core/nm-setting-ip-tunnel.c:407
+msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
+msgstr ""
+
+#: ../libnm-core/nm-setting-macvlan.c:192
+msgid "non promiscuous operation is allowed only in passthru mode"
+msgstr ""
+
+#: ../libnm-core/nm-setting-tun.c:187
+#, c-format
+msgid "'%u': invalid mode"
+msgstr "“%uâ€ï¸°æ— æ•ˆæ¨¡å¼"
+
+#: ../libnm-core/nm-setting-tun.c:197
+#, c-format
+msgid "'%s': invalid user ID"
+msgstr "“%sâ€ï¸°æ— æ•ˆç”¨æˆ· ID"
+
+#: ../libnm-core/nm-setting-tun.c:208
+#, c-format
+msgid "'%s': invalid group ID"
+msgstr "“%sâ€ï¸°æ— æ•ˆç»„ ID"
+
+#: ../libnm-core/nm-setting.c:837
+#, c-format
+msgid "duplicate property"
+msgstr "é‡å¤çš„属性"
+
+#: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898
+#, c-format
+msgid "failed to set property: %s"
+msgstr "设置属性失败:%s"
+
+#: ../libnm-core/nm-setting.c:926
+#, c-format
+msgid "can not set property: %s"
+msgstr "ä¸èƒ½è®¾ç½®å±žæ€§ï¼š%s"
+
+#: ../libnm-core/nm-setting.c:942
+#, c-format
+msgid "unknown property"
+msgstr "未知属性"
+
+#: ../libnm-core/nm-utils.c:2451
+#, fuzzy, c-format
+msgid "failed stat file %s: %s"
+msgstr "%s:stat 失败:%s"
+
+#: ../libnm-core/nm-utils.c:2471
+#, fuzzy, c-format
+msgid "invalid file owner %d for %s"
+msgstr "file:无效文件(file)æ“作:%s"
+
+#: ../libnm-core/nm-utils.c:2482
+#, fuzzy, c-format
+msgid "file permissions for %s"
+msgstr "设置%s çš„æƒé™"
+
+#: ../libnm-core/nm-utils.c:2492
+#, c-format
+msgid "reject %s"
+msgstr "æ‹’ç» %s"
+
+#: ../libnm-core/nm-utils.c:2512
+#, fuzzy, c-format
+msgid "path is not absolute (%s)"
+msgstr "“%1â€ ä¸æ˜¯ç»å¯¹è·¯å¾„。"
+
+#: ../libnm-core/nm-utils.c:2526
+#, fuzzy, c-format
+msgid "Plugin file does not exist (%s)"
+msgstr "æ’ä»¶æ¨¡å— %s ä¸å­˜åœ¨"
+
+#: ../libnm-core/nm-utils.c:2534
+#, fuzzy, c-format
+msgid "Plugin is not a valid file (%s)"
+msgstr "文件“%1â€ä¸æ˜¯æœ‰æ•ˆçš„ Qt æ’件。"
+
+#: ../libnm-core/nm-utils.c:2544
+#, fuzzy, c-format
+msgid "libtool archives are not supported (%s)"
+msgstr "全部支æŒçš„归档文件 ("
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:124
+#, c-format
+msgid "cannot load plugin %s"
+msgstr "无法加载æ’ä»¶ %s"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:150
+#, c-format
+msgid "cannot load VPN plugin in '%s': missing plugin name"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:157
+#, c-format
+msgid "cannot load VPN plugin in '%s': invalid service name"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:173
+#, fuzzy, c-format
+msgid "unknown error initializing plugin %s"
+msgstr "åˆå§‹åŒ–æ’件时出错“%1â€"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:185
+#, c-format
+msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:328
+#, c-format
+msgid "the plugin does not support import capability"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:348
+#, c-format
+msgid "the plugin does not support export capability"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-plugin-info.c:110
+#, c-format
+msgid "missing filename"
+msgstr "缺少文件å"
+
+#: ../libnm-core/nm-vpn-plugin-info.c:118
+#, c-format
+msgid "filename must be an absolute path (%s)"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-plugin-info.c:127
+#, fuzzy, c-format
+msgid "filename has invalid format (%s)"
+msgstr "%s“%sâ€çš„æ ¼å¼æ— æ•ˆ"
+
+#: ../libnm-core/nm-vpn-plugin-info.c:450
+#, c-format
+msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-plugin-info.c:488
+#, c-format
+msgid "there exists a conflicting plugin with the same name (%s)"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-plugin-info.c:878
+#, fuzzy, c-format
+msgid "missing \"plugin\" setting"
+msgstr "缺少æ’ä»¶"
+
+#: ../libnm-core/nm-vpn-plugin-info.c:888
+#, c-format
+msgid "%s: don't retry loading plugin which already failed previously"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-plugin-info.c:980
+msgid "missing filename to load VPN plugin info"
+msgstr ""
+
+#: ../libnm-core/nm-vpn-plugin-info.c:992
+#, fuzzy
+msgid "missing name for VPN plugin info"
+msgstr "æ— æ³•èŽ·å– VPN æ’ä»¶ä¿¡æ¯"
+
+#: ../libnm-core/nm-vpn-plugin-info.c:1001
+#, fuzzy
+msgid "missing service for VPN plugin info"
+msgstr "æ— æ³•èŽ·å– VPN æ’ä»¶ä¿¡æ¯"
+
+#: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824
+#, fuzzy
+msgid "MACVLAN"
+msgstr "MACVLAN 模å¼ï¼š"
+
+#: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828
+msgid "IPTunnel"
+msgstr ""
+
+#: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832
+msgid "Veth"
+msgstr ""
+
+#: ../libnm-util/crypto_gnutls.c:84
+#, c-format
+msgid "Hash length too long (%d > %d)."
+msgstr ""
+
+#: ../libnm-util/crypto_gnutls.c:115
+#, fuzzy, c-format
+msgid "Failed to initialize the MD5 engine: %s (%s)"
+msgstr "åˆå§‹åŒ– MD5 引擎失败:%s / %s。"
+
+#: ../libnm/nm-device-ethernet.c:222
+msgid "The connection and device differ in S390 subchannels."
+msgstr ""
+
+#: ../libnm/nm-device-ethernet.c:237
+#, fuzzy
+msgid "The MACs of the device and the connection do not match."
+msgstr "设备的 MAC 地å€ä¸Žè¿žæŽ¥ä¸åŒ¹é…。"
+
+#: ../libnm/nm-device-ethernet.c:247
+#, fuzzy, c-format
+msgid "Invalid MAC in the blacklist: %s."
+msgstr "忽略无效的 MAC 地å€"
+
+#: ../libnm/nm-device-ethernet.c:253
+#, fuzzy, c-format
+msgid "Device MAC (%s) is blacklisted by the connection."
+msgstr "设备“%sâ€ä¸å…¼å®¹è¿žæŽ¥â€œ%sâ€"
+
+#: ../libnm/nm-device-tun.c:209
+#, fuzzy
+msgid "The connection was not a tun connection."
+msgstr "TUN 连接"
+
+#: ../libnm/nm-device-tun.c:218
+#, fuzzy
+msgid "The mode of the device and the connection didn't match"
+msgstr "设备的 MAC 地å€ä¸Žè¿žæŽ¥ä¸åŒ¹é…。"
+
+#: ../libnm/nm-device-ip-tunnel.c:254
+#, fuzzy
+msgid "The connection was not an IP tunnel connection."
+msgstr "IP éš§é“连接"
+
+#: ../libnm/nm-device-macvlan.c:159
+#, fuzzy
+msgid "The connection was not a MAC-VLAN connection."
+msgstr "æ­¤è¿žæŽ¥ä¸æ˜¯ä¸€ä¸ª VLAN 连接。"
+
+#: ../libnm/nm-device-vxlan.c:387
+#, fuzzy
+msgid "The connection was not a VXLAN connection."
+msgstr "VXLAN 连接"
+
+#: ../libnm/nm-device-vxlan.c:394
+#, fuzzy
+msgid "The VXLAN identifiers of the device and the connection didn't match."
+msgstr "VLAN 设备标识符与连接ä¸åŒ¹é…。"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23
+msgid "Modify persistent global DNS configuration"
+msgstr ""
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24
+#, fuzzy
+msgid ""
+"System policy prevents modification of the persistent global DNS "
+"configuration"
+msgstr "系统策略阻止更改系统固有主机å"
+
+#: ../shared/nm-shared-utils.c:208
+#, fuzzy, c-format
+msgid "object class '%s' has no property named '%s'"
+msgstr "类‘%s’没有å为‘%s’的方法能够匹é…签字‘%s’"
+
+#: ../shared/nm-shared-utils.c:215
+#, fuzzy, c-format
+msgid "property '%s' of object class '%s' is not writable"
+msgstr "无法创建目标类“%sâ€ï¼šä¸æ”¯æŒ"
+
+#: ../shared/nm-shared-utils.c:222
+#, c-format
+msgid ""
+"construct property \"%s\" for object '%s' can't be set after construction"
+msgstr ""
+
+#: ../shared/nm-shared-utils.c:230
+#, fuzzy, c-format
+msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
+msgstr "错误:无效属性:%sï¼Œä¹Ÿä¸æ˜¯æœ‰æ•ˆçš„设置å称。\n"
+
+#: ../shared/nm-shared-utils.c:239
+#, fuzzy, c-format
+msgid "unable to set property '%s' of type '%s' from value of type '%s'"
+msgstr "无法设置类型 “%s†的属性(从类型为“%sâ€çš„值)"
+
+#: ../shared/nm-shared-utils.c:250
+#, c-format
+msgid ""
+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
+"type '%s'"
+msgstr ""
+
+#: ../src/main.c:149 ../src/main.c:284
+#, fuzzy, c-format
+msgid "Failed to read configuration: %s\n"
+msgstr "fts_read 失败:%s"
+
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:164
+#, fuzzy, c-format
+msgid "a connection using '%s' authentication cannot specify WPA protocols"
+msgstr "一个使用 “%s†认è¯çš„连接无法使用 WPA 密钥管ç†"
+
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:180
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:197
+#, fuzzy, c-format
+msgid "a connection using '%s' authentication cannot specify WPA ciphers"
+msgstr "一个使用 “%s†认è¯çš„连接无法使用 WPA 密钥管ç†"
+
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:209
+#, fuzzy, c-format
+msgid "a connection using '%s' authentication cannot specify a WPA password"
+msgstr "一个使用 “%s†认è¯çš„连接无法使用 WPA 密钥管ç†"
+
+#: ../src/nm-config.c:501
+#, fuzzy
+msgid "System config directory location"
+msgstr "é…置目录ä½ç½®"
+
+#: ../src/nm-config.c:502
+#, fuzzy
+msgid "Internal config file location"
+msgstr "é…置文件ä½ç½®"
+
+#: ../src/nm-iface-helper.c:290
+#, fuzzy
+msgid "FQDN to send to DHCP server"
+msgstr "主机åå‘é€ç»™ DHCP æœåС噍"
+
+#: ../src/nm-iface-helper.c:294
+msgid "IPv6 SLAAC address generation mode"
+msgstr ""
+
+#: ../src/nm-iface-helper.c:295
+msgid ""
+"The logging backend configuration value. See logging.backend in "
+"NetworkManager.conf"
+msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 33f8fadd..a143182b 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -4808,8 +4808,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5785,20 +5783,6 @@ msgstr ""
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 281f7b62..18e28401 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5340,8 +5340,6 @@ msgid ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -s[how-secrets]                            allow displaying passwords\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
@@ -5368,8 +5366,6 @@ msgstr ""
 "  -f[ields] <field1,field2,...>|all|common   specify fields to output\n"
 "  -e[scape] yes|no                           escape columns separators in "
 "values\n"
-"  -n[ocheck]                                 don't check nmcli and "
-"NetworkManager versions\n"
 "  -a[sk]                                     ask for missing parameters\n"
 "  -w[ait] <seconds>                          set timeout waiting for "
 "finishing operations\n"
@@ -6428,24 +6424,6 @@ msgstr "é¸é … '--terse' 需指定 '--fields'"
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "é¸é … '--terse' 需è¦ç‰¹å®šçš„ '--fields' é¸é …å€¼ï¼Œè€Œä¸æ˜¯ '%s'"
 
-#: ../clients/cli/utils.c:1390
-#, c-format
-msgid ""
-"Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
-"nocheck to suppress the warning.\n"
-msgstr ""
-"警告:nmcli(%s)和 NetworkManager(%s)的版本ä¸ç¬¦ã€‚請使用 --nocheck 來抑止警"
-"告訊æ¯ã€‚\n"
-
-#: ../clients/cli/utils.c:1399
-#, c-format
-msgid ""
-"Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
-"execution using --nocheck, but the results are unpredictable."
-msgstr ""
-"錯誤:nmcli(%s)和 NetworkManager(%s)的版本ä¸ç¬¦ã€‚請使用 --nocheck 來強制執"
-"行,ä¸éŽçµæžœç„¡æ³•é æœŸã€‚"
-
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
 msgstr ""
diff --git a/shared/nm-shared-utils.c b/shared/nm-shared-utils.c
index 932b7432..38f6529d 100644
--- a/shared/nm-shared-utils.c
+++ b/shared/nm-shared-utils.c
@@ -45,8 +45,7 @@ gint64
 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback)
 {
 	gint64 v;
-	size_t len;
-	char buf[64], *s, *str_free = NULL;
+	char *s = NULL;
 
 	if (str) {
 		while (g_ascii_isspace (str[0]))
@@ -57,46 +56,24 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma
 		return fallback;
 	}
 
-	len = strlen (str);
-	if (g_ascii_isspace (str[--len])) {
-		/* backward search the first non-ws character.
-		 * We already know that str[0] is non-ws. */
-		while (g_ascii_isspace (str[--len]))
-			;
-
-		/* str[len] is now the last non-ws character... */
-		len++;
-
-		if (len >= sizeof (buf))
-			s = str_free = g_malloc (len + 1);
-		else
-			s = buf;
-
-		memcpy (s, str, len);
-		s[len] = 0;
-
-		nm_assert (len > 0 && len < strlen (str) && len == strlen (s));
-		nm_assert (!g_ascii_isspace (str[len-1]) && g_ascii_isspace (str[len]));
-		nm_assert (strncmp (str, s, len) == 0);
-
-		str = s;
-	}
-
 	errno = 0;
 	v = g_ascii_strtoll (str, &s, base);
 
 	if (errno != 0)
-		v = fallback;
-	else if (s[0] != 0) {
-		errno = EINVAL;
-		v = fallback;
-	} else if (v > max || v < min) {
+		return fallback;
+	if (s[0] != '\0') {
+		while (g_ascii_isspace (s[0]))
+			s++;
+		if (s[0] != '\0') {
+			errno = EINVAL;
+			return fallback;
+		}
+	}
+	if (v > max || v < min) {
 		errno = ERANGE;
-		v = fallback;
+		return fallback;
 	}
 
-	if (G_UNLIKELY (str_free))
-		g_free (str_free);
 	return v;
 }
 
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h
index be94ce76..50c9748d 100644
--- a/shared/nm-version-macros.h
+++ b/shared/nm-version-macros.h
@@ -45,7 +45,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (0)
+#define NM_MICRO_VERSION (2)
 
 /**
  * NM_CHECK_VERSION:
@@ -68,9 +68,11 @@
 #define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
 #define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
 #define NM_VERSION_1_2    (NM_ENCODE_VERSION (1, 2, 0))
+#define NM_VERSION_1_2_2  (NM_ENCODE_VERSION (1, 2, 2))
+#define NM_VERSION_1_2_4  (NM_ENCODE_VERSION (1, 2, 4))
 #define NM_VERSION_1_4    (NM_ENCODE_VERSION (1, 4, 0))
 
-#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
-#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2
+#define NM_VERSION_CUR_STABLE  NM_VERSION_1_2_2
+#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2_4
 
 #endif  /* __NM_VERSION_MACROS_H__ */
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 92bc65bc..3e0ef361 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -68,9 +68,11 @@
 #define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
 #define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
 #define NM_VERSION_1_2    (NM_ENCODE_VERSION (1, 2, 0))
+#define NM_VERSION_1_2_2  (NM_ENCODE_VERSION (1, 2, 2))
+#define NM_VERSION_1_2_4  (NM_ENCODE_VERSION (1, 2, 4))
 #define NM_VERSION_1_4    (NM_ENCODE_VERSION (1, 4, 0))
 
-#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
-#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2
+#define NM_VERSION_CUR_STABLE  NM_VERSION_1_2_2
+#define NM_VERSION_NEXT_STABLE NM_VERSION_1_2_4
 
 #endif  /* __NM_VERSION_MACROS_H__ */
diff --git a/src/Makefile.am b/src/Makefile.am
index bf668d74..aa35eefb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -208,6 +208,7 @@ libNetworkManager_base_la_CPPFLAGS = \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 	-DNO_SYSTEMD_JOURNAL \
 	-DPREFIX=\"$(prefix)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	$(GLIB_CFLAGS)
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 1c8821f8..51ded6bc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -994,6 +994,7 @@ libsystemd_nm_la_LIBADD = \
 @ENABLE_TESTS_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 @ENABLE_TESTS_TRUE@	-DNO_SYSTEMD_JOURNAL \
 @ENABLE_TESTS_TRUE@	-DPREFIX=\"$(prefix)\" \
+@ENABLE_TESTS_TRUE@	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 @ENABLE_TESTS_TRUE@	-DNMSTATEDIR=\"$(nmstatedir)\" \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
 
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index a009746d..5ee22f93 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -788,7 +788,7 @@ static void
 adapter5_on_acquired (GObject *object, GAsyncResult *res, NMBluezDevice *self)
 {
 	NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
-	GError *error;
+	GError *error = NULL;
 	GVariant *v;
 
 	priv->adapter5 = g_dbus_proxy_new_for_bus_finish (res, &error);
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 6225ae7b..d27f7dca 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -194,16 +194,21 @@ _update_s390_subchannels (NMDeviceEthernet *self)
 		} else if (   !strcmp (item, "layer2")
 		           || !strcmp (item, "portname")
 		           || !strcmp (item, "portno")) {
-			char *path, *value;
+			gs_free char *path = NULL, *value = NULL;
+
 			path = g_strdup_printf ("%s/%s", parent_path, item);
 			value = nm_platform_sysctl_get (NM_PLATFORM_GET, path);
-			if (value && *value)
-				g_hash_table_insert (priv->s390_options, g_strdup (item), g_strdup (value));
-			else
+
+			if (   !strcmp (item, "portname")
+			    && !g_strcmp0 (value, "no portname required")) {
+				/* Do nothing */
+			} else if (value && *value) {
+				g_hash_table_insert (priv->s390_options, g_strdup (item), value);
+				value = NULL;
+			} else
 				_LOGW (LOGD_DEVICE | LOGD_HW, "error reading %s", path);
-			g_free (path);
-			g_free (value);
 		}
+
 		if (error) {
 			_LOGW (LOGD_DEVICE | LOGD_HW, "%s", error->message);
 			g_clear_error (&error);
@@ -1433,7 +1438,9 @@ new_default_connection (NMDevice *self)
 	const GSList *connections;
 	NMSetting *setting;
 	const char *hw_address;
-	char *defname, *uuid;
+	gs_free char *defname = NULL;
+	gs_free char *uuid = NULL;
+	gs_free char *machine_id = NULL;
 
 	if (nm_config_get_no_auto_default_for_device (nm_config_get (), self))
 		return NULL;
@@ -1448,7 +1455,19 @@ new_default_connection (NMDevice *self)
 
 	connections = nm_connection_provider_get_connections (nm_connection_provider_get ());
 	defname = nm_device_ethernet_utils_get_default_wired_name (connections);
-	uuid = nm_utils_uuid_generate ();
+	if (!defname)
+		return NULL;
+
+	machine_id = nm_utils_machine_id_read ();
+
+	/* Create a stable UUID. The UUID is also the Network_ID for stable-privacy addr-gen-mode,
+	 * thus when it changes we will also generate different IPv6 addresses. */
+	uuid = _nm_utils_uuid_generate_from_strings ("default-wired",
+	                                             machine_id ?: "",
+	                                             defname,
+	                                             hw_address,
+	                                             NULL);
+
 	g_object_set (setting,
 	              NM_SETTING_CONNECTION_ID, defname,
 	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
@@ -1457,8 +1476,6 @@ new_default_connection (NMDevice *self)
 	              NM_SETTING_CONNECTION_UUID, uuid,
 	              NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL),
 	              NULL);
-	g_free (uuid);
-	g_free (defname);
 
 	/* Lock the connection to the device */
 	setting = nm_setting_wired_new ();
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 482eb185..7873756f 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -512,20 +512,20 @@ nm_device_factory_manager_load_factories (NMDeviceFactoryManagerFactoryFunc call
 			continue;
 		}
 
+		/* after loading glib types from the plugin, we cannot unload the library anymore.
+		 * Make it resident. */
+		g_module_make_resident (plugin);
+
 		factory = create_func (&error);
 		if (!factory) {
 			nm_log_warn (LOGD_HW, "(%s): failed to initialize device factory: %s",
 			             item, NM_G_ERROR_MSG (error));
 			g_clear_error (&error);
-			g_module_close (plugin);
 			continue;
 		}
 		g_clear_error (&error);
 
-		if (_add_factory (factory, TRUE, g_module_name (plugin), callback, user_data))
-			g_module_make_resident (plugin);
-		else
-			g_module_close (plugin);
+		_add_factory (factory, TRUE, g_module_name (plugin), callback, user_data);
 
 		g_object_unref (factory);
 	}
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 08cf6dce..8472ff80 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1276,7 +1276,7 @@ void
 nm_device_update_dynamic_ip_setup (NMDevice *self)
 {
 	NMDevicePrivate *priv;
-	GError *error;
+	GError *error = NULL;
 	gconstpointer addr;
 	size_t addr_length;
 
@@ -1887,6 +1887,8 @@ realize_start_setup (NMDevice *self, const NMPlatformLink *plink)
 	g_return_if_fail (nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT));
 	g_return_if_fail (priv->ip_ifindex <= 0);
 	g_return_if_fail (priv->ip_iface == NULL);
+	g_return_if_fail (!priv->queued_ip4_config_id);
+	g_return_if_fail (!priv->queued_ip6_config_id);
 
 	_LOGD (LOGD_DEVICE, "start setup of %s, kernel ifindex %d", G_OBJECT_TYPE_NAME (self), plink ? plink->ifindex : 0);
 
@@ -3382,6 +3384,15 @@ activation_source_schedule (NMDevice *self, ActivationHandleFunc func, int famil
 	act_data->id = new_id;
 }
 
+static gboolean
+activation_source_is_scheduled (NMDevice *self, ActivationHandleFunc func, int family)
+{
+	ActivationHandleData *act_data;
+
+	act_data = activation_source_get_by_family (self, family, NULL);
+	return act_data->func == func;
+}
+
 /*****************************************************************************/
 
 static gboolean
@@ -4456,6 +4467,8 @@ dhcp4_lease_change (NMDevice *self, NMIP4Config *config)
 		                    NULL,
 		                    NULL,
 		                    NULL);
+
+		nm_device_remove_pending_action (self, PENDING_ACTION_DHCP4, FALSE);
 	}
 }
 
@@ -5187,6 +5200,8 @@ dhcp6_lease_change (NMDevice *self)
 		                    settings_connection,
 		                    nm_device_get_applied_connection (self),
 		                    self, NULL, NULL, NULL);
+
+		nm_device_remove_pending_action (self, PENDING_ACTION_DHCP6, FALSE);
 	}
 }
 
@@ -6827,30 +6842,6 @@ activate_stage5_ip4_config_commit (NMDevice *self)
 	check_ip_done (self);
 }
 
-static void
-queued_ip4_config_change_clear (NMDevice *self)
-{
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
-
-	if (priv->queued_ip4_config_id) {
-		_LOGD (LOGD_DEVICE, "clearing queued IP4 config change");
-		g_source_remove (priv->queued_ip4_config_id);
-		priv->queued_ip4_config_id = 0;
-	}
-}
-
-static void
-queued_ip6_config_change_clear (NMDevice *self)
-{
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
-
-	if (priv->queued_ip6_config_id) {
-		_LOGD (LOGD_DEVICE, "clearing queued IP6 config change");
-		g_source_remove (priv->queued_ip6_config_id);
-		priv->queued_ip6_config_id = 0;
-	}
-}
-
 void
 nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *config)
 {
@@ -6863,7 +6854,6 @@ nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *conf
 	if (config)
 		priv->dev_ip4_config = g_object_ref (config);
 
-	queued_ip4_config_change_clear (self);
 	activation_source_schedule (self, activate_stage5_ip4_config_commit, AF_INET);
 }
 
@@ -7109,7 +7099,9 @@ _cleanup_ip4_pre (NMDevice *self, CleanupType cleanup_type)
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 
 	priv->ip4_state =  IP_NONE;
-	queued_ip4_config_change_clear (self);
+
+	if (nm_clear_g_source (&priv->queued_ip4_config_id))
+		_LOGD (LOGD_DEVICE, "clearing queued IP4 config change");
 
 	dhcp4_cleanup (self, cleanup_type, FALSE);
 	arp_cleanup (self);
@@ -7123,7 +7115,9 @@ _cleanup_ip6_pre (NMDevice *self, CleanupType cleanup_type)
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 
 	priv->ip6_state = IP_NONE;
-	queued_ip6_config_change_clear (self);
+
+	if (nm_clear_g_source (&priv->queued_ip6_config_id))
+		_LOGD (LOGD_DEVICE, "clearing queued IP6 config change");
 
 	dhcp6_cleanup (self, cleanup_type, FALSE);
 	linklocal6_cleanup (self);
@@ -7169,22 +7163,25 @@ _hash_check_invalid_keys_impl (GHashTable *hash, const char *setting_name, GErro
 
 		g_hash_table_iter_init (&iter, hash);
 		while (g_hash_table_iter_next (&iter, (gpointer *) &k, NULL)) {
-			for (i = 0; argv[i]; i++) {
-				if (!strcmp (argv[i], k)) {
-					first_invalid_key = k;
-					break;
-				}
-			}
-			if (first_invalid_key)
+			if (_nm_utils_strv_find_first ((char **) argv, -1, k) < 0) {
+				first_invalid_key = k;
 				break;
+			}
+		}
+		if (setting_name) {
+			g_set_error (error,
+			             NM_DEVICE_ERROR,
+			             NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+			             "Can't reapply changes to '%s.%s' setting",
+			             setting_name,
+			             first_invalid_key);
+		} else {
+			g_set_error (error,
+			             NM_DEVICE_ERROR,
+			             NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+			             "Can't reapply any changes to '%s' setting",
+			             first_invalid_key);
 		}
-		g_set_error (error,
-		             NM_DEVICE_ERROR,
-		             NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-		             "Can't reapply changes to '%s%s%s' setting",
-		             setting_name ? : "",
-		             setting_name ? "." : "",
-		             first_invalid_key ? : "<UNKNOWN>");
 		g_return_val_if_fail (first_invalid_key, FALSE);
 		return FALSE;
 	}
@@ -7305,9 +7302,16 @@ reapply_connection (NMDevice *self,
 	                               NM_SETTING_CONNECTION_SETTING_NAME))
 		return FALSE;
 
+	/* whitelist allowed properties from "connection" setting which are allowed to differ.
+	 *
+	 * This includes UUID, there is no principal problem with reapplying a connection
+	 * and changing it's UUID. In fact, disallowing it makes it cumbersome for the user
+	 * to reapply any connection but the original settings-connection. */
 	if (!_hash_check_invalid_keys (diffs ? g_hash_table_lookup (diffs, NM_SETTING_CONNECTION_SETTING_NAME) : NULL,
 	                               NM_SETTING_CONNECTION_SETTING_NAME,
 	                               error,
+	                               NM_SETTING_CONNECTION_ID,
+	                               NM_SETTING_CONNECTION_UUID,
 	                               NM_SETTING_CONNECTION_ZONE,
 	                               NM_SETTING_CONNECTION_METERED))
 		return FALSE;
@@ -7336,6 +7340,7 @@ reapply_connection (NMDevice *self,
 		con_old = applied_clone  = nm_simple_connection_new_clone (applied);
 		con_new = applied;
 		nm_connection_replace_settings_from_connection (applied, connection);
+		nm_connection_clear_secrets (applied);
 	} else
 		con_old = con_new = applied;
 
@@ -8779,6 +8784,19 @@ update_ip4_config (NMDevice *self, gboolean initial)
 	gboolean capture_resolv_conf;
 	NMDnsManagerResolvConfMode resolv_conf_mode;
 
+	/* If a commit is scheduled, this function would potentially interfere with
+	 * it changing IP configurations before they are applied. Postpone the
+	 * update in such case.
+	 */
+	if (   !initial
+	    && activation_source_is_scheduled (self,
+	                                       activate_stage5_ip4_config_commit,
+	                                       AF_INET)) {
+		priv->queued_ip4_config_id = g_idle_add (queued_ip4_config_change, self);
+		_LOGT (LOGD_DEVICE, "IP4 update was postponed");
+		return;
+	}
+
 	ifindex = nm_device_get_ip_ifindex (self);
 	if (!ifindex)
 		return;
@@ -8857,6 +8875,19 @@ update_ip6_config (NMDevice *self, gboolean initial)
 	gboolean capture_resolv_conf;
 	NMDnsManagerResolvConfMode resolv_conf_mode;
 
+	/* If a commit is scheduled, this function would potentially interfere with
+	 * it changing IP configurations before they are applied. Postpone the
+	 * update in such case.
+	 */
+	if (   !initial
+	    && activation_source_is_scheduled (self,
+	                                       activate_stage5_ip6_config_commit,
+	                                       AF_INET6)) {
+		priv->queued_ip6_config_id = g_idle_add (queued_ip6_config_change, self);
+		_LOGT (LOGD_DEVICE, "IP6 update was postponed");
+		return;
+	}
+
 	ifindex = nm_device_get_ip_ifindex (self);
 	if (!ifindex)
 		return;
@@ -8922,8 +8953,12 @@ nm_device_capture_initial_config (NMDevice *self)
 static gboolean
 queued_ip4_config_change (gpointer user_data)
 {
-	NMDevice *self = NM_DEVICE (user_data);
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	NMDevice *self = user_data;
+	NMDevicePrivate *priv;
+
+	g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE);
+
+	priv = NM_DEVICE_GET_PRIVATE (self);
 
 	/* Wait for any queued state changes */
 	if (priv->queued_state.id)
@@ -8942,11 +8977,15 @@ queued_ip4_config_change (gpointer user_data)
 static gboolean
 queued_ip6_config_change (gpointer user_data)
 {
-	NMDevice *self = NM_DEVICE (user_data);
-	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	NMDevice *self = user_data;
+	NMDevicePrivate *priv;
 	GSList *iter;
 	gboolean need_ipv6ll = FALSE;
 
+	g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE);
+
+	priv = NM_DEVICE_GET_PRIVATE (self);
+
 	/* Wait for any queued state changes */
 	if (priv->queued_state.id)
 		return TRUE;
@@ -11201,6 +11240,10 @@ dispose (GObject *object)
 
 	_LOGD (LOGD_DEVICE, "disposing");
 
+	platform = nm_platform_get ();
+	g_signal_handlers_disconnect_by_func (platform, G_CALLBACK (device_ipx_changed), self);
+	g_signal_handlers_disconnect_by_func (platform, G_CALLBACK (link_changed_cb), self);
+
 	g_slist_free_full (priv->arping.dad_list, (GDestroyNotify) nm_arping_manager_destroy);
 	priv->arping.dad_list = NULL;
 
@@ -11241,10 +11284,6 @@ dispose (GObject *object)
 
 	_clear_queued_act_request (priv);
 
-	platform = nm_platform_get ();
-	g_signal_handlers_disconnect_by_func (platform, G_CALLBACK (device_ipx_changed), self);
-	g_signal_handlers_disconnect_by_func (platform, G_CALLBACK (link_changed_cb), self);
-
 	nm_clear_g_source (&priv->device_link_changed_id);
 	nm_clear_g_source (&priv->device_ip_link_changed_id);
 
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index 9539fefd..1a6e6b25 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -310,6 +310,10 @@ connect_ready (MMModemSimple *simple_iface,
 	NMModemIPMethod ip6_method = NM_MODEM_IP_METHOD_UNKNOWN;
 
 	self->priv->bearer = mm_modem_simple_connect_finish (simple_iface, res, &error);
+
+	if (!ctx)
+		return;
+
 	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) &&
@@ -377,9 +381,17 @@ connect_ready (MMModemSimple *simple_iface,
 static void
 send_pin_ready (MMSim *sim, GAsyncResult *result, NMModemBroadband *self)
 {
-    GError *error = NULL;
+	gs_free_error GError *error = NULL;
+
+	mm_sim_send_pin_finish (sim, result, &error);
+
+	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		return;
+
+	if (!self->priv->ctx || self->priv->ctx->step != CONNECT_STEP_UNLOCK)
+		return;
 
-    if (!mm_sim_send_pin_finish (sim, result, &error)) {
+	if (error) {
 		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)) {
@@ -387,9 +399,8 @@ send_pin_ready (MMSim *sim, GAsyncResult *result, NMModemBroadband *self)
 		} else {
 			g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error));
 		}
-		g_error_free (error);
 		return;
-    }
+	}
 
 	self->priv->ctx->step++;
 	connect_context_step (self);
@@ -1079,14 +1090,16 @@ simple_disconnect_ready (MMModemSimple *modem_iface,
 }
 
 static void
-disconnect (NMModem *self,
+disconnect (NMModem *modem,
             gboolean warn,
             GCancellable *cancellable,
             GAsyncReadyCallback callback,
             gpointer user_data)
 {
+	NMModemBroadband *self = NM_MODEM_BROADBAND (modem);
 	DisconnectContext *ctx;
 
+	connect_context_clear (self);
 	ctx = g_slice_new (DisconnectContext);
 	ctx->self = g_object_ref (self);
 	ctx->result = g_simple_async_result_new (G_OBJECT (self),
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 804a6d9c..a6c77007 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -1187,6 +1187,7 @@ nm_modem_device_state_changed (NMModem *self,
 	case NM_DEVICE_STATE_UNMANAGED:
 	case NM_DEVICE_STATE_UNAVAILABLE:
 	case NM_DEVICE_STATE_FAILED:
+	case NM_DEVICE_STATE_DISCONNECTED:
 		if (priv->act_request) {
 			cancel_get_secrets (self);
 			g_object_unref (priv->act_request);
@@ -1195,7 +1196,7 @@ nm_modem_device_state_changed (NMModem *self,
 
 		if (was_connected) {
 			/* Don't bother warning on FAILED since the modem is already gone */
-			if (new_state == NM_DEVICE_STATE_FAILED)
+			if (new_state == NM_DEVICE_STATE_FAILED || new_state == NM_DEVICE_STATE_DISCONNECTED)
 				warn = FALSE;
 			/* First cleanup */
 			NM_MODEM_GET_CLASS (self)->deactivate_cleanup (self, NULL);
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index b8161ab5..9f4cdf3e 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -436,37 +436,10 @@ nm_dhcp_client_start_ip4 (NMDhcpClient *self,
 	return NM_DHCP_CLIENT_GET_CLASS (self)->ip4_start (self, dhcp_anycast_addr, last_ip4_address);
 }
 
-/* uuid_parse does not work for machine-id, so we use our own converter */
-static gboolean
-machine_id_parse (const char *in, uuid_t uu)
-{
-	const char *cp;
-	int i;
-	char buf[3];
-
-	g_return_val_if_fail (in != NULL, FALSE);
-	g_return_val_if_fail (strlen (in) == 32, FALSE);
-
-	for (i = 0; i < 32; i++) {
-		if (!g_ascii_isxdigit (in[i]))
-			return FALSE;
-	}
-
-	buf[2] = 0;
-	cp = in;
-	for (i = 0; i < 16; i++) {
-		buf[0] = *cp++;
-		buf[1] = *cp++;
-		uu[i] = ((unsigned char) strtoul (buf, NULL, 16)) & 0xFF;
-	}
-	return TRUE;
-}
-
 static GByteArray *
 generate_duid_from_machine_id (void)
 {
 	GByteArray *duid;
-	char *contents = NULL;
 	GChecksum *sum;
 	guint8 buffer[32]; /* SHA256 digest size */
 	gsize sumlen = sizeof (buffer);
@@ -474,27 +447,16 @@ generate_duid_from_machine_id (void)
 	uuid_t uuid;
 	GRand *generator;
 	guint i;
-	gboolean success = FALSE;
-
-	/* Get the machine ID from /etc/machine-id; it's always in /etc no matter
-	 * where our configured SYSCONFDIR is.  Alternatively, it might be in
-	 * LOCALSTATEDIR /lib/dbus/machine-id.
-	 */
-	if (   g_file_get_contents ("/etc/machine-id", &contents, NULL, NULL)
-	    || g_file_get_contents (LOCALSTATEDIR "/lib/dbus/machine-id", &contents, NULL, NULL)) {
-		contents = g_strstrip (contents);
-		success = machine_id_parse (contents, uuid);
-		if (success) {
-			/* Hash the machine ID so it's not leaked to the network */
-			sum = g_checksum_new (G_CHECKSUM_SHA256);
-			g_checksum_update (sum, (const guchar *) &uuid, sizeof (uuid));
-			g_checksum_get_digest (sum, buffer, &sumlen);
-			g_checksum_free (sum);
-		}
-		g_free (contents);
-	}
-
-	if (!success) {
+	gs_free char *machine_id_s = NULL;
+
+	machine_id_s = nm_utils_machine_id_read ();
+	if (nm_utils_machine_id_parse (machine_id_s, uuid)) {
+		/* Hash the machine ID so it's not leaked to the network */
+		sum = g_checksum_new (G_CHECKSUM_SHA256);
+		g_checksum_update (sum, (const guchar *) &uuid, sizeof (uuid));
+		g_checksum_get_digest (sum, buffer, &sumlen);
+		g_checksum_free (sum);
+	} else {
 		nm_log_warn (LOGD_DHCP6, "dhcp6: failed to read " SYSCONFDIR "/machine-id "
 		             "or " LOCALSTATEDIR "/lib/dbus/machine-id to generate "
 		             "DHCPv6 DUID; creating non-persistent random DUID.");
diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index 5d49c27e..82cb3350 100644
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -279,8 +279,9 @@ lease_to_ip4_config (const char *iface,
 	/* Domain Name */
 	r = sd_dhcp_lease_get_domainname (lease, &str);
 	if (r == 0) {
-		/* Multiple domains sometimes stuffed into the option */
-		char **domains = g_strsplit (str, " ", 0);
+		/* Multiple domains sometimes stuffed into option 15 "Domain Name".
+		 * As systemd escapes such characters, split them at \\032. */
+		char **domains = g_strsplit (str, "\\032", 0);
 		char **s;
 
 		for (s = domains; *s; s++) {
@@ -857,6 +858,7 @@ dhcp6_event_cb (sd_dhcp6_client *client, int event, gpointer user_data)
 		nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL);
 		break;
 	case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE:
+	case SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST:
 		bound6_handle (self);
 		break;
 	default:
@@ -893,6 +895,9 @@ ip6_start (NMDhcpClient *client,
 		return FALSE;
 	}
 
+	if (info_only)
+	    sd_dhcp6_client_set_information_request (priv->client6, 1);
+
 	/* NM stores the entire DUID which includes the uint16 "type", while systemd
 	 * wants the type passed separately from the following data.
 	 */
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index 5ead5ecf..4cee1608 100644
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -32,6 +32,7 @@
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-dns-utils.h"
+#include "nm-bus-manager.h"
 #include "NetworkManagerUtils.h"
 
 G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
@@ -39,11 +40,17 @@ 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 NMRUNDIR "/dnsmasq.pid"
-#define CONFFILE NMRUNDIR "/dnsmasq.conf"
 #define CONFDIR NMCONFDIR "/dnsmasq.d"
 
+#define DNSMASQ_DBUS_SERVICE "org.freedesktop.NetworkManager.dnsmasq"
+#define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
+
 typedef struct {
-	guint32 foo;
+	GDBusProxy *dnsmasq;
+	GCancellable *dnsmasq_cancellable;
+	gboolean running;
+
+	GVariant *set_server_ex_args;
 } NMDnsDnsmasqPrivate;
 
 /*****************************************************************************/
@@ -61,8 +68,28 @@ typedef struct {
 
 /*****************************************************************************/
 
+static void
+add_dnsmasq_nameserver (NMDnsDnsmasq *self,
+                        GVariantBuilder *servers,
+                        const char *ip,
+                        const char *domain)
+{
+	g_return_if_fail (ip);
+
+	_LOGD ("adding nameserver '%s'%s%s%s", ip,
+	       NM_PRINT_FMT_QUOTED (domain, " for domain \"", domain, "\"", ""));
+
+	g_variant_builder_open (servers, G_VARIANT_TYPE ("as"));
+
+	g_variant_builder_add (servers, "s", ip);
+	if (domain)
+		g_variant_builder_add (servers, "s", domain);
+
+	g_variant_builder_close (servers);
+}
+
 static gboolean
-add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
+add_ip4_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP4Config *ip4, gboolean split)
 {
 	char buf[INET_ADDRSTRLEN];
 	in_addr_t addr;
@@ -84,9 +111,10 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
 			/* searches are preferred over domains */
 			n = nm_ip4_config_get_num_searches (ip4);
 			for (i = 0; i < n; i++) {
-				g_string_append_printf (str, "server=/%s/%s\n",
-				                        nm_ip4_config_get_search (ip4, i),
-				                        buf);
+				add_dnsmasq_nameserver (self,
+				                        servers,
+				                        buf,
+				                        nm_ip4_config_get_search (ip4, i));
 				added = TRUE;
 			}
 
@@ -94,9 +122,10 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
 				/* If not searches, use any domains */
 				n = nm_ip4_config_get_num_domains (ip4);
 				for (i = 0; i < n; i++) {
-					g_string_append_printf (str, "server=/%s/%s\n",
-					                        nm_ip4_config_get_domain (ip4, i),
-					                        buf);
+					add_dnsmasq_nameserver (self,
+					                        servers,
+					                        buf,
+					                        nm_ip4_config_get_domain (ip4, i));
 					added = TRUE;
 				}
 			}
@@ -107,7 +136,7 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
 			domains = nm_dns_utils_get_ip4_rdns_domains (ip4);
 			if (domains) {
 				for (iter = domains; iter && *iter; iter++)
-					g_string_append_printf (str, "server=/%s/%s\n", *iter, buf);
+					add_dnsmasq_nameserver (self, servers, buf, *iter);
 				g_strfreev (domains);
 				added = TRUE;
 			}
@@ -118,7 +147,8 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
 	if (!added) {
 		for (i = 0; i < nnameservers; i++) {
 			addr = nm_ip4_config_get_nameserver (ip4, i);
-			g_string_append_printf (str, "server=%s\n", nm_utils_inet4_ntop (addr, NULL));
+			add_dnsmasq_nameserver (self, servers,
+			                        nm_utils_inet4_ntop (addr, NULL), NULL);
 		}
 	}
 
@@ -148,7 +178,7 @@ ip6_addr_to_string (const struct in6_addr *addr, const char *iface)
 }
 
 static void
-add_global_config (GString *str, const NMGlobalDnsConfig *config)
+add_global_config (NMDnsDnsmasq *self, GVariantBuilder *dnsmasq_servers, const NMGlobalDnsConfig *config)
 {
 	guint i, j;
 
@@ -163,16 +193,16 @@ add_global_config (GString *str, const NMGlobalDnsConfig *config)
 
 		for (j = 0; servers && servers[j]; j++) {
 			if (!strcmp (name, "*"))
-				g_string_append_printf (str, "server=%s\n", servers[j]);
+				add_dnsmasq_nameserver (self, dnsmasq_servers, servers[j], NULL);
 			else
-				g_string_append_printf (str, "server=/%s/%s\n", name, servers[j]);
+				add_dnsmasq_nameserver (self, dnsmasq_servers, servers[j], name);
 		}
 
 	}
 }
 
 static gboolean
-add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
+add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6, gboolean split)
 {
 	const struct in6_addr *addr;
 	char *buf = NULL;
@@ -196,9 +226,10 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
 			/* searches are preferred over domains */
 			n = nm_ip6_config_get_num_searches (ip6);
 			for (i = 0; i < n; i++) {
-				g_string_append_printf (str, "server=/%s/%s\n",
-				                        nm_ip6_config_get_search (ip6, i),
-				                        buf);
+				add_dnsmasq_nameserver (self,
+				                        servers,
+				                        buf,
+				                        nm_ip6_config_get_search (ip6, i));
 				added = TRUE;
 			}
 
@@ -206,9 +237,10 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
 				/* If not searches, use any domains */
 				n = nm_ip6_config_get_num_domains (ip6);
 				for (i = 0; i < n; i++) {
-					g_string_append_printf (str, "server=/%s/%s\n",
-					                        nm_ip6_config_get_domain (ip6, i),
-					                        buf);
+					add_dnsmasq_nameserver (self,
+					                        servers,
+					                        buf,
+					                        nm_ip6_config_get_domain (ip6, i));
 					added = TRUE;
 				}
 			}
@@ -223,7 +255,7 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
 			addr = nm_ip6_config_get_nameserver (ip6, i);
 			buf = ip6_addr_to_string (addr, iface);
 			if (buf) {
-				g_string_append_printf (str, "server=%s\n", buf);
+				add_dnsmasq_nameserver (self, servers, buf, NULL);
 				g_free (buf);
 			}
 		}
@@ -232,105 +264,220 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
 	return TRUE;
 }
 
-static gboolean
-update (NMDnsPlugin *plugin,
-        const GSList *vpn_configs,
-        const GSList *dev_configs,
-        const GSList *other_configs,
-        const NMGlobalDnsConfig *global_config,
-        const char *hostname)
+static void
+dnsmasq_update_done (GObject *source, GAsyncResult *res, gpointer user_data)
 {
-	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
+	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
+	gs_free_error GError *error = NULL;
+	gs_unref_variant GVariant *response = NULL;
+
+	response = g_dbus_proxy_call_finish (priv->dnsmasq, res, &error);
+	if (!response)
+		_LOGW ("dnsmasq update failed: %s", error->message);
+	else
+		_LOGD ("dnsmasq update successful");
+}
+
+static void
+send_dnsmasq_update (NMDnsDnsmasq *self)
+{
+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
+
+	if (!priv->set_server_ex_args)
+		return;
+
+	if (priv->running) {
+		_LOGD ("trying to update dnsmasq nameservers");
+
+		g_dbus_proxy_call (priv->dnsmasq,
+		                   "SetServersEx",
+		                   priv->set_server_ex_args,
+		                   G_DBUS_CALL_FLAGS_NONE,
+		                   -1,
+		                   NULL,
+		                   (GAsyncReadyCallback) dnsmasq_update_done,
+		                   self);
+		g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
+	} else
+		_LOGD ("dnsmasq not found on the bus. The nameserver update will be sent when dnsmasq appears");
+}
+
+static void
+name_owner_changed (GObject    *object,
+                    GParamSpec *pspec,
+                    gpointer    user_data)
+{
+	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
+	gs_free char *owner = NULL;
+
+	owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
+	if (owner) {
+		_LOGI ("dnsmasq appeared as %s", owner);
+		priv->running = TRUE;
+		send_dnsmasq_update (self);
+	} else {
+		_LOGI ("dnsmasq disappeared");
+		priv->running = FALSE;
+		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
+	}
+}
+
+static void
+dnsmasq_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data)
+{
+	NMDnsDnsmasq *self;
+	NMDnsDnsmasqPrivate *priv;
+	gs_free_error GError *error = NULL;
+	gs_free char *owner = NULL;
+	GDBusProxy *proxy;
+
+	proxy = g_dbus_proxy_new_finish (res, &error);
+	if (   !proxy
+	    && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		return;
+
+	self = NM_DNS_DNSMASQ (user_data);
+
+	if (!proxy) {
+		_LOGW ("failed to connect to dnsmasq via DBus: %s", error->message);
+		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
+		return;
+	}
+
+	priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
+
+	priv->dnsmasq = proxy;
+	nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
+
+	_LOGD ("dnsmasq proxy creation successful");
+
+	g_signal_connect (priv->dnsmasq, "notify::g-name-owner",
+	                  G_CALLBACK (name_owner_changed), self);
+	owner = g_dbus_proxy_get_name_owner (priv->dnsmasq);
+	priv->running = (owner != NULL);
+
+	if (priv->running)
+		send_dnsmasq_update (self);
+}
+
+static void
+start_dnsmasq (NMDnsDnsmasq *self)
+{
+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
 	const char *dm_binary;
-	GString *conf;
-	GSList *iter;
 	const char *argv[15];
-	GError *error = NULL;
-	int ignored;
 	GPid pid = 0;
 	guint idx = 0;
+	NMBusManager *dbus_mgr;
+	GDBusConnection *connection;
+
 
-	/* 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
-	 * here when restarting dnsmasq when DNS requests could go to the upstream
-	 * servers instead of to dnsmasq.
-	 */
-	nm_dns_plugin_child_kill (plugin);
+	if (   priv->running
+	    || priv->dnsmasq
+	    || priv->dnsmasq_cancellable)
+		return;
 
 	dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
 	if (!dm_binary) {
 		_LOGW ("could not find dnsmasq binary");
-		return FALSE;
+		return;
 	}
 
-	/* Build up the new dnsmasq config file */
-	conf = g_string_sized_new (150);
+	argv[idx++] = dm_binary;
+	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++] = "--cache-size=400";
+	argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
+	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
+	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
+
+	/* 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;
+	nm_assert (idx <= G_N_ELEMENTS (argv));
+
+	/* And finally spawn dnsmasq */
+	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
+	if (!pid)
+		return;
+
+	dbus_mgr = nm_bus_manager_get ();
+	g_return_if_fail (dbus_mgr);
+
+	connection = nm_bus_manager_get_connection (dbus_mgr);
+	g_return_if_fail (connection);
+
+	priv->dnsmasq_cancellable = g_cancellable_new ();
+	g_dbus_proxy_new (connection,
+	                  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+	                  NULL,
+	                  DNSMASQ_DBUS_SERVICE,
+	                  DNSMASQ_DBUS_PATH,
+	                  DNSMASQ_DBUS_SERVICE,
+	                  priv->dnsmasq_cancellable,
+	                  dnsmasq_proxy_cb,
+	                  self);
+}
+
+static gboolean
+update (NMDnsPlugin *plugin,
+        const GSList *vpn_configs,
+        const GSList *dev_configs,
+        const GSList *other_configs,
+        const NMGlobalDnsConfig *global_config,
+        const char *hostname)
+{
+	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
+	const GSList *iter;
+	GVariantBuilder servers;
+
+	start_dnsmasq (self);
+
+	g_variant_builder_init (&servers, G_VARIANT_TYPE ("aas"));
 
 	if (global_config)
-		add_global_config (conf, global_config);
+		add_global_config (self, &servers, global_config);
 	else {
 		/* Use split DNS for VPN configs */
-		for (iter = (GSList *) vpn_configs; iter; iter = g_slist_next (iter)) {
+		for (iter = vpn_configs; iter; iter = g_slist_next (iter)) {
 			if (NM_IS_IP4_CONFIG (iter->data))
-				add_ip4_config (conf, NM_IP4_CONFIG (iter->data), TRUE);
+				add_ip4_config (self, &servers, iter->data, TRUE);
 			else if (NM_IS_IP6_CONFIG (iter->data))
-				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE);
+				add_ip6_config (self, &servers, iter->data, TRUE);
 		}
 
 		/* Now add interface configs without split DNS */
-		for (iter = (GSList *) dev_configs; iter; iter = g_slist_next (iter)) {
+		for (iter = dev_configs; iter; iter = g_slist_next (iter)) {
 			if (NM_IS_IP4_CONFIG (iter->data))
-				add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
+				add_ip4_config (self, &servers, iter->data, FALSE);
 			else if (NM_IS_IP6_CONFIG (iter->data))
-				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
+				add_ip6_config (self, &servers, iter->data, FALSE);
 		}
 
 		/* And any other random configs */
-		for (iter = (GSList *) other_configs; iter; iter = g_slist_next (iter)) {
+		for (iter = other_configs; iter; iter = g_slist_next (iter)) {
 			if (NM_IS_IP4_CONFIG (iter->data))
-				add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
+				add_ip4_config (self, &servers, iter->data, FALSE);
 			else if (NM_IS_IP6_CONFIG (iter->data))
-				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
+				add_ip6_config (self, &servers, iter->data, FALSE);
 		}
 	}
 
-	/* Write out the config file */
-	if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) {
-		_LOGW ("failed to write dnsmasq config file %s: %s",
-		       CONFFILE,
-		       error->message);
-		g_clear_error (&error);
-		goto out;
-	}
-	ignored = chmod (CONFFILE, 0644);
-
-	_LOGD ("dnsmasq local caching DNS configuration:");
-	_LOGD ("%s", conf->str);
-
-	argv[idx++] = dm_binary;
-	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;
+	g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
+	priv->set_server_ex_args = g_variant_ref_sink (g_variant_new ("(aas)", &servers));
 
-	argv[idx++] = NULL;
-	g_warn_if_fail (idx <= G_N_ELEMENTS (argv));
+	send_dnsmasq_update (self);
 
-	/* And finally spawn dnsmasq */
-	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
-
-out:
-	g_string_free (conf, TRUE);
-	return pid ? TRUE : FALSE;
+	return TRUE;
 }
 
 /****************************************************************/
@@ -374,7 +521,6 @@ child_quit (NMDnsPlugin *plugin, gint status)
 		_LOGW ("dnsmasq died with signal %d", WTERMSIG (status));
 	else
 		_LOGW ("dnsmasq died from an unknown cause");
-	unlink (CONFFILE);
 
 	if (failed)
 		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
@@ -410,7 +556,13 @@ nm_dns_dnsmasq_init (NMDnsDnsmasq *self)
 static void
 dispose (GObject *object)
 {
-	unlink (CONFFILE);
+	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (object);
+
+	nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
+
+	g_clear_object (&priv->dnsmasq);
+
+	g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
 
 	G_OBJECT_CLASS (nm_dns_dnsmasq_parent_class)->dispose (object);
 }
diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
index 47322d2a..d5cb8822 100644
--- a/src/dns-manager/nm-dns-plugin.c
+++ b/src/dns-manager/nm-dns-plugin.c
@@ -48,7 +48,29 @@ enum {
 };
 static guint signals[LAST_SIGNAL] = { 0 };
 
-/********************************************/
+/******************************************************************************/
+
+#define _NMLOG_PREFIX_NAME                "dns-plugin"
+#define _NMLOG_DOMAIN                     LOGD_DNS
+#define _NMLOG(level, ...) \
+    G_STMT_START { \
+        const NMLogLevel __level = (level); \
+        \
+        if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \
+            char __prefix[20]; \
+            const NMDnsPlugin *const __self = (self); \
+            \
+            _nm_log (__level, _NMLOG_DOMAIN, 0, \
+                     "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
+                     _NMLOG_PREFIX_NAME, \
+                     (!__self \
+                        ? "" \
+                        : nm_sprintf_buf (__prefix, "[%p]", __self)) \
+                     _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
+        } \
+    } G_STMT_END
+
+/******************************************************************************/
 
 gboolean
 nm_dns_plugin_update (NMDnsPlugin *self,
@@ -96,8 +118,7 @@ _clear_pidfile (NMDnsPlugin *self)
 
 	if (priv->pidfile) {
 		unlink (priv->pidfile);
-		g_free (priv->pidfile);
-		priv->pidfile = NULL;
+		g_clear_pointer (&priv->pidfile, g_free);
 	}
 }
 
@@ -138,7 +159,7 @@ kill_existing (const char *progname, const char *pidfile, const char *kill_match
 	if (!strstr (cmdline_contents, kill_match))
 		goto out;
 
-	nm_utils_kill_process_sync (pid, start_time, SIGKILL, LOGD_DNS,
+	nm_utils_kill_process_sync (pid, start_time, SIGKILL, _NMLOG_DOMAIN,
 	                            progname ?: "<dns-process>",
 	                            0, 0, 1000);
 
@@ -154,9 +175,7 @@ watch_cb (GPid pid, gint status, gpointer user_data)
 
 	priv->pid = 0;
 	priv->watch_id = 0;
-	g_free (priv->progname);
-	priv->progname = NULL;
-
+	g_clear_pointer (&priv->progname, g_free);
 	_clear_pidfile (self);
 
 	g_signal_emit (self, signals[CHILD_QUIT], 0, status);
@@ -168,43 +187,47 @@ nm_dns_plugin_child_spawn (NMDnsPlugin *self,
                            const char *pidfile,
                            const char *kill_match)
 {
-	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
+	NMDnsPluginPrivate *priv;
 	GError *error = NULL;
-	char *cmdline;
+	GPid pid;
+	gs_free char *cmdline = NULL;
+	gs_free char *progname = NULL;
 
-	g_return_val_if_fail (argv != NULL, 0);
-	g_return_val_if_fail (argv[0] != NULL, 0);
+	g_return_val_if_fail (argv && argv[0], 0);
+	g_return_val_if_fail (NM_IS_DNS_PLUGIN (self), 0);
 
-	g_warn_if_fail (priv->progname == NULL);
-	g_free (priv->progname);
-	priv->progname = g_path_get_basename (argv[0]);
+	priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
 
-	kill_existing (priv->progname, pidfile, kill_match);
+	g_return_val_if_fail (!priv->pid, 0);
+	nm_assert (!priv->progname);
+	nm_assert (!priv->watch_id);
+	nm_assert (!priv->pidfile);
 
-	g_warn_if_fail (priv->pidfile == NULL);
-	g_clear_pointer (&priv->pidfile, g_free);
-	priv->pidfile = g_strdup (pidfile);
+	progname = g_path_get_basename (argv[0]);
+	kill_existing (progname, pidfile, kill_match);
 
-	nm_log_info (LOGD_DNS, "DNS: starting %s...", priv->progname);
-	cmdline = g_strjoinv (" ", (char **) argv);
-	nm_log_dbg (LOGD_DNS, "DNS: command line: %s", cmdline);
-	g_free (cmdline);
+	_LOGI ("starting %s...", progname);
+	_LOGD ("command line: %s",
+	       (cmdline = g_strjoinv (" ", (char **) argv)));
 
-	priv->pid = 0;
-	if (g_spawn_async (NULL, (char **) argv, NULL,
+	if (!g_spawn_async (NULL, (char **) argv, NULL,
 	                   G_SPAWN_DO_NOT_REAP_CHILD,
 	                   nm_utils_setpgid, NULL,
-	                   &priv->pid,
+	                   &pid,
 	                   &error)) {
-		nm_log_dbg (LOGD_DNS, "%s started with pid %d", priv->progname, priv->pid);
-		priv->watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) watch_cb, self);
-	} else {
-		nm_log_warn (LOGD_DNS, "Failed to spawn %s: %s",
-		             priv->progname, error->message);
+		_LOGW ("failed to spawn %s: %s",
+		       progname, error->message);
 		g_clear_error (&error);
+		return 0;
 	}
 
-	return priv->pid;
+	_LOGD ("%s started with pid %d", progname, pid);
+	priv->watch_id = g_child_watch_add (pid, (GChildWatchFunc) watch_cb, self);
+	priv->pid = pid;
+	priv->progname = nm_unauto (&progname);
+	priv->pidfile = g_strdup (pidfile);
+
+	return pid;
 }
 
 gboolean
@@ -213,14 +236,12 @@ nm_dns_plugin_child_kill (NMDnsPlugin *self)
 	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
 
 	nm_clear_g_source (&priv->watch_id);
-
 	if (priv->pid) {
-		nm_utils_kill_child_sync (priv->pid, SIGTERM, LOGD_DNS, priv->progname, NULL, 1000, 0);
+		nm_utils_kill_child_sync (priv->pid, SIGTERM, _NMLOG_DOMAIN,
+		                          priv->progname ?: "<dns-process>", NULL, 1000, 0);
 		priv->pid = 0;
-		g_free (priv->progname);
-		priv->progname = NULL;
+		g_clear_pointer (&priv->progname, g_free);
 	}
-
 	_clear_pidfile (self);
 
 	return TRUE;
@@ -244,18 +265,6 @@ dispose (GObject *object)
 }
 
 static void
-finalize (GObject *object)
-{
-	NMDnsPlugin *self = NM_DNS_PLUGIN (object);
-	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-
-	g_free (priv->progname);
-	g_free (priv->pidfile);
-
-	G_OBJECT_CLASS (nm_dns_plugin_parent_class)->finalize (object);
-}
-
-static void
 nm_dns_plugin_class_init (NMDnsPluginClass *plugin_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (plugin_class);
@@ -264,7 +273,6 @@ nm_dns_plugin_class_init (NMDnsPluginClass *plugin_class)
 
 	/* virtual methods */
 	object_class->dispose = dispose;
-	object_class->finalize = finalize;
 	plugin_class->is_caching = is_caching;
 
 	/* signals */
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index 31c1db24..764aba29 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -221,7 +221,7 @@ dm_watch_cb (GPid pid, gint status, gpointer user_data)
 
 static NMCmdLine *
 create_dm_cmd_line (const char *iface,
-                    const NMPlatformIP4Address *listen_address,
+                    const NMIP4Config *ip4_config,
                     const char *pidfile,
                     GError **error)
 {
@@ -232,7 +232,9 @@ create_dm_cmd_line (const char *iface,
 	char localaddr[INET_ADDRSTRLEN];
 	char *error_desc = NULL;
 	const char *dm_binary;
+	const NMPlatformIP4Address *listen_address;
 
+	listen_address = nm_ip4_config_get_address (ip4_config, 0);
 	g_return_val_if_fail (listen_address, NULL);
 
 	dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, error);
@@ -290,10 +292,12 @@ create_dm_cmd_line (const char *iface,
 	nm_cmd_line_add_string (cmd, s->str);
 	g_string_free (s, TRUE);
 
-	s = g_string_new ("--dhcp-option=option:router,");
-	g_string_append (s, localaddr);
-	nm_cmd_line_add_string (cmd, s->str);
-	g_string_free (s, TRUE);
+	if (!nm_ip4_config_get_never_default (ip4_config)) {
+		s = g_string_new ("--dhcp-option=option:router,");
+		g_string_append (s, localaddr);
+		nm_cmd_line_add_string (cmd, s->str);
+		g_string_free (s, TRUE);
+	}
 
 	nm_cmd_line_add_string (cmd, "--dhcp-lease-max=50");
 
@@ -365,7 +369,7 @@ nm_dnsmasq_manager_start (NMDnsMasqManager *manager,
 
 	kill_existing_by_pidfile (priv->pidfile);
 
-	dm_cmd = create_dm_cmd_line (priv->iface, nm_ip4_config_get_address (ip4_config, 0), priv->pidfile, error);
+	dm_cmd = create_dm_cmd_line (priv->iface, ip4_config, priv->pidfile, error);
 	if (!dm_cmd)
 		return FALSE;
 
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 494d52d3..86b873f0 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -360,9 +360,18 @@ constructed (GObject *object)
 		priv->unix_process.start_time = nm_utils_get_start_time_for_pid (priv->unix_process.pid, NULL, NULL);
 
 		if (!priv->unix_process.start_time) {
-			/* could not detect the process start time. The subject is invalid, but don't
-			 * assert against it. */
-			_clear_private (priv);
+			/* Is the process already gone? Then fail creation of the auth subject
+			 * by clearing the type. */
+			if (kill (priv->unix_process.pid, 0) != 0)
+				_clear_private (priv);
+
+			/* Otherwise, although we didn't detect a start_time, the process is still around.
+			 * That could be due to procfs mounted with hidepid. So just accept the request.
+			 *
+			 * Polkit on the other side, will accept 0 and try to lookup /proc/$PID/stat
+			 * itself (and if it fails to do so, assume a start-time of 0 and proceed).
+			 * The only combination that would fail here, is when NM is able to read the
+			 * start-time, but polkit is not. */
 		}
 		return;
 	default:
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index bbe46654..ef44a139 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2559,6 +2559,121 @@ nm_utils_is_specific_hostname (const char *name)
 
 /******************************************************************/
 
+gboolean
+nm_utils_machine_id_parse (const char *id_str, /*uuid_t*/ guchar *out_uuid)
+{
+	int i;
+	guint8 v0, v1;
+
+	if (!id_str)
+		return FALSE;
+
+	for (i = 0; i < 32; i++) {
+		if (!g_ascii_isxdigit (id_str[i]))
+			return FALSE;
+	}
+	if (id_str[i] != '\0')
+		return FALSE;
+
+	if (out_uuid) {
+		for (i = 0; i < 16; i++) {
+			v0 = g_ascii_xdigit_value (*(id_str++));
+			v1 = g_ascii_xdigit_value (*(id_str++));
+			out_uuid[i] = (v0 << 4) + v1;
+		}
+	}
+	return TRUE;
+}
+
+char *
+nm_utils_machine_id_read (void)
+{
+	gs_free char *contents = NULL;
+	int i;
+
+	/* Get the machine ID from /etc/machine-id; it's always in /etc no matter
+	 * where our configured SYSCONFDIR is.  Alternatively, it might be in
+	 * LOCALSTATEDIR /lib/dbus/machine-id.
+	 */
+	if (   !g_file_get_contents ("/etc/machine-id", &contents, NULL, NULL)
+	    && !g_file_get_contents (LOCALSTATEDIR "/lib/dbus/machine-id", &contents, NULL, NULL))
+		return FALSE;
+
+	contents = g_strstrip (contents);
+
+	for (i = 0; i < 32; i++) {
+		if (!g_ascii_isxdigit (contents[i]))
+			return FALSE;
+		if (contents[i] >= 'A' && contents[i] <= 'F') {
+			/* canonicalize to lower-case */
+			contents[i] = 'a' + (contents[i] - 'A');
+		}
+	}
+	if (contents[i] != '\0')
+		return FALSE;
+
+	return nm_unauto (&contents);
+}
+
+/*****************************************************************************/
+
+guint8 *
+nm_utils_secret_key_read (gsize *out_key_len, GError **error)
+{
+	guint8 *secret_key = NULL;
+	gsize key_len;
+
+	/* out_key_len is not optional, because without it you cannot safely
+	 * access the returned memory. */
+	*out_key_len = 0;
+
+	/* Let's try to load a saved secret key first. */
+	if (g_file_get_contents (NMSTATEDIR "/secret_key", (char **) &secret_key, &key_len, NULL)) {
+		if (key_len < 16) {
+			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+			                     "Key is too short to be usable");
+			key_len = 0;
+		}
+	} else {
+		int urandom = open ("/dev/urandom", O_RDONLY);
+		mode_t key_mask;
+
+		if (urandom == -1) {
+			g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+			             "Can't open /dev/urandom: %s", strerror (errno));
+			key_len = 0;
+			goto out;
+		}
+
+		/* RFC7217 mandates the key SHOULD be at least 128 bits.
+		 * Let's use twice as much. */
+		key_len = 32;
+		secret_key = g_malloc (key_len);
+
+		key_mask = umask (0077);
+		if (read (urandom, secret_key, key_len) == key_len) {
+			if (!g_file_set_contents (NMSTATEDIR "/secret_key", (char *) secret_key, key_len, error)) {
+				g_prefix_error (error, "Can't write " NMSTATEDIR "/secret_key: ");
+				key_len = 0;
+			}
+		} else {
+			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+			                     "Could not obtain a secret");
+			key_len = 0;
+		}
+		umask (key_mask);
+		close (urandom);
+	}
+
+out:
+	if (key_len) {
+		*out_key_len = key_len;
+		return secret_key;
+	}
+	g_free (secret_key);
+	return NULL;
+}
+
 /* Returns the "u" (universal/local) bit value for a Modified EUI-64 */
 static gboolean
 get_gre_eui64_u_bit (guint32 addr)
@@ -2686,7 +2801,7 @@ _set_stable_privacy (struct in6_addr *addr,
                      const char *ifname,
                      const char *uuid,
                      guint dad_counter,
-                     gchar *secret_key,
+                     guint8 *secret_key,
                      gsize key_len,
                      GError **error)
 {
@@ -2744,9 +2859,8 @@ nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr,
                                        guint dad_counter,
                                        GError **error)
 {
-	gchar *secret_key = NULL;
+	gs_free guint8 *secret_key = NULL;
 	gsize key_len = 0;
-	gboolean success = FALSE;
 
 	if (dad_counter >= RFC7217_IDGEN_RETRIES) {
 		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
@@ -2754,50 +2868,12 @@ nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr,
 		return FALSE;
 	}
 
-	/* Let's try to load a saved secret key first. */
-	if (g_file_get_contents (NMSTATEDIR "/secret_key", &secret_key, &key_len, NULL)) {
-		if (key_len < 16) {
-			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-			                     "Key is too short to be usable");
-			key_len = 0;
-		}
-	} else {
-		int urandom = open ("/dev/urandom", O_RDONLY);
-		mode_t key_mask;
-
-		if (urandom == -1) {
-			g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-			             "Can't open /dev/urandom: %s", strerror (errno));
-			return FALSE;
-		}
-
-		/* RFC7217 mandates the key SHOULD be at least 128 bits.
-		 * Let's use twice as much. */
-		key_len = 32;
-		secret_key = g_malloc (key_len);
-
-		key_mask = umask (0077);
-		if (read (urandom, secret_key, key_len) == key_len) {
-			if (!g_file_set_contents (NMSTATEDIR "/secret_key", secret_key, key_len, error)) {
-				g_prefix_error (error, "Can't write " NMSTATEDIR "/secret_key: ");
-				key_len = 0;
-			}
-		} else {
-			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-			                     "Could not obtain a secret");
-			key_len = 0;
-		}
-		umask (key_mask);
-		close (urandom);
-	}
-
-	if (key_len) {
-		success = _set_stable_privacy (addr, ifname, uuid, dad_counter,
-		                               secret_key, key_len, error);
-	}
+	secret_key = nm_utils_secret_key_read (&key_len, error);
+	if (!secret_key)
+		return FALSE;
 
-	g_free (secret_key);
-	return success;
+	return _set_stable_privacy (addr, ifname, uuid, dad_counter,
+	                            secret_key, key_len, error);
 }
 
 /**
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 528288c3..ad0f995f 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -306,6 +306,11 @@ const char *nm_utils_ip4_property_path (const char *ifname, const char *property
 
 gboolean nm_utils_is_specific_hostname (const char *name);
 
+char *nm_utils_machine_id_read (void);
+gboolean nm_utils_machine_id_parse (const char *id_str, /*uuid_t*/ guchar *out_uuid);
+
+guint8 *nm_utils_secret_key_read (gsize *out_key_len, GError **error);
+
 /* IPv6 Interface Identifer helpers */
 
 /**
diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf
index dd630e19..d130f7e2 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/org.freedesktop.NetworkManager.conf
@@ -26,6 +26,13 @@
                 <allow send_destination="org.freedesktop.NetworkManager.fortisslvpn"/>
                 <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
                 <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
+
+                <!-- Allow the custom name for the dnsmasq instance spawned by NM
+                     from the dns dnsmasq plugin to own it's dbus name, and for
+                     messages to be sent to it.
+                 -->
+                <allow own="org.freedesktop.NetworkManager.dnsmasq"/>
+                <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
         </policy>
         <policy context="default">
                 <deny own="org.freedesktop.NetworkManager"/>
@@ -127,6 +134,9 @@
                 <deny send_destination="org.freedesktop.NetworkManager"
                       send_interface="org.freedesktop.NetworkManager.Settings"
                       send_member="ReloadConnections"/>
+
+                <deny own="org.freedesktop.NetworkManager.dnsmasq"/>
+                <deny send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
         </policy>
 
 	<limit name="max_replies_per_connection">1024</limit>
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 254f9c85..c5045503 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -632,7 +632,9 @@ _linktype_get_type (NMPlatform *platform,
 		obj = _lookup_cached_link (cache, ifindex, completed_from_cache, link_cached);
 
 		/* If we detected the link type before, we stick to that
-		 * decision unless the "kind" changed.
+		 * decision unless the "kind" no "name" changed. If "name" changed,
+		 * it means that their type may not have been determined correctly
+		 * due to race conditions while accessing sysfs.
 		 *
 		 * This way, we save edditional ethtool/sysctl lookups, but moreover,
 		 * we keep the linktype stable and don't change it as long as the link
@@ -643,6 +645,7 @@ _linktype_get_type (NMPlatform *platform,
 		 * of messing stuff up. */
 		if (   obj
 		    && !NM_IN_SET (obj->link.type, NM_LINK_TYPE_UNKNOWN, NM_LINK_TYPE_NONE)
+		    && !g_strcmp0 (ifname, obj->link.name)
 		    && (   !kind
 		        || !g_strcmp0 (kind, obj->link.kind))) {
 			nm_assert (obj->link.kind == g_intern_string (obj->link.kind));
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 4ad395a1..65148994 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -112,6 +112,10 @@ EXPORT(nm_settings_connection_replace_and_commit)
 
 #define PLUGIN_MODULE_PATH      "plugin-module-path"
 
+#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) + defined(HOSTNAME_PERSIST_GENTOO)) > 1
+#error "Can only define one of HOSTNAME_PERSIST_*"
+#endif
+
 #if defined(HOSTNAME_PERSIST_SUSE)
 #define HOSTNAME_FILE           HOSTNAME_FILE_UCASE_HOSTNAME
 #elif defined(HOSTNAME_PERSIST_SLACKWARE)
@@ -258,6 +262,7 @@ load_connections (NMSettings *self)
 	}
 
 	priv->connections_loaded = TRUE;
+	g_object_notify (G_OBJECT (self), NM_SETTINGS_CONNECTIONS);
 
 	unmanaged_specs_changed (NULL, self);
 	unrecognized_specs_changed (NULL, self);
@@ -480,27 +485,58 @@ get_plugin (NMSettings *self, guint32 capability)
 static gchar *
 read_hostname_gentoo (const char *path)
 {
-	gchar *contents = NULL, *result = NULL, *tmp;
-	gchar **all_lines = NULL;
-	guint line_num, i;
+	gs_free char *contents = NULL;
+	gs_strfreev char **all_lines = NULL;
+	const char *tmp;
+	guint i;
 
 	if (!g_file_get_contents (path, &contents, NULL, NULL))
 		return NULL;
+
 	all_lines = g_strsplit (contents, "\n", 0);
-	line_num = g_strv_length (all_lines);
-	for (i = 0; i < line_num; i++) {
+	for (i = 0; all_lines[i]; i++) {
 		g_strstrip (all_lines[i]);
 		if (all_lines[i][0] == '#' || all_lines[i][0] == '\0')
 			continue;
 		if (g_str_has_prefix (all_lines[i], "hostname=")) {
 			tmp = &all_lines[i][NM_STRLEN ("hostname=")];
-			result = g_shell_unquote (tmp, NULL);
-			break;
+			return g_shell_unquote (tmp, NULL);
 		}
 	}
-	g_strfreev (all_lines);
-	g_free (contents);
-	return result;
+	return NULL;
+}
+#endif
+
+#if defined(HOSTNAME_PERSIST_SLACKWARE)
+static gchar *
+read_hostname_slackware (const char *path)
+{
+	gs_free char *contents = NULL;
+	gs_strfreev char **all_lines = NULL;
+	char *tmp;
+	guint i, j = 0;
+
+	if (!g_file_get_contents (path, &contents, NULL, NULL))
+		return NULL;
+
+	all_lines = g_strsplit (contents, "\n", 0);
+	for (i = 0; all_lines[i]; i++) {
+		g_strstrip (all_lines[i]);
+		if (all_lines[i][0] == '#' || all_lines[i][0] == '\0')
+			continue;
+		tmp = &all_lines[i][0];
+		/* We only want up to the first '.' -- the rest of the */
+		/* fqdn is defined in /etc/hosts */
+		while (tmp[j] != '\0') {
+			if (tmp[j] == '.') {
+				tmp[j] = '\0';
+				break;
+			}
+			j++;
+		}
+		return g_shell_unquote (tmp, NULL);
+	}
+	return NULL;
 }
 #endif
 
@@ -547,18 +583,19 @@ nm_settings_get_hostname (NMSettings *self)
 		goto out;
 	}
 
-#if defined(HOSTNAME_PERSIST_GENTOO)
-	hostname = read_hostname_gentoo (priv->hostname.file);
-#else
-
 #if defined(HOSTNAME_PERSIST_SUSE)
 	if (priv->hostname.dhcp_monitor_id && hostname_is_dynamic ())
 		return NULL;
 #endif
+
+#if defined(HOSTNAME_PERSIST_GENTOO)
+	hostname = read_hostname_gentoo (priv->hostname.file);
+#elif defined(HOSTNAME_PERSIST_SLACKWARE)
+	hostname = read_hostname_slackware (priv->hostname.file);
+#else
 	if (g_file_get_contents (priv->hostname.file, &hostname, NULL, NULL))
 		g_strchomp (hostname);
-
-#endif /* HOSTNAME_PERSIST_GENTOO */
+#endif
 
 out:
 	if (hostname && !hostname[0]) {
@@ -806,18 +843,19 @@ load_plugin:
 				break;
 			}
 
+			/* after accessing the plugin we cannot unload it anymore, because the glib
+			 * types cannot be properly unregistered. */
+			g_module_make_resident (plugin);
+
 			obj = (*factory_func) ();
 			if (!obj || !NM_IS_SETTINGS_PLUGIN (obj)) {
 				g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
 				             "Plugin '%s' returned invalid system config object.",
 				             pname);
 				success = FALSE;
-				g_module_close (plugin);
 				break;
 			}
 
-			g_module_make_resident (plugin);
-			g_object_weak_ref (obj, (GWeakNotify) g_module_close, plugin);
 			g_object_set_data_full (obj, PLUGIN_MODULE_PATH, path, g_free);
 			path = NULL;
 			if (add_plugin (self, NM_SETTINGS_PLUGIN (obj)))
@@ -1960,9 +1998,11 @@ device_realized (NMDevice *device, GParamSpec *pspec, NMSettings *self)
 	g_object_unref (connection);
 
 	if (!added) {
-		_LOGW ("(%s) couldn't create default wired connection: %s",
-		       nm_device_get_iface (device),
-		       error->message);
+		if (!g_error_matches (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_UUID_EXISTS)) {
+			_LOGW ("(%s) couldn't create default wired connection: %s",
+			       nm_device_get_iface (device),
+			       error->message);
+		}
 		g_clear_error (&error);
 		return;
 	}
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index d9ff97dc..80b82535 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -1541,15 +1541,12 @@ make_wireless_security_setting (const char *conn_name,
 		if (wsec == NULL)
 			goto error;
 	}
-
-	if (!wsec) {
-		g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
-			     "Can't handle security information for ssid: %s",
-			     conn_name);
-	}
-
 	return wsec;
+
 error:
+	g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
+		     "Can't handle security information for ssid: %s",
+		     conn_name);
 	return NULL;
 }
 
diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c
index d342501b..7ad902d4 100644
--- a/src/settings/plugins/ifupdown/interface_parser.c
+++ b/src/settings/plugins/ifupdown/interface_parser.c
@@ -39,7 +39,7 @@ if_data* last_data;
 
 void add_block(const char *type, const char* name)
 {
-	if_block *ret = (if_block*)calloc(1,sizeof(struct _if_block));
+	if_block *ret = g_slice_new0 (struct _if_block);
 	ret->name = g_strdup(name);
 	ret->type = g_strdup(type);
 	if (first == NULL)
@@ -61,7 +61,7 @@ void add_data(const char *key,const char *data)
 	if (first == NULL)
 		return;
 
-	ret = (if_data*) calloc(1,sizeof(struct _if_data));
+	ret = g_slice_new0 (struct _if_data);
 	ret->key = g_strdup(key);
 
 	/* Normalize keys. Convert '_' to '-', as ifupdown accepts both variants.
@@ -298,9 +298,9 @@ void _destroy_data(if_data *ifd)
 	if (ifd == NULL)
 		return;
 	_destroy_data(ifd->next);
-	free(ifd->key);
-	free(ifd->data);
-	free(ifd);
+	g_free(ifd->key);
+	g_free(ifd->data);
+	g_slice_free(struct _if_data, ifd);
 	return;
 }
 
@@ -310,9 +310,9 @@ void _destroy_block(if_block* ifb)
 		return;
 	_destroy_block(ifb->next);
 	_destroy_data(ifb->info);
-	free(ifb->name);
-	free(ifb->type);
-	free(ifb);
+	g_free(ifb->name);
+	g_free(ifb->type);
+	g_slice_free(struct _if_block, ifb);
 	return;
 }
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 5dacae8d..e1734b6d 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -137,6 +137,7 @@ test_utils_DEPENDENCIES = \
 test_utils_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DPREFIX=\"/nonexistent\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DNMSTATEDIR=\"/nonsense\"
 
 test_utils_LDADD = \
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 380220f3..a4a135c5 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -887,6 +887,7 @@ test_utils_DEPENDENCIES = \
 test_utils_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DPREFIX=\"/nonexistent\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
 	-DNMSTATEDIR=\"/nonsense\"
 
 test_utils_LDADD = \
diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c
index c8c82aef..6fc3978b 100644
--- a/src/tests/test-utils.c
+++ b/src/tests/test-utils.c
@@ -34,17 +34,17 @@ test_stable_privacy (void)
 	struct in6_addr addr1;
 
 	inet_pton (AF_INET6, "1234::", &addr1);
-	_set_stable_privacy (&addr1, "eth666", "6b138152-9f3e-4b97-aaf7-e6e553f2a24e", 0, "key", 3, NULL);
+	_set_stable_privacy (&addr1, "eth666", "6b138152-9f3e-4b97-aaf7-e6e553f2a24e", 0, (guint8 *) "key", 3, NULL);
 	nmtst_assert_ip6_address (&addr1, "1234::4ceb:14cd:3d54:793f");
 
 	/* We get an address without the UUID. */
 	inet_pton (AF_INET6, "1::", &addr1);
-	_set_stable_privacy (&addr1, "eth666", NULL, 384, "key", 3, NULL);
+	_set_stable_privacy (&addr1, "eth666", NULL, 384, (guint8 *) "key", 3, NULL);
 	nmtst_assert_ip6_address (&addr1, "1::11aa:2530:9144:dafa");
 
 	/* We get a different address in a different network. */
 	inet_pton (AF_INET6, "2::", &addr1);
-	_set_stable_privacy (&addr1, "eth666", NULL, 384, "key", 3, NULL);
+	_set_stable_privacy (&addr1, "eth666", NULL, 384, (guint8 *) "key", 3, NULL);
 	nmtst_assert_ip6_address (&addr1, "2::338e:8d:c11:8726");
 }
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 91ada71a..966487c6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,4 +4,5 @@ EXTRA_DIST = \
 	run-test-valgrind.sh \
 	run-test-dbus-session.sh \
 	test-networkmanager-service.py \
-	test-sudo-wrapper.sh
+	test-sudo-wrapper.sh \
+	enums-to-docbook.pl
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 11c57790..364478cb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -400,7 +400,8 @@ EXTRA_DIST = \
 	run-test-valgrind.sh \
 	run-test-dbus-session.sh \
 	test-networkmanager-service.py \
-	test-sudo-wrapper.sh
+	test-sudo-wrapper.sh \
+	enums-to-docbook.pl
 
 all: all-am
 
diff --git a/tools/enums-to-docbook.pl b/tools/enums-to-docbook.pl
new file mode 100755
index 00000000..d3d8c33c
--- /dev/null
+++ b/tools/enums-to-docbook.pl
@@ -0,0 +1,198 @@
+#!/usr/bin/perl -n
+
+# 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 2016 Red Hat, Inc.
+#
+
+# This tool formats enums along with their Gtk-Doc comments from a header
+# file and produces a Docbook refentry suitable for inclusion in the D-Bus
+# API rederence documentation.
+#
+# The output differs from Gtk-Doc: only enums are considered and are
+# printed along with the values that are need to stay stable.
+
+use strict;
+use warnings;
+
+our $name;
+our $desc;
+our $choice;
+our @choices;
+our $val;
+
+BEGIN {
+my $id = shift @ARGV or die "Missing ID";
+my $nm = shift @ARGV or die "Missing title";
+print <<END;
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="$id">
+  <refmeta>
+    <refentrytitle role="top_of_page" id="$id.top_of_page">$nm</refentrytitle>
+    <manvolnum>3</manvolnum>
+    <refmiscinfo>$nm</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>$nm</refname>
+    <refpurpose></refpurpose>
+  </refnamediv>
+
+END
+}
+
+# Increment a value keeping the format (e.g. 0x000666 is incremented to 0x000667,
+# while 9 becomes 10.
+sub inc
+{
+	my $val = shift;
+
+	if ($val =~ /^\d+$/) {
+		my $len = length $val;
+		return sprintf "%0${len}d", $val + 1;
+	} elsif ($val =~ /^0x(.+)$/) {
+		my $len = length $1;
+		return sprintf "0x%0${len}x", hex ($1) + 1;
+	}
+	die "'$val' used in previous enum value can not be incremented";
+}
+
+# The Gtk-Doc to docbook translation happens here. We don't support
+# everything Gtk-Doc does.
+sub fmt
+{
+	$_ = shift;
+	s/\#([^\s\.]+)/<link linkend="$1">$1<\/link>/gm;
+	s/\s*(.*)/<para>$1<\/para>/gm;
+	$_;
+}
+
+chomp;
+
+if (/^\/\*\*$/) {
+	# Start of a documentation comment
+	$name = '';
+	$desc = '';
+	$choice = undef;
+	@choices = ();
+} elsif (/^ \* (.+):$/) {
+	# The name
+	die "Duplicate name '$1': already processing '$name'" if $name;
+	$name = $1;
+} elsif (/^ \* @(\S+):\s+(.*)$/) {
+	# The enum choice documentation
+	$choice = $1;
+	die "Documentation for '$1' already seen" if grep { $_->[0] eq $choice } @choices;
+	push @choices, [ $choice, $2 ]
+} elsif (/^ \*\s+(.*)$/) {
+	# Text. Either a choice documentation, a description or continuation of either
+	if (defined $choice) {
+		my ($this) = grep { $_->[0] eq $choice } @choices;
+		$this->[1] .= " $1";
+	} elsif (defined $desc) {
+		$desc .= " " if $desc;
+		$desc .= $1;
+	}
+} elsif (/^ \*$/) {
+	# A separator line. Either starts the description or breaks a paragraph.
+	$desc .= "\n" if $desc;
+	$choice = undef;
+} elsif (/^ \*+\/$/) {
+	# End of the doc comment
+	$choice = undef;
+} elsif (/^typedef enum/) {
+	# Start of an enum
+	$val = 0;
+} elsif (/^\s+(\S+)\s+=\s+([^,\s]+)/) {
+	# A choice with a literal value
+	next unless @choices;
+	die "Saw enum value '$1', but didn't see start of enum before" unless defined $val;
+	$val = $2;
+	my ($this) = grep { $_->[0] eq $1 } @choices;
+	die "Documentation for value '$1' missing" unless $this;
+	$this->[2] = "= <literal>$val</literal>";
+} elsif (/^\s+([^,\s]+),?$/) {
+	# A choice without a literal value
+	next unless @choices;
+	die "Saw enum value '$1', but didn't see start of enum before" unless defined $val;
+	my ($this) = grep { $_->[0] eq $1 } @choices;
+	die "Documentation for value '$1' missing" unless $this;
+	$val = inc $val;
+	$this->[2] = "= <literal>$val</literal>";
+} elsif (/^\} ([^;]+);/) {
+	# End of an enum
+	next unless defined $name;
+	die "Name of the enum '$1' different than documented '$name'" if $1 ne $name;
+
+	@choices = grep { $_->[0] !~ /_LAST$/ } @choices;
+	foreach (@choices) {
+		die "'$_->[0]' documented, but not present in enum" unless defined $_->[2]
+	}
+
+	$desc = fmt $desc;
+	print <<END;
+  <refsect2 id="$name" role="enum">
+    <title>enum $name</title>
+    <indexterm zone="$name">
+      <primary>$name</primary>
+    </indexterm>
+    <para>$desc</para>
+    <refsect3 role="enum_members">
+      <title>Values</title>
+      <informaltable role="enum_members_table" pgwide="1" frame="none">
+        <tgroup cols="4">
+          <colspec colname="enum_members_name" colwidth="300px" />
+          <colspec colname="enum_members_value" colwidth="100px"/>
+          <colspec colname="enum_members_description" />
+          <tbody>
+END
+	foreach (@choices) {
+		my ($name, $desc, $val) = map { fmt $_ } @$_;
+		print <<END; }
+            <row role="constant">
+              <entry role="enum_member_name">$name</entry>
+              <entry role="enum_member_value">$val</entry>
+              <entry role="enum_member_description">$desc</entry>
+            </row>
+END
+	print <<END;
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </refsect3>
+  </refsect2>
+
+END
+
+	$name = undef;
+	$desc = undef;
+	$choice = undef;
+	$val = undef;
+	@choices = ();
+} else {
+	# Only care about other lines if we're parsing an enum
+	next unless $val;
+	s/\/\*.*\*\///g;
+	die "Unexpected input '$_' while parsing enum" unless /^\s*$/;
+}
+
+END {
+print <<END;
+</refentry>
+END
+}