Merge tag 'debian/1.12.4-1' into cosmic

network-manager Debian release 1.12.4-1

118 files changed, 4533 insertions, 3826 deletions

diff --git a/Makefile.am b/Makefile.am
index b1a2e69e..0b8becd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -749,7 +749,8 @@ EXTRA_DIST += \
 	libnm-core/tests/certs/test2_ca_cert.pem \
 	libnm-core/tests/certs/test2-cert.p12 \
 	libnm-core/tests/certs/test2_key_and_cert.pem \
-	libnm-core/tests/certs/test-aes-key.pem \
+	libnm-core/tests/certs/test-aes-128-key.pem \
+	libnm-core/tests/certs/test-aes-256-key.pem \
 	libnm-core/tests/certs/test_ca_cert.der \
 	libnm-core/tests/certs/test_ca_cert.pem \
 	libnm-core/tests/certs/test-ca-cert.pem \
diff --git a/Makefile.in b/Makefile.in
index 0eac6450..77127448 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3528,7 +3528,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \
 	libnm-core/tests/certs/test2_ca_cert.pem \
 	libnm-core/tests/certs/test2-cert.p12 \
 	libnm-core/tests/certs/test2_key_and_cert.pem \
-	libnm-core/tests/certs/test-aes-key.pem \
+	libnm-core/tests/certs/test-aes-128-key.pem \
+	libnm-core/tests/certs/test-aes-256-key.pem \
 	libnm-core/tests/certs/test_ca_cert.der \
 	libnm-core/tests/certs/test_ca_cert.pem \
 	libnm-core/tests/certs/test-ca-cert.pem \
diff --git a/NEWS b/NEWS
index 283fa05e..ab7e1937 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+===============================================
+NetworkManager-1.12.4
+Overview of changes since NetworkManager-1.12.2
+===============================================
+
+This is a new stable release of NetworkManager.  Notable changes include:
+
+* Fix reapplying different route-metric for automatic routes.
+* Fix crash in connectivity check.
+* Fix accepted input format for vpn.secrets in nmcli's password file.
+* libnm: support private keys encrypted with AES-{192,256}-CBC.
+* Fix stopping pppd on modem hangup
+* Various minor bugfixes and translation updates.
+
 =============================================
 NetworkManager-1.12.2
 Overview of changes since NetworkManager-1.12
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 09c86334..4aea0d5b 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -630,13 +630,13 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets)
 		if (!nm_streq0 (secret->vpn_type, NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT))
 			continue;
 
-		if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "cookie")) {
+		if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "cookie")) {
 			g_free (secret->value);
 			secret->value = g_steal_pointer (&cookie);
-		} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gateway")) {
+		} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "gateway")) {
 			g_free (secret->value);
 			secret->value = g_steal_pointer (&gateway);
-		} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gwcert")) {
+		} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "gwcert")) {
 			g_free (secret->value);
 			secret->value = g_steal_pointer (&gwcert);
 		}
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 1563178d..b547e34c 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -2565,7 +2565,15 @@ parse_passwords (const char *passwd_file, GError **error)
 			return NULL;
 		}
 
-		pwd_spec = g_strdup_printf ("%s.%s", setting, prop);
+		if (   nm_streq (setting, "vpn")
+		    && g_str_has_prefix (prop, "secret.")) {
+			/* in 1.12.0, we wrongly required the VPN secrets to be named
+			 * "vpn.secret". It should be "vpn.secrets". Work around it
+			 * (rh#1628833). */
+			pwd_spec = g_strdup_printf ("vpn.secrets.%s", &prop[NM_STRLEN ("secret.")]);
+		} else
+			pwd_spec = g_strdup_printf ("%s.%s", setting, prop);
+
 		g_hash_table_insert (pwds_hash, pwd_spec, g_strdup (pwd));
 	}
 	return g_steal_pointer (&pwds_hash);
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index aa28678f..be759732 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1470,7 +1470,7 @@ nmc_device_state_to_color (NMDeviceState state)
 	else if (state == NM_DEVICE_STATE_ACTIVATED)
 		return NM_META_COLOR_DEVICE_ACTIVATED;
 
-	g_return_val_if_reached (NM_META_COLOR_DEVICE_UNKNOWN);
+	return NM_META_COLOR_DEVICE_UNKNOWN;
 }
 
 static void
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 0856b51f..3df8c038 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -195,7 +195,7 @@ nm_secret_agent_simple_secret_new (NMSecretAgentSecretType secret_type,
 		real->base.is_secret = (secret_type != NM_SECRET_AGENT_SECRET_TYPE_PROPERTY);
 		break;
 	case NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET:
-		vpn_prefix = NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET;
+		vpn_prefix = NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS;
 		value = nm_setting_vpn_get_secret (NM_SETTING_VPN (setting), property);
 		real->base.entry_id = g_strdup_printf ("%s%s", vpn_prefix, property);
 		nm_assert (vpn_type);
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index 505987df..529aaeac 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/clients/common/nm-secret-agent-simple.h
@@ -56,7 +56,7 @@ typedef struct {
 	gboolean is_secret;
 } NMSecretAgentSimpleSecret;
 
-#define NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "vpn.secret."
+#define NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "vpn.secrets."
 
 #define NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT  NM_DBUS_INTERFACE".openconnect"
 
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index 7ad8c19a..e3f4a68c 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -212,7 +212,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("Array of IP addresses.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 7ad8c19a..e3f4a68c 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -212,7 +212,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("Array of IP addresses.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index 2a954fb8..6f29e13e 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -121,13 +121,13 @@ secrets_requested (NMSecretAgentSimple *agent,
 					continue;
 				if (!nm_streq0 (secret->vpn_type, NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT))
 					continue;
-				if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "cookie")) {
+				if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "cookie")) {
 					g_free (secret->value);
 					secret->value = g_steal_pointer (&cookie);
-				} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gateway")) {
+				} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "gateway")) {
 					g_free (secret->value);
 					secret->value = g_steal_pointer (&gateway);
-				} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gwcert")) {
+				} else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "gwcert")) {
 					g_free (secret->value);
 					secret->value = g_steal_pointer (&gwcert);
 				}
diff --git a/configure b/configure
index 327371af..6e6226bb 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.12.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.12.4.
 #
 # 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.12.2'
-PACKAGE_STRING='NetworkManager 1.12.2'
+PACKAGE_VERSION='1.12.4'
+PACKAGE_STRING='NetworkManager 1.12.4'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1727,7 +1727,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.12.2 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.12.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1797,7 +1797,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.12.2:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.12.4:";;
    esac
   cat <<\_ACEOF
 
@@ -2138,7 +2138,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.12.2
+NetworkManager configure 1.12.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2911,7 +2911,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.12.2, which was
+It was created by NetworkManager $as_me 1.12.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3781,7 +3781,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.12.2'
+ VERSION='1.12.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17965,8 +17965,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=12
-NM_MICRO_VERSION=2
-NM_VERSION=1.12.2
+NM_MICRO_VERSION=4
+NM_VERSION=1.12.4
 
 
 
@@ -17974,7 +17974,7 @@ NM_VERSION=1.12.2
 
 
 
-NM_GIT_SHA=1e74a4b43e571cbdc07c4029129fb30cc5037a50
+NM_GIT_SHA=2e4ca55635ec40164237074c8c137fbe32584ba2
 
 if test """" != "no-config-h" ; then
 
@@ -29275,7 +29275,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.12.2, which was
+This file was extended by NetworkManager $as_me 1.12.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29341,7 +29341,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.12.2
+NetworkManager config.status 1.12.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 60df05cf..c2885d88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl    "shared/nm-version-macros.h.in"
 dnl  - update number in meson.build
 m4_define([nm_major_version], [1])
 m4_define([nm_minor_version], [12])
-m4_define([nm_micro_version], [2])
+m4_define([nm_micro_version], [4])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
diff --git a/debian/changelog b/debian/changelog
index 4bf58f75..a110fb29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,75 @@
+network-manager (1.12.4-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian (LP: #1795704). Remaining changes:
+    - Use systemd-resolved instead of dnsmasq
+    - debian/control:
+      + Depend on isc-dhcp-client instead of recommends
+      + Recommend network-manager-pptp
+      + Suggest avahi-autoipd for IPv4LL support
+    - debian/rules, debian/network-manager.postinst:
+      + Don't restart NetworkManager on upgrade but recommend restarting
+        the computer
+    - debian/rules, debian/network-manager.postinst:
+      + Don't install sysvinit scripts or migrate from sysvinit
+    - debian/network-manager.postinst:
+      + Don't add the netdev group.
+      + drop in an empty override file for NetworkManager to manage all
+        devices for upgrade from any version, as long as there is no
+        netplan configuration yet.
+    - debian/network-manager.maintscript
+      + Remove /etc/dbus-1/system.d/nm-ofono.conf
+    - debian/default-wifi-powersave-on.conf, debian/rules:
+      + Install a config file to enable WiFi powersave
+    - Enable build tests
+    - Add autopkgtests
+    - debian/source_network-manager.py, debian/network-manager.install,
+      debian/network-manager.links: Add apport hook
+    - Add network-manager-config-connectivity-ubuntu package
+    - NetworkManager.conf: disable MAC randomization feature. There is no
+      easy way for desktop users to disable this feature yet. And there are
+      reports that it doesn't work well with some systems.
+    - Update Vcs links to point to Ubuntu branch
+    - Add patches. See patch descriptions for more details:
+      + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
+      + Update-dnsmasq-parameters.patch
+      + Disable-general-with-expect.patch
+      + libnm-Check-self-still-NMManager-or-not.patch
+      + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
+      + Read-system-connections-from-run.patch
+    - debian/tests/urfkill-integration - don't stop/start network manager
+
+ -- Iain Lane <iain.lane@canonical.com>  Wed, 03 Oct 2018 09:27:59 +0100
+
+network-manager (1.12.4-1) unstable; urgency=medium
+
+  * New upstream version 1.12.4
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 23 Sep 2018 10:23:25 +0200
+
+network-manager (1.12.2-3) unstable; urgency=medium
+
+  [ Simon McVittie ]
+  * Apply patch from upstream to fix FTBFS with GLib 2.57 (Closes: #906965)
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 04 Sep 2018 16:07:24 +0200
+
+network-manager (1.12.2-2) unstable; urgency=medium
+
+  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 05 Aug 2018 15:00:41 +0200
+
+network-manager (1.12.2-1) unstable; urgency=medium
+
+  * New upstream version 1.12.2
+    - Robustness fixes to connectivity checking (Closes: #903996)
+  * Rebase patches
+  * Update symbols file for libnm0
+  * Bump Standards-Version to 4.1.5
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Jul 2018 13:35:31 +0200
+
 network-manager (1.12.2-0ubuntu5) cosmic; urgency=medium
 
   * debian/tests/nm: Add the required `gi.require_version()` calls - thanks to
@@ -56,6 +128,89 @@ network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
 
  -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 24 Aug 2018 09:27:39 +0200
 
+network-manager (1.12.0-5) unstable; urgency=medium
+
+  * manager: accept non-null device for VPN activations (Closes: #903109)
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 12 Jul 2018 13:24:13 +0200
+
+network-manager (1.12.0-4) unstable; urgency=medium
+
+  * Add Conflicts to network-manager-dev against deprecated libraries.
+    The deprecated libnm-glib-dev, libnm-glib-vpn-dev and libnm-util-dev
+    require header files from network-manager-dev which are no longer
+    provided in newer versions. Add Conflicts to network-manager-dev to
+    ensure that we don't get a broken combination of installed packages.
+    (Closes: #903029)
+  * Update description of network-manager-dev
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Jul 2018 13:48:51 +0200
+
+network-manager (1.12.0-3) unstable; urgency=medium
+
+  * Increase timeout in test-nm-client to 30s.
+    On slow architectures it can take longer then 3s for the test service to
+    start up.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Jul 2018 03:58:53 +0200
+
+network-manager (1.12.0-2) unstable; urgency=medium
+
+  * Upload to unstable
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 03 Jul 2018 23:55:36 +0200
+
+network-manager (1.12.0-1) experimental; urgency=medium
+
+  * New upstream version 1.12.0
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 01 Jul 2018 21:14:07 +0200
+
+network-manager (1.11.90-2) experimental; urgency=medium
+
+  * Drop libnl3 build dependency.
+    Upstream has copied the code directly from libnl3 for the few functions it
+    needs with a few small modifications.
+  * Drop libiw build dependency.
+    Hasn't been needed for a long time and was simply a left over from older
+    releases.
+  * Cherry-pick upstream fixes to make test suite pass on slower buildds
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 18 Jun 2018 14:15:40 +0200
+
+network-manager (1.11.90-1) experimental; urgency=medium
+
+  * New upstream version 1.11.90 (1.12 rc1)
+  * Rebase patches
+  * Update symbols file for libnm0
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Jun 2018 15:43:10 +0200
+
+network-manager (1.11.4-1) experimental; urgency=medium
+
+  * New upstream version 1.11.4
+  * Update install path for plugins, it now includes a version number
+  * Update symbols file for libnm0
+  * Make sure the example server.conf is actually installed
+  * Rebase patches
+  * Drop dh_strip override, the dbgsym migration is done
+  * Enable iwd support
+  * Drop version requirements when oldstable ships a newer version
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 11 Jun 2018 13:28:39 +0200
+
+network-manager (1.11.3-1) experimental; urgency=medium
+
+  * New upstream version 1.11.3
+  * Rebase patches
+  * Update symbols file for libnm0
+  * Drop inetutils-arputils Suggests.
+    The ACD functionality of NetworkManager is no longer using arping, so
+    the Suggests is no longer useful.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 23 Apr 2018 23:35:35 +0200
+
 network-manager (1.10.8-1ubuntu4) cosmic; urgency=medium
 
   * debian/10-globally-managed-devices.conf: adjust exception for wwan to
diff --git a/debian/control b/debian/control
index 8c56baea..7f83ff9e 100644
--- a/debian/control
+++ b/debian/control
@@ -95,9 +95,13 @@ Section: devel
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends}
+Conflicts: libnm-glib-dev,
+           libnm-glib-vpn-dev,
+           libnm-util-dev,
 Description: network management framework (development files)
- This package provides general header and development files and documentation
- of configuration formats, command line utilities and the D-Bus API.
+ This package provides documentation of the NetworkManager D-Bus API, the
+ configuration formats and command line utilities.
+ It also provides D-Bus introspection files.
 
 Package: libnm-glib4
 Section: libs
diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
index 51d0a0b2..b8a4c486 100644
--- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
+++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -10,10 +10,10 @@ to be autostarted by a client request.
  2 files changed, 6 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index b1a2e69..b168008 100644
+index 0b8becd..1803e1a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -3894,11 +3894,6 @@ endif
+@@ -3895,11 +3895,6 @@ endif
  data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
  	$(AM_V_GEN) $(data_edit) $< >$@
  
diff --git a/debian/patches/Fix-arping-path.patch b/debian/patches/Fix-arping-path.patch
deleted file mode 100644
index f56e3d8f..00000000
--- a/debian/patches/Fix-arping-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Mon, 27 Oct 2014 11:08:02 +0100
-Subject: Fix arping path
-
-Debian provides two arping implementations:
-/usr/sbin/arping, shipped by the arping package,
-/usr/bin/arping, shipped by the iputils-arping package.
-
-They aren't completely command line compatible, so we choose the one
-which upstream (Fedora) is using, i.e. iputils-arping.
-
-Closes: #755039
----
- src/devices/nm-arping-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c
-index 51f80e0..3564acc 100644
---- a/src/devices/nm-arping-manager.c
-+++ b/src/devices/nm-arping-manager.c
-@@ -223,7 +223,7 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er
- 
- 	priv->completed = 0;
- 
--	argv[0] = nm_utils_find_helper ("arping", NULL, NULL);
-+	argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL);
- 	if (!argv[0]) {
- 		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
- 		                     "arping could not be found");
-@@ -343,7 +343,7 @@ send_announcements (NMArpingManager *self, const char *mode_arg)
- 		return;
- 	}
- 
--	argv[0] = nm_utils_find_helper ("arping", NULL, NULL);
-+	argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL);
- 	if (!argv[0]) {
- 		_LOGW ("arping could not be found; no ARPs will be sent");
- 		return;
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 094c39be..022154c6 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 115 insertions(+)
 
 diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 289dcf8..1b657fe 100644
+index ad90616..d5f0f95 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -62,6 +62,8 @@
@@ -73,7 +73,7 @@ index 289dcf8..1b657fe 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -5872,6 +5902,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -5884,6 +5914,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index 289dcf8..1b657fe 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6022,6 +6108,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6034,6 +6120,9 @@ nm_manager_start (NMManager *self, GError **error)
  	nm_clear_g_source (&priv->devices_inited_id);
  	priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -146,7 +146,7 @@ index 289dcf8..1b657fe 100644
  	return TRUE;
  }
  
-@@ -6885,6 +6974,22 @@ nm_manager_init (NMManager *self)
+@@ -6897,6 +6986,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index 289dcf8..1b657fe 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7160,6 +7265,16 @@ dispose (GObject *object)
+@@ -7172,6 +7277,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/series b/debian/patches/series
index 7639a789..7e32455e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,3 @@ Disable-general-with-expect.patch
 libnm-Check-self-still-NMManager-or-not.patch
 #dns-manager-don-t-merge-split-DNS-search-domains.patch
 Read-system-connections-from-run.patch
-git-newglib-test.patch
-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch
-utils-test-don-t-assert-on-debug-level-messages.patch
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 5f6e5de4..31ca018a 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 <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">
-      for NetworkManager 1.12.2
+      for NetworkManager 1.12.4
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/NetworkManager/stable/" target="_top">https://developer.gnome.org/NetworkManager/stable/</a>.
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 9350e0fe..dc37b58b 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -26,1481 +26,1481 @@
 <div class="indexdiv">
 <h3>Symbols</h3>
 <dl>
-<dt id="ientry-idm45708555471888">org.freedesktop.NetworkManager.AccessPoint, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-interface-org-freedesktop-NetworkManager-AccessPoint.top_of_page">org.freedesktop.NetworkManager.AccessPoint</a>
+<dt id="ientry-idm45741761993456">org.freedesktop.NetworkManager.AccessPoint, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-interface-org-freedesktop-NetworkManager-AccessPoint.top_of_page">org.freedesktop.NetworkManager.AccessPoint</a>
 </dt>
-<dt id="ientry-idm45708564890192">org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-signal-org-freedesktop-NetworkManager-AccessPoint.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752078864">org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-signal-org-freedesktop-NetworkManager-AccessPoint.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556505056">org.freedesktop.NetworkManager.AccessPoint:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Flags">The "Flags" property</a>
+<dt id="ientry-idm45741752410976">org.freedesktop.NetworkManager.AccessPoint:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Flags">The "Flags" property</a>
 </dt>
-<dt id="ientry-idm45708559892688">org.freedesktop.NetworkManager.AccessPoint:Frequency, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Frequency">The "Frequency" property</a>
+<dt id="ientry-idm45741752336128">org.freedesktop.NetworkManager.AccessPoint:Frequency, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Frequency">The "Frequency" property</a>
 </dt>
-<dt id="ientry-idm45708556508656">org.freedesktop.NetworkManager.AccessPoint:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741752332032">org.freedesktop.NetworkManager.AccessPoint:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708555557456">org.freedesktop.NetworkManager.AccessPoint:LastSeen, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.LastSeen">The "LastSeen" property</a>
+<dt id="ientry-idm45741752358560">org.freedesktop.NetworkManager.AccessPoint:LastSeen, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.LastSeen">The "LastSeen" property</a>
 </dt>
-<dt id="ientry-idm45708559844560">org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.MaxBitrate">The "MaxBitrate" property</a>
+<dt id="ientry-idm45741751901200">org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.MaxBitrate">The "MaxBitrate" property</a>
 </dt>
-<dt id="ientry-idm45708555393904">org.freedesktop.NetworkManager.AccessPoint:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Mode">The "Mode" property</a>
+<dt id="ientry-idm45741751942672">org.freedesktop.NetworkManager.AccessPoint:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Mode">The "Mode" property</a>
 </dt>
-<dt id="ientry-idm45708556021232">org.freedesktop.NetworkManager.AccessPoint:RsnFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.RsnFlags">The "RsnFlags" property</a>
+<dt id="ientry-idm45741752862400">org.freedesktop.NetworkManager.AccessPoint:RsnFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.RsnFlags">The "RsnFlags" property</a>
 </dt>
-<dt id="ientry-idm45708556032736">org.freedesktop.NetworkManager.AccessPoint:Ssid, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Ssid">The "Ssid" property</a>
+<dt id="ientry-idm45741752340288">org.freedesktop.NetworkManager.AccessPoint:Ssid, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Ssid">The "Ssid" property</a>
 </dt>
-<dt id="ientry-idm45708555442432">org.freedesktop.NetworkManager.AccessPoint:Strength, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Strength">The "Strength" property</a>
+<dt id="ientry-idm45741752362768">org.freedesktop.NetworkManager.AccessPoint:Strength, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Strength">The "Strength" property</a>
 </dt>
-<dt id="ientry-idm45708556537152">org.freedesktop.NetworkManager.AccessPoint:WpaFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.WpaFlags">The "WpaFlags" property</a>
+<dt id="ientry-idm45741752397616">org.freedesktop.NetworkManager.AccessPoint:WpaFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.WpaFlags">The "WpaFlags" property</a>
 </dt>
-<dt id="ientry-idm45708558841232">org.freedesktop.NetworkManager.AgentManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-interface-org-freedesktop-NetworkManager-AgentManager.top_of_page">org.freedesktop.NetworkManager.AgentManager</a>
+<dt id="ientry-idm45741759581440">org.freedesktop.NetworkManager.AgentManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-interface-org-freedesktop-NetworkManager-AgentManager.top_of_page">org.freedesktop.NetworkManager.AgentManager</a>
 </dt>
-<dt id="ientry-idm45708565675120">org.freedesktop.NetworkManager.AgentManager.Register(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register">The Register() method</a>
+<dt id="ientry-idm45741762493232">org.freedesktop.NetworkManager.AgentManager.Register(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-method-org-freedesktop-NetworkManager-AgentManager.Register">The Register() method</a>
 </dt>
-<dt id="ientry-idm45708564121376">org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities">The RegisterWithCapabilities() method</a>
+<dt id="ientry-idm45741758218688">org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-method-org-freedesktop-NetworkManager-AgentManager.RegisterWithCapabilities">The RegisterWithCapabilities() method</a>
 </dt>
-<dt id="ientry-idm45708564896480">org.freedesktop.NetworkManager.AgentManager.Unregister(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister">The Unregister() method</a>
+<dt id="ientry-idm45741763375104">org.freedesktop.NetworkManager.AgentManager.Unregister(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.AgentManager.html#gdbus-method-org-freedesktop-NetworkManager-AgentManager.Unregister">The Unregister() method</a>
 </dt>
-<dt id="ientry-idm45708562604560">org.freedesktop.NetworkManager.Device, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-interface-org-freedesktop-NetworkManager-Device.top_of_page">org.freedesktop.NetworkManager.Device</a>
+<dt id="ientry-idm45741754444976">org.freedesktop.NetworkManager.Device, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-interface-org-freedesktop-NetworkManager-Device.top_of_page">org.freedesktop.NetworkManager.Device</a>
 </dt>
-<dt id="ientry-idm45708561916992">org.freedesktop.NetworkManager.Device.Adsl, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Adsl.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Adsl.top_of_page">org.freedesktop.NetworkManager.Device.Adsl</a>
+<dt id="ientry-idm45741761688352">org.freedesktop.NetworkManager.Device.Adsl, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Adsl.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Adsl.top_of_page">org.freedesktop.NetworkManager.Device.Adsl</a>
 </dt>
-<dt id="ientry-idm45708565990208">org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Adsl.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Adsl.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741763049664">org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Adsl.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Adsl.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708562081072">org.freedesktop.NetworkManager.Device.Adsl:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Adsl.html#gdbus-property-org-freedesktop-NetworkManager-Device-Adsl.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741755317168">org.freedesktop.NetworkManager.Device.Adsl:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Adsl.html#gdbus-property-org-freedesktop-NetworkManager-Device-Adsl.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708566939616">org.freedesktop.NetworkManager.Device.Bluetooth, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Bluetooth.top_of_page">org.freedesktop.NetworkManager.Device.Bluetooth</a>
+<dt id="ientry-idm45741763387136">org.freedesktop.NetworkManager.Device.Bluetooth, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Bluetooth.top_of_page">org.freedesktop.NetworkManager.Device.Bluetooth</a>
 </dt>
-<dt id="ientry-idm45708559971280">org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Bluetooth.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755331664">org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Bluetooth.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708559906768">org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.BtCapabilities">The "BtCapabilities" property</a>
+<dt id="ientry-idm45741754498640">org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.BtCapabilities">The "BtCapabilities" property</a>
 </dt>
-<dt id="ientry-idm45708558291360">org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741753295808">org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708558287552">org.freedesktop.NetworkManager.Device.Bluetooth:Name, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.Name">The "Name" property</a>
+<dt id="ientry-idm45741753291904">org.freedesktop.NetworkManager.Device.Bluetooth:Name, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bluetooth.Name">The "Name" property</a>
 </dt>
-<dt id="ientry-idm45708564850656">org.freedesktop.NetworkManager.Device.Bond, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Bond.top_of_page">org.freedesktop.NetworkManager.Device.Bond</a>
+<dt id="ientry-idm45741758675296">org.freedesktop.NetworkManager.Device.Bond, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Bond.top_of_page">org.freedesktop.NetworkManager.Device.Bond</a>
 </dt>
-<dt id="ientry-idm45708558416336">org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Bond.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741757812464">org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Bond.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708567065216">org.freedesktop.NetworkManager.Device.Bond:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741753286096">org.freedesktop.NetworkManager.Device.Bond:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708565785552">org.freedesktop.NetworkManager.Device.Bond:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bond.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741753289936">org.freedesktop.NetworkManager.Device.Bond:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bond.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708558295136">org.freedesktop.NetworkManager.Device.Bond:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Slaves">The "Slaves" property</a>
+<dt id="ientry-idm45741754504672">org.freedesktop.NetworkManager.Device.Bond:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bond.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bond.Slaves">The "Slaves" property</a>
 </dt>
-<dt id="ientry-idm45708562544544">org.freedesktop.NetworkManager.Device.Bridge, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Bridge.top_of_page">org.freedesktop.NetworkManager.Device.Bridge</a>
+<dt id="ientry-idm45741762926560">org.freedesktop.NetworkManager.Device.Bridge, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Bridge.top_of_page">org.freedesktop.NetworkManager.Device.Bridge</a>
 </dt>
-<dt id="ientry-idm45708565546576">org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Bridge.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741757279888">org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Bridge.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708558360320">org.freedesktop.NetworkManager.Device.Bridge:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741758891616">org.freedesktop.NetworkManager.Device.Bridge:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708558364128">org.freedesktop.NetworkManager.Device.Bridge:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741756822240">org.freedesktop.NetworkManager.Device.Bridge:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708558356320">org.freedesktop.NetworkManager.Device.Bridge:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Slaves">The "Slaves" property</a>
+<dt id="ientry-idm45741759242560">org.freedesktop.NetworkManager.Device.Bridge:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Bridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-Bridge.Slaves">The "Slaves" property</a>
 </dt>
-<dt id="ientry-idm45708561092208">org.freedesktop.NetworkManager.Device.Delete(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.Delete">The Delete() method</a>
+<dt id="ientry-idm45741755391232">org.freedesktop.NetworkManager.Device.Delete(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.Delete">The Delete() method</a>
 </dt>
-<dt id="ientry-idm45708558522880">org.freedesktop.NetworkManager.Device.Disconnect(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect">The Disconnect() method</a>
+<dt id="ientry-idm45741754585600">org.freedesktop.NetworkManager.Device.Disconnect(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.Disconnect">The Disconnect() method</a>
 </dt>
-<dt id="ientry-idm45708563428304">org.freedesktop.NetworkManager.Device.Dummy, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Dummy.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Dummy.top_of_page">org.freedesktop.NetworkManager.Device.Dummy</a>
+<dt id="ientry-idm45741761667600">org.freedesktop.NetworkManager.Device.Dummy, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Dummy.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Dummy.top_of_page">org.freedesktop.NetworkManager.Device.Dummy</a>
 </dt>
-<dt id="ientry-idm45708565437200">org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Dummy.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Dummy.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741754576464">org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Dummy.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Dummy.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708566606688">org.freedesktop.NetworkManager.Device.Dummy:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Dummy.html#gdbus-property-org-freedesktop-NetworkManager-Device-Dummy.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741754982768">org.freedesktop.NetworkManager.Device.Dummy:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Dummy.html#gdbus-property-org-freedesktop-NetworkManager-Device-Dummy.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708567208608">org.freedesktop.NetworkManager.Device.Generic, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Generic.top_of_page">org.freedesktop.NetworkManager.Device.Generic</a>
+<dt id="ientry-idm45741760256352">org.freedesktop.NetworkManager.Device.Generic, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Generic.top_of_page">org.freedesktop.NetworkManager.Device.Generic</a>
 </dt>
-<dt id="ientry-idm45708559208032">org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Generic.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741751424912">org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Generic.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708559788816">org.freedesktop.NetworkManager.Device.Generic:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-property-org-freedesktop-NetworkManager-Device-Generic.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741755296896">org.freedesktop.NetworkManager.Device.Generic:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-property-org-freedesktop-NetworkManager-Device-Generic.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708559784816">org.freedesktop.NetworkManager.Device.Generic:TypeDescription, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-property-org-freedesktop-NetworkManager-Device-Generic.TypeDescription">The "TypeDescription" property</a>
+<dt id="ientry-idm45741751440880">org.freedesktop.NetworkManager.Device.Generic:TypeDescription, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Generic.html#gdbus-property-org-freedesktop-NetworkManager-Device-Generic.TypeDescription">The "TypeDescription" property</a>
 </dt>
-<dt id="ientry-idm45708558535776">org.freedesktop.NetworkManager.Device.GetAppliedConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection">The GetAppliedConnection() method</a>
+<dt id="ientry-idm45741754598496">org.freedesktop.NetworkManager.Device.GetAppliedConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.GetAppliedConnection">The GetAppliedConnection() method</a>
 </dt>
-<dt id="ientry-idm45708567388736">org.freedesktop.NetworkManager.Device.Infiniband, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Infiniband.top_of_page">org.freedesktop.NetworkManager.Device.Infiniband</a>
+<dt id="ientry-idm45741761862144">org.freedesktop.NetworkManager.Device.Infiniband, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Infiniband.top_of_page">org.freedesktop.NetworkManager.Device.Infiniband</a>
 </dt>
-<dt id="ientry-idm45708566122480">org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Infiniband.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741763020592">org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Infiniband.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708561107632">org.freedesktop.NetworkManager.Device.Infiniband:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741754335888">org.freedesktop.NetworkManager.Device.Infiniband:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708564018592">org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741754975056">org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html#gdbus-property-org-freedesktop-NetworkManager-Device-Infiniband.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708564016528">org.freedesktop.NetworkManager.Device.IPTunnel, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-interface-org-freedesktop-NetworkManager-Device-IPTunnel.top_of_page">org.freedesktop.NetworkManager.Device.IPTunnel</a>
+<dt id="ientry-idm45741761613616">org.freedesktop.NetworkManager.Device.IPTunnel, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-interface-org-freedesktop-NetworkManager-Device-IPTunnel.top_of_page">org.freedesktop.NetworkManager.Device.IPTunnel</a>
 </dt>
-<dt id="ientry-idm45708559248752">org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-signal-org-freedesktop-NetworkManager-Device-IPTunnel.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741754366880">org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-signal-org-freedesktop-NetworkManager-Device-IPTunnel.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708566086560">org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.EncapsulationLimit">The "EncapsulationLimit" property</a>
+<dt id="ientry-idm45741752944416">org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.EncapsulationLimit">The "EncapsulationLimit" property</a>
 </dt>
-<dt id="ientry-idm45708558547856">org.freedesktop.NetworkManager.Device.IPTunnel:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Flags">The "Flags" property</a>
+<dt id="ientry-idm45741752935664">org.freedesktop.NetworkManager.Device.IPTunnel:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Flags">The "Flags" property</a>
 </dt>
-<dt id="ientry-idm45708558552208">org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.FlowLabel">The "FlowLabel" property</a>
+<dt id="ientry-idm45741752940016">org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.FlowLabel">The "FlowLabel" property</a>
 </dt>
-<dt id="ientry-idm45708559947424">org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.InputKey">The "InputKey" property</a>
+<dt id="ientry-idm45741755465504">org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.InputKey">The "InputKey" property</a>
 </dt>
-<dt id="ientry-idm45708559931216">org.freedesktop.NetworkManager.Device.IPTunnel:Local, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Local">The "Local" property</a>
+<dt id="ientry-idm45741755115808">org.freedesktop.NetworkManager.Device.IPTunnel:Local, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Local">The "Local" property</a>
 </dt>
-<dt id="ientry-idm45708559769456">org.freedesktop.NetworkManager.Device.IPTunnel:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Mode">The "Mode" property</a>
+<dt id="ientry-idm45741754932816">org.freedesktop.NetworkManager.Device.IPTunnel:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Mode">The "Mode" property</a>
 </dt>
-<dt id="ientry-idm45708566090768">org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.OutputKey">The "OutputKey" property</a>
+<dt id="ientry-idm45741752948704">org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.OutputKey">The "OutputKey" property</a>
 </dt>
-<dt id="ientry-idm45708559935296">org.freedesktop.NetworkManager.Device.IPTunnel:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Parent">The "Parent" property</a>
+<dt id="ientry-idm45741755119920">org.freedesktop.NetworkManager.Device.IPTunnel:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Parent">The "Parent" property</a>
 </dt>
-<dt id="ientry-idm45708559185840">org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.PathMtuDiscovery">The "PathMtuDiscovery" property</a>
+<dt id="ientry-idm45741755469808">org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.PathMtuDiscovery">The "PathMtuDiscovery" property</a>
 </dt>
-<dt id="ientry-idm45708559778848">org.freedesktop.NetworkManager.Device.IPTunnel:Remote, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Remote">The "Remote" property</a>
+<dt id="ientry-idm45741755111696">org.freedesktop.NetworkManager.Device.IPTunnel:Remote, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Remote">The "Remote" property</a>
 </dt>
-<dt id="ientry-idm45708559190032">org.freedesktop.NetworkManager.Device.IPTunnel:Tos, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Tos">The "Tos" property</a>
+<dt id="ientry-idm45741755474000">org.freedesktop.NetworkManager.Device.IPTunnel:Tos, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Tos">The "Tos" property</a>
 </dt>
-<dt id="ientry-idm45708559750752">org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Ttl">The "Ttl" property</a>
+<dt id="ientry-idm45741755478240">org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html#gdbus-property-org-freedesktop-NetworkManager-Device-IPTunnel.Ttl">The "Ttl" property</a>
 </dt>
-<dt id="ientry-idm45708566853568">org.freedesktop.NetworkManager.Device.Macsec, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Macsec.top_of_page">org.freedesktop.NetworkManager.Device.Macsec</a>
+<dt id="ientry-idm45741754970304">org.freedesktop.NetworkManager.Device.Macsec, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Macsec.top_of_page">org.freedesktop.NetworkManager.Device.Macsec</a>
 </dt>
-<dt id="ientry-idm45708559923040">org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Macsec.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741754930704">org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Macsec.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708559805488">org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.CipherSuite">The "CipherSuite" property</a>
+<dt id="ientry-idm45741763080624">org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.CipherSuite">The "CipherSuite" property</a>
 </dt>
-<dt id="ientry-idm45708556079136">org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.EncodingSa">The "EncodingSa" property</a>
+<dt id="ientry-idm45741755415792">org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.EncodingSa">The "EncodingSa" property</a>
 </dt>
-<dt id="ientry-idm45708556070624">org.freedesktop.NetworkManager.Device.Macsec:Encrypt, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Encrypt">The "Encrypt" property</a>
+<dt id="ientry-idm45741751459968">org.freedesktop.NetworkManager.Device.Macsec:Encrypt, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Encrypt">The "Encrypt" property</a>
 </dt>
-<dt id="ientry-idm45708556057984">org.freedesktop.NetworkManager.Device.Macsec:Es, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Es">The "Es" property</a>
+<dt id="ientry-idm45741755478624">org.freedesktop.NetworkManager.Device.Macsec:Es, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Es">The "Es" property</a>
 </dt>
-<dt id="ientry-idm45708559809552">org.freedesktop.NetworkManager.Device.Macsec:IcvLength, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.IcvLength">The "IcvLength" property</a>
+<dt id="ientry-idm45741754506096">org.freedesktop.NetworkManager.Device.Macsec:IcvLength, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.IcvLength">The "IcvLength" property</a>
 </dt>
-<dt id="ientry-idm45708556062224">org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.IncludeSci">The "IncludeSci" property</a>
+<dt id="ientry-idm45741755482864">org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.IncludeSci">The "IncludeSci" property</a>
 </dt>
-<dt id="ientry-idm45708566095728">org.freedesktop.NetworkManager.Device.Macsec:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Parent">The "Parent" property</a>
+<dt id="ientry-idm45741754992928">org.freedesktop.NetworkManager.Device.Macsec:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Parent">The "Parent" property</a>
 </dt>
-<dt id="ientry-idm45708556066432">org.freedesktop.NetworkManager.Device.Macsec:Protect, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Protect">The "Protect" property</a>
+<dt id="ientry-idm45741754433568">org.freedesktop.NetworkManager.Device.Macsec:Protect, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Protect">The "Protect" property</a>
 </dt>
-<dt id="ientry-idm45708556049456">org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.ReplayProtect">The "ReplayProtect" property</a>
+<dt id="ientry-idm45741754915392">org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.ReplayProtect">The "ReplayProtect" property</a>
 </dt>
-<dt id="ientry-idm45708556053760">org.freedesktop.NetworkManager.Device.Macsec:Scb, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Scb">The "Scb" property</a>
+<dt id="ientry-idm45741755436848">org.freedesktop.NetworkManager.Device.Macsec:Scb, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Scb">The "Scb" property</a>
 </dt>
-<dt id="ientry-idm45708559813632">org.freedesktop.NetworkManager.Device.Macsec:Sci, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Sci">The "Sci" property</a>
+<dt id="ientry-idm45741754510224">org.freedesktop.NetworkManager.Device.Macsec:Sci, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Sci">The "Sci" property</a>
 </dt>
-<dt id="ientry-idm45708556074864">org.freedesktop.NetworkManager.Device.Macsec:Validation, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Validation">The "Validation" property</a>
+<dt id="ientry-idm45741751464208">org.freedesktop.NetworkManager.Device.Macsec:Validation, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Validation">The "Validation" property</a>
 </dt>
-<dt id="ientry-idm45708556083264">org.freedesktop.NetworkManager.Device.Macsec:Window, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Window">The "Window" property</a>
+<dt id="ientry-idm45741755307888">org.freedesktop.NetworkManager.Device.Macsec:Window, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macsec.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macsec.Window">The "Window" property</a>
 </dt>
-<dt id="ientry-idm45708563278256">org.freedesktop.NetworkManager.Device.Macvlan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Macvlan.top_of_page">org.freedesktop.NetworkManager.Device.Macvlan</a>
+<dt id="ientry-idm45741760781856">org.freedesktop.NetworkManager.Device.Macvlan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Macvlan.top_of_page">org.freedesktop.NetworkManager.Device.Macvlan</a>
 </dt>
-<dt id="ientry-idm45708562180928">org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Macvlan.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755427856">org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Macvlan.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708567350544">org.freedesktop.NetworkManager.Device.Macvlan:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Mode">The "Mode" property</a>
+<dt id="ientry-idm45741755245184">org.freedesktop.NetworkManager.Device.Macvlan:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Mode">The "Mode" property</a>
 </dt>
-<dt id="ientry-idm45708556928016">org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.NoPromisc">The "NoPromisc" property</a>
+<dt id="ientry-idm45741755241248">org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.NoPromisc">The "NoPromisc" property</a>
 </dt>
-<dt id="ientry-idm45708567375696">org.freedesktop.NetworkManager.Device.Macvlan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Parent">The "Parent" property</a>
+<dt id="ientry-idm45741755249056">org.freedesktop.NetworkManager.Device.Macvlan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Parent">The "Parent" property</a>
 </dt>
-<dt id="ientry-idm45708566922752">org.freedesktop.NetworkManager.Device.Macvlan:Tap, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Tap">The "Tap" property</a>
+<dt id="ientry-idm45741755237344">org.freedesktop.NetworkManager.Device.Macvlan:Tap, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Macvlan.Tap">The "Tap" property</a>
 </dt>
-<dt id="ientry-idm45708566186368">org.freedesktop.NetworkManager.Device.Modem, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Modem.top_of_page">org.freedesktop.NetworkManager.Device.Modem</a>
+<dt id="ientry-idm45741756977200">org.freedesktop.NetworkManager.Device.Modem, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Modem.top_of_page">org.freedesktop.NetworkManager.Device.Modem</a>
 </dt>
-<dt id="ientry-idm45708559194864">org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Modem.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741762623088">org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Modem.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556910000">org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.CurrentCapabilities">The "CurrentCapabilities" property</a>
+<dt id="ientry-idm45741755450032">org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.CurrentCapabilities">The "CurrentCapabilities" property</a>
 </dt>
-<dt id="ientry-idm45708556914944">org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.ModemCapabilities">The "ModemCapabilities" property</a>
+<dt id="ientry-idm45741754524688">org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.ModemCapabilities">The "ModemCapabilities" property</a>
 </dt>
-<dt id="ientry-idm45708564219360">org.freedesktop.NetworkManager.Device.OlpcMesh, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OlpcMesh.top_of_page">org.freedesktop.NetworkManager.Device.OlpcMesh</a>
+<dt id="ientry-idm45741759477360">org.freedesktop.NetworkManager.Device.OlpcMesh, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OlpcMesh.top_of_page">org.freedesktop.NetworkManager.Device.OlpcMesh</a>
 </dt>
-<dt id="ientry-idm45708566020128">org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OlpcMesh.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755261776">org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OlpcMesh.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708559861920">org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.ActiveChannel">The "ActiveChannel" property</a>
+<dt id="ientry-idm45741751482128">org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.ActiveChannel">The "ActiveChannel" property</a>
 </dt>
-<dt id="ientry-idm45708559877280">org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.Companion">The "Companion" property</a>
+<dt id="ientry-idm45741755201328">org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.Companion">The "Companion" property</a>
 </dt>
-<dt id="ientry-idm45708559881152">org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741755205104">org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html#gdbus-property-org-freedesktop-NetworkManager-Device-OlpcMesh.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708558151472">org.freedesktop.NetworkManager.Device.OvsBridge, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OvsBridge.top_of_page">org.freedesktop.NetworkManager.Device.OvsBridge</a>
+<dt id="ientry-idm45741759435040">org.freedesktop.NetworkManager.Device.OvsBridge, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OvsBridge.top_of_page">org.freedesktop.NetworkManager.Device.OvsBridge</a>
 </dt>
-<dt id="ientry-idm45708555845808">org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OvsBridge.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741751472832">org.freedesktop.NetworkManager.Device.OvsBridge::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OvsBridge.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708566076608">org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-OvsBridge.Slaves">The "Slaves" property</a>
+<dt id="ientry-idm45741755190416">org.freedesktop.NetworkManager.Device.OvsBridge:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html#gdbus-property-org-freedesktop-NetworkManager-Device-OvsBridge.Slaves">The "Slaves" property</a>
 </dt>
-<dt id="ientry-idm45708563671536">org.freedesktop.NetworkManager.Device.OvsInterface, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OvsInterface.top_of_page">org.freedesktop.NetworkManager.Device.OvsInterface</a>
+<dt id="ientry-idm45741756862176">org.freedesktop.NetworkManager.Device.OvsInterface, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OvsInterface.top_of_page">org.freedesktop.NetworkManager.Device.OvsInterface</a>
 </dt>
-<dt id="ientry-idm45708555576832">org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OvsInterface.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755179904">org.freedesktop.NetworkManager.Device.OvsInterface::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OvsInterface.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708563946992">org.freedesktop.NetworkManager.Device.OvsPort, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OvsPort.top_of_page">org.freedesktop.NetworkManager.Device.OvsPort</a>
+<dt id="ientry-idm45741763476992">org.freedesktop.NetworkManager.Device.OvsPort, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html#gdbus-interface-org-freedesktop-NetworkManager-Device-OvsPort.top_of_page">org.freedesktop.NetworkManager.Device.OvsPort</a>
 </dt>
-<dt id="ientry-idm45708566063584">org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OvsPort.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755550272">org.freedesktop.NetworkManager.Device.OvsPort::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html#gdbus-signal-org-freedesktop-NetworkManager-Device-OvsPort.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708555533312">org.freedesktop.NetworkManager.Device.OvsPort:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html#gdbus-property-org-freedesktop-NetworkManager-Device-OvsPort.Slaves">The "Slaves" property</a>
+<dt id="ientry-idm45741755587760">org.freedesktop.NetworkManager.Device.OvsPort:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html#gdbus-property-org-freedesktop-NetworkManager-Device-OvsPort.Slaves">The "Slaves" property</a>
 </dt>
-<dt id="ientry-idm45708565962272">org.freedesktop.NetworkManager.Device.Ppp, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Ppp.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Ppp.top_of_page">org.freedesktop.NetworkManager.Device.Ppp</a>
+<dt id="ientry-idm45741758668176">org.freedesktop.NetworkManager.Device.Ppp, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Ppp.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Ppp.top_of_page">org.freedesktop.NetworkManager.Device.Ppp</a>
 </dt>
-<dt id="ientry-idm45708559869728">org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Ppp.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Ppp.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755530256">org.freedesktop.NetworkManager.Device.Ppp::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Ppp.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Ppp.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708558393456">org.freedesktop.NetworkManager.Device.Reapply(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.Reapply">The Reapply() method</a>
+<dt id="ientry-idm45741763065888">org.freedesktop.NetworkManager.Device.Reapply(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-method-org-freedesktop-NetworkManager-Device.Reapply">The Reapply() method</a>
 </dt>
-<dt id="ientry-idm45708562732432">org.freedesktop.NetworkManager.Device.Statistics, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Statistics.top_of_page">org.freedesktop.NetworkManager.Device.Statistics</a>
+<dt id="ientry-idm45741757050400">org.freedesktop.NetworkManager.Device.Statistics, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Statistics.top_of_page">org.freedesktop.NetworkManager.Device.Statistics</a>
 </dt>
-<dt id="ientry-idm45708558431376">org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Statistics.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755032320">org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Statistics.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708558472528">org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RefreshRateMs">The "RefreshRateMs" property</a>
+<dt id="ientry-idm45741761842800">org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RefreshRateMs">The "RefreshRateMs" property</a>
 </dt>
-<dt id="ientry-idm45708564612688">org.freedesktop.NetworkManager.Device.Statistics:RxBytes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RxBytes">The "RxBytes" property</a>
+<dt id="ientry-idm45741757236640">org.freedesktop.NetworkManager.Device.Statistics:RxBytes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.RxBytes">The "RxBytes" property</a>
 </dt>
-<dt id="ientry-idm45708561900400">org.freedesktop.NetworkManager.Device.Statistics:TxBytes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.TxBytes">The "TxBytes" property</a>
+<dt id="ientry-idm45741760545488">org.freedesktop.NetworkManager.Device.Statistics:TxBytes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Statistics.html#gdbus-property-org-freedesktop-NetworkManager-Device-Statistics.TxBytes">The "TxBytes" property</a>
 </dt>
-<dt id="ientry-idm45708562096016">org.freedesktop.NetworkManager.Device.Team, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Team.top_of_page">org.freedesktop.NetworkManager.Device.Team</a>
+<dt id="ientry-idm45741757119680">org.freedesktop.NetworkManager.Device.Team, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Team.top_of_page">org.freedesktop.NetworkManager.Device.Team</a>
 </dt>
-<dt id="ientry-idm45708559855920">org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Team.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752435216">org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Team.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708555342128">org.freedesktop.NetworkManager.Device.Team:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741755578592">org.freedesktop.NetworkManager.Device.Team:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708555492016">org.freedesktop.NetworkManager.Device.Team:Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.Config">The "Config" property</a>
+<dt id="ientry-idm45741752917024">org.freedesktop.NetworkManager.Device.Team:Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.Config">The "Config" property</a>
 </dt>
-<dt id="ientry-idm45708555345968">org.freedesktop.NetworkManager.Device.Team:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741755582672">org.freedesktop.NetworkManager.Device.Team:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708555496256">org.freedesktop.NetworkManager.Device.Team:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.Slaves">The "Slaves" property</a>
+<dt id="ientry-idm45741752921264">org.freedesktop.NetworkManager.Device.Team:Slaves, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Team.html#gdbus-property-org-freedesktop-NetworkManager-Device-Team.Slaves">The "Slaves" property</a>
 </dt>
-<dt id="ientry-idm45708563461616">org.freedesktop.NetworkManager.Device.Tun, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Tun.top_of_page">org.freedesktop.NetworkManager.Device.Tun</a>
+<dt id="ientry-idm45741761401232">org.freedesktop.NetworkManager.Device.Tun, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Tun.top_of_page">org.freedesktop.NetworkManager.Device.Tun</a>
 </dt>
-<dt id="ientry-idm45708556026848">org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Tun.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752825984">org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Tun.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708555396416">org.freedesktop.NetworkManager.Device.Tun:Group, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Group">The "Group" property</a>
+<dt id="ientry-idm45741751545200">org.freedesktop.NetworkManager.Device.Tun:Group, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Group">The "Group" property</a>
 </dt>
-<dt id="ientry-idm45708566045424">org.freedesktop.NetworkManager.Device.Tun:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741752679408">org.freedesktop.NetworkManager.Device.Tun:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708555428224">org.freedesktop.NetworkManager.Device.Tun:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Mode">The "Mode" property</a>
+<dt id="ientry-idm45741755519248">org.freedesktop.NetworkManager.Device.Tun:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Mode">The "Mode" property</a>
 </dt>
-<dt id="ientry-idm45708566049632">org.freedesktop.NetworkManager.Device.Tun:MultiQueue, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.MultiQueue">The "MultiQueue" property</a>
+<dt id="ientry-idm45741755506688">org.freedesktop.NetworkManager.Device.Tun:MultiQueue, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.MultiQueue">The "MultiQueue" property</a>
 </dt>
-<dt id="ientry-idm45708566058080">org.freedesktop.NetworkManager.Device.Tun:NoPi, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.NoPi">The "NoPi" property</a>
+<dt id="ientry-idm45741755515136">org.freedesktop.NetworkManager.Device.Tun:NoPi, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.NoPi">The "NoPi" property</a>
 </dt>
-<dt id="ientry-idm45708555400528">org.freedesktop.NetworkManager.Device.Tun:Owner, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Owner">The "Owner" property</a>
+<dt id="ientry-idm45741751549392">org.freedesktop.NetworkManager.Device.Tun:Owner, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.Owner">The "Owner" property</a>
 </dt>
-<dt id="ientry-idm45708566053840">org.freedesktop.NetworkManager.Device.Tun:VnetHdr, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.VnetHdr">The "VnetHdr" property</a>
+<dt id="ientry-idm45741755510896">org.freedesktop.NetworkManager.Device.Tun:VnetHdr, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Tun.html#gdbus-property-org-freedesktop-NetworkManager-Device-Tun.VnetHdr">The "VnetHdr" property</a>
 </dt>
-<dt id="ientry-idm45708563326656">org.freedesktop.NetworkManager.Device.Veth, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Veth.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Veth.top_of_page">org.freedesktop.NetworkManager.Device.Veth</a>
+<dt id="ientry-idm45741758835488">org.freedesktop.NetworkManager.Device.Veth, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Veth.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Veth.top_of_page">org.freedesktop.NetworkManager.Device.Veth</a>
 </dt>
-<dt id="ientry-idm45708555423328">org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Veth.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Veth.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741755159984">org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Veth.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Veth.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708555461360">org.freedesktop.NetworkManager.Device.Veth:Peer, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Veth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Veth.Peer">The "Peer" property</a>
+<dt id="ientry-idm45741751530448">org.freedesktop.NetworkManager.Device.Veth:Peer, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Veth.html#gdbus-property-org-freedesktop-NetworkManager-Device-Veth.Peer">The "Peer" property</a>
 </dt>
-<dt id="ientry-idm45708558142256">org.freedesktop.NetworkManager.Device.Vlan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Vlan.top_of_page">org.freedesktop.NetworkManager.Device.Vlan</a>
+<dt id="ientry-idm45741762790000">org.freedesktop.NetworkManager.Device.Vlan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Vlan.top_of_page">org.freedesktop.NetworkManager.Device.Vlan</a>
 </dt>
-<dt id="ientry-idm45708555457376">org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Vlan.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752889568">org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Vlan.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708555959872">org.freedesktop.NetworkManager.Device.Vlan:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741752471184">org.freedesktop.NetworkManager.Device.Vlan:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708555963952">org.freedesktop.NetworkManager.Device.Vlan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741752475024">org.freedesktop.NetworkManager.Device.Vlan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708555377440">org.freedesktop.NetworkManager.Device.Vlan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Parent">The "Parent" property</a>
+<dt id="ientry-idm45741752458752">org.freedesktop.NetworkManager.Device.Vlan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.Parent">The "Parent" property</a>
 </dt>
-<dt id="ientry-idm45708555373248">org.freedesktop.NetworkManager.Device.Vlan:VlanId, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.VlanId">The "VlanId" property</a>
+<dt id="ientry-idm45741752454800">org.freedesktop.NetworkManager.Device.Vlan:VlanId, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vlan.VlanId">The "VlanId" property</a>
 </dt>
-<dt id="ientry-idm45708560959120">org.freedesktop.NetworkManager.Device.Vxlan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Vxlan.top_of_page">org.freedesktop.NetworkManager.Device.Vxlan</a>
+<dt id="ientry-idm45741757716592">org.freedesktop.NetworkManager.Device.Vxlan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Vxlan.top_of_page">org.freedesktop.NetworkManager.Device.Vxlan</a>
 </dt>
-<dt id="ientry-idm45708555998320">org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Vxlan.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752746800">org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Vxlan.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556712320">org.freedesktop.NetworkManager.Device.Vxlan:Ageing, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ageing">The "Ageing" property</a>
+<dt id="ientry-idm45741752309360">org.freedesktop.NetworkManager.Device.Vxlan:Ageing, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ageing">The "Ageing" property</a>
 </dt>
-<dt id="ientry-idm45708556703984">org.freedesktop.NetworkManager.Device.Vxlan:DstPort, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.DstPort">The "DstPort" property</a>
+<dt id="ientry-idm45741752300928">org.freedesktop.NetworkManager.Device.Vxlan:DstPort, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.DstPort">The "DstPort" property</a>
 </dt>
-<dt id="ientry-idm45708555942704">org.freedesktop.NetworkManager.Device.Vxlan:Group, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Group">The "Group" property</a>
+<dt id="ientry-idm45741752725152">org.freedesktop.NetworkManager.Device.Vxlan:Group, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Group">The "Group" property</a>
 </dt>
-<dt id="ientry-idm45708555950896">org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741752733344">org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708555946816">org.freedesktop.NetworkManager.Device.Vxlan:Id, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Id">The "Id" property</a>
+<dt id="ientry-idm45741752729264">org.freedesktop.NetworkManager.Device.Vxlan:Id, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Id">The "Id" property</a>
 </dt>
-<dt id="ientry-idm45708556683056">org.freedesktop.NetworkManager.Device.Vxlan:L2miss, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L2miss">The "L2miss" property</a>
+<dt id="ientry-idm45741752279952">org.freedesktop.NetworkManager.Device.Vxlan:L2miss, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L2miss">The "L2miss" property</a>
 </dt>
-<dt id="ientry-idm45708556678848">org.freedesktop.NetworkManager.Device.Vxlan:L3miss, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L3miss">The "L3miss" property</a>
+<dt id="ientry-idm45741752275744">org.freedesktop.NetworkManager.Device.Vxlan:L3miss, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.L3miss">The "L3miss" property</a>
 </dt>
-<dt id="ientry-idm45708556716480">org.freedesktop.NetworkManager.Device.Vxlan:Learning, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Learning">The "Learning" property</a>
+<dt id="ientry-idm45741752313520">org.freedesktop.NetworkManager.Device.Vxlan:Learning, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Learning">The "Learning" property</a>
 </dt>
-<dt id="ientry-idm45708556708208">org.freedesktop.NetworkManager.Device.Vxlan:Limit, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Limit">The "Limit" property</a>
+<dt id="ientry-idm45741752305152">org.freedesktop.NetworkManager.Device.Vxlan:Limit, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Limit">The "Limit" property</a>
 </dt>
-<dt id="ientry-idm45708556729168">org.freedesktop.NetworkManager.Device.Vxlan:Local, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Local">The "Local" property</a>
+<dt id="ientry-idm45741752326208">org.freedesktop.NetworkManager.Device.Vxlan:Local, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Local">The "Local" property</a>
 </dt>
-<dt id="ientry-idm45708555955104">org.freedesktop.NetworkManager.Device.Vxlan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Parent">The "Parent" property</a>
+<dt id="ientry-idm45741752737552">org.freedesktop.NetworkManager.Device.Vxlan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Parent">The "Parent" property</a>
 </dt>
-<dt id="ientry-idm45708556691504">org.freedesktop.NetworkManager.Device.Vxlan:Proxy, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Proxy">The "Proxy" property</a>
+<dt id="ientry-idm45741752288400">org.freedesktop.NetworkManager.Device.Vxlan:Proxy, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Proxy">The "Proxy" property</a>
 </dt>
-<dt id="ientry-idm45708556687296">org.freedesktop.NetworkManager.Device.Vxlan:Rsc, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Rsc">The "Rsc" property</a>
+<dt id="ientry-idm45741752284192">org.freedesktop.NetworkManager.Device.Vxlan:Rsc, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Rsc">The "Rsc" property</a>
 </dt>
-<dt id="ientry-idm45708556695744">org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMax">The "SrcPortMax" property</a>
+<dt id="ientry-idm45741752292640">org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMax">The "SrcPortMax" property</a>
 </dt>
-<dt id="ientry-idm45708556699904">org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMin">The "SrcPortMin" property</a>
+<dt id="ientry-idm45741752296848">org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.SrcPortMin">The "SrcPortMin" property</a>
 </dt>
-<dt id="ientry-idm45708556724928">org.freedesktop.NetworkManager.Device.Vxlan:Tos, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Tos">The "Tos" property</a>
+<dt id="ientry-idm45741752321968">org.freedesktop.NetworkManager.Device.Vxlan:Tos, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Tos">The "Tos" property</a>
 </dt>
-<dt id="ientry-idm45708556720704">org.freedesktop.NetworkManager.Device.Vxlan:Ttl, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ttl">The "Ttl" property</a>
+<dt id="ientry-idm45741752317744">org.freedesktop.NetworkManager.Device.Vxlan:Ttl, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Vxlan.Ttl">The "Ttl" property</a>
 </dt>
-<dt id="ientry-idm45708561086208">org.freedesktop.NetworkManager.Device::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-signal-org-freedesktop-NetworkManager-Device.StateChanged">The "StateChanged" signal</a>
+<dt id="ientry-idm45741755385280">org.freedesktop.NetworkManager.Device::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-signal-org-freedesktop-NetworkManager-Device.StateChanged">The "StateChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708559698112">org.freedesktop.NetworkManager.Device:ActiveConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.ActiveConnection">The "ActiveConnection" property</a>
+<dt id="ientry-idm45741755085376">org.freedesktop.NetworkManager.Device:ActiveConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.ActiveConnection">The "ActiveConnection" property</a>
 </dt>
-<dt id="ientry-idm45708559672880">org.freedesktop.NetworkManager.Device:Autoconnect, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Autoconnect">The "Autoconnect" property</a>
+<dt id="ientry-idm45741755059840">org.freedesktop.NetworkManager.Device:Autoconnect, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Autoconnect">The "Autoconnect" property</a>
 </dt>
-<dt id="ientry-idm45708558599344">org.freedesktop.NetworkManager.Device:AvailableConnections, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.AvailableConnections">The "AvailableConnections" property</a>
+<dt id="ientry-idm45741755041968">org.freedesktop.NetworkManager.Device:AvailableConnections, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.AvailableConnections">The "AvailableConnections" property</a>
 </dt>
-<dt id="ientry-idm45708559718688">org.freedesktop.NetworkManager.Device:Capabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Capabilities">The "Capabilities" property</a>
+<dt id="ientry-idm45741755343024">org.freedesktop.NetworkManager.Device:Capabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Capabilities">The "Capabilities" property</a>
 </dt>
-<dt id="ientry-idm45708558604256">org.freedesktop.NetworkManager.Device:DeviceType, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.DeviceType">The "DeviceType" property</a>
+<dt id="ientry-idm45741755047168">org.freedesktop.NetworkManager.Device:DeviceType, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.DeviceType">The "DeviceType" property</a>
 </dt>
-<dt id="ientry-idm45708559689616">org.freedesktop.NetworkManager.Device:Dhcp4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp4Config">The "Dhcp4Config" property</a>
+<dt id="ientry-idm45741755076576">org.freedesktop.NetworkManager.Device:Dhcp4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp4Config">The "Dhcp4Config" property</a>
 </dt>
-<dt id="ientry-idm45708559681136">org.freedesktop.NetworkManager.Device:Dhcp6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp6Config">The "Dhcp6Config" property</a>
+<dt id="ientry-idm45741755068096">org.freedesktop.NetworkManager.Device:Dhcp6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Dhcp6Config">The "Dhcp6Config" property</a>
 </dt>
-<dt id="ientry-idm45708559731552">org.freedesktop.NetworkManager.Device:Driver, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Driver">The "Driver" property</a>
+<dt id="ientry-idm45741755355888">org.freedesktop.NetworkManager.Device:Driver, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Driver">The "Driver" property</a>
 </dt>
-<dt id="ientry-idm45708559727280">org.freedesktop.NetworkManager.Device:DriverVersion, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.DriverVersion">The "DriverVersion" property</a>
+<dt id="ientry-idm45741755351616">org.freedesktop.NetworkManager.Device:DriverVersion, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.DriverVersion">The "DriverVersion" property</a>
 </dt>
-<dt id="ientry-idm45708558612784">org.freedesktop.NetworkManager.Device:FirmwareMissing, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareMissing">The "FirmwareMissing" property</a>
+<dt id="ientry-idm45741755055696">org.freedesktop.NetworkManager.Device:FirmwareMissing, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareMissing">The "FirmwareMissing" property</a>
 </dt>
-<dt id="ientry-idm45708559722976">org.freedesktop.NetworkManager.Device:FirmwareVersion, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareVersion">The "FirmwareVersion" property</a>
+<dt id="ientry-idm45741755347312">org.freedesktop.NetworkManager.Device:FirmwareVersion, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.FirmwareVersion">The "FirmwareVersion" property</a>
 </dt>
-<dt id="ientry-idm45708561065344">org.freedesktop.NetworkManager.Device:Interface, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Interface">The "Interface" property</a>
+<dt id="ientry-idm45741755364416">org.freedesktop.NetworkManager.Device:Interface, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Interface">The "Interface" property</a>
 </dt>
-<dt id="ientry-idm45708559713456">org.freedesktop.NetworkManager.Device:Ip4Address, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Address">The "Ip4Address" property</a>
+<dt id="ientry-idm45741755337792">org.freedesktop.NetworkManager.Device:Ip4Address, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Address">The "Ip4Address" property</a>
 </dt>
-<dt id="ientry-idm45708559693952">org.freedesktop.NetworkManager.Device:Ip4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Config">The "Ip4Config" property</a>
+<dt id="ientry-idm45741755080912">org.freedesktop.NetworkManager.Device:Ip4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Config">The "Ip4Config" property</a>
 </dt>
-<dt id="ientry-idm45708559685472">org.freedesktop.NetworkManager.Device:Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Config">The "Ip6Config" property</a>
+<dt id="ientry-idm45741755072432">org.freedesktop.NetworkManager.Device:Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Config">The "Ip6Config" property</a>
 </dt>
-<dt id="ientry-idm45708559735680">org.freedesktop.NetworkManager.Device:IpInterface, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.IpInterface">The "IpInterface" property</a>
+<dt id="ientry-idm45741755360016">org.freedesktop.NetworkManager.Device:IpInterface, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.IpInterface">The "IpInterface" property</a>
 </dt>
-<dt id="ientry-idm45708558581424">org.freedesktop.NetworkManager.Device:LldpNeighbors, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.LldpNeighbors">The "LldpNeighbors" property</a>
+<dt id="ientry-idm45741754950752">org.freedesktop.NetworkManager.Device:LldpNeighbors, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.LldpNeighbors">The "LldpNeighbors" property</a>
 </dt>
-<dt id="ientry-idm45708559677008">org.freedesktop.NetworkManager.Device:Managed, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Managed">The "Managed" property</a>
+<dt id="ientry-idm45741755063968">org.freedesktop.NetworkManager.Device:Managed, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Managed">The "Managed" property</a>
 </dt>
-<dt id="ientry-idm45708558586720">org.freedesktop.NetworkManager.Device:Metered, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Metered">The "Metered" property</a>
+<dt id="ientry-idm45741754956048">org.freedesktop.NetworkManager.Device:Metered, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Metered">The "Metered" property</a>
 </dt>
-<dt id="ientry-idm45708558590832">org.freedesktop.NetworkManager.Device:Mtu, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Mtu">The "Mtu" property</a>
+<dt id="ientry-idm45741754960160">org.freedesktop.NetworkManager.Device:Mtu, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Mtu">The "Mtu" property</a>
 </dt>
-<dt id="ientry-idm45708558608528">org.freedesktop.NetworkManager.Device:NmPluginMissing, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.NmPluginMissing">The "NmPluginMissing" property</a>
+<dt id="ientry-idm45741755051440">org.freedesktop.NetworkManager.Device:NmPluginMissing, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.NmPluginMissing">The "NmPluginMissing" property</a>
 </dt>
-<dt id="ientry-idm45708558594960">org.freedesktop.NetworkManager.Device:PhysicalPortId, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.PhysicalPortId">The "PhysicalPortId" property</a>
+<dt id="ientry-idm45741754964288">org.freedesktop.NetworkManager.Device:PhysicalPortId, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.PhysicalPortId">The "PhysicalPortId" property</a>
 </dt>
-<dt id="ientry-idm45708558577168">org.freedesktop.NetworkManager.Device:Real, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Real">The "Real" property</a>
+<dt id="ientry-idm45741754946496">org.freedesktop.NetworkManager.Device:Real, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Real">The "Real" property</a>
 </dt>
-<dt id="ientry-idm45708559709216">org.freedesktop.NetworkManager.Device:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.State">The "State" property</a>
+<dt id="ientry-idm45741755096480">org.freedesktop.NetworkManager.Device:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.State">The "State" property</a>
 </dt>
-<dt id="ientry-idm45708559704080">org.freedesktop.NetworkManager.Device:StateReason, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.StateReason">The "StateReason" property</a>
+<dt id="ientry-idm45741755091344">org.freedesktop.NetworkManager.Device:StateReason, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.StateReason">The "StateReason" property</a>
 </dt>
-<dt id="ientry-idm45708561069872">org.freedesktop.NetworkManager.Device:Udi, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Udi">The "Udi" property</a>
+<dt id="ientry-idm45741755368944">org.freedesktop.NetworkManager.Device:Udi, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Udi">The "Udi" property</a>
 </dt>
-<dt id="ientry-idm45708562568224">org.freedesktop.NetworkManager.DnsManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-interface-org-freedesktop-NetworkManager-DnsManager.top_of_page">org.freedesktop.NetworkManager.DnsManager</a>
+<dt id="ientry-idm45741758964368">org.freedesktop.NetworkManager.DnsManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-interface-org-freedesktop-NetworkManager-DnsManager.top_of_page">org.freedesktop.NetworkManager.DnsManager</a>
 </dt>
-<dt id="ientry-idm45708561969952">org.freedesktop.NetworkManager.DnsManager:Configuration, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-property-org-freedesktop-NetworkManager-DnsManager.Configuration">The "Configuration" property</a>
+<dt id="ientry-idm45741762576880">org.freedesktop.NetworkManager.DnsManager:Configuration, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-property-org-freedesktop-NetworkManager-DnsManager.Configuration">The "Configuration" property</a>
 </dt>
-<dt id="ientry-idm45708565599184">org.freedesktop.NetworkManager.DnsManager:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-property-org-freedesktop-NetworkManager-DnsManager.Mode">The "Mode" property</a>
+<dt id="ientry-idm45741758211344">org.freedesktop.NetworkManager.DnsManager:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-property-org-freedesktop-NetworkManager-DnsManager.Mode">The "Mode" property</a>
 </dt>
-<dt id="ientry-idm45708562581120">org.freedesktop.NetworkManager.DnsManager:RcManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-property-org-freedesktop-NetworkManager-DnsManager.RcManager">The "RcManager" property</a>
+<dt id="ientry-idm45741760359744">org.freedesktop.NetworkManager.DnsManager:RcManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DnsManager.html#gdbus-property-org-freedesktop-NetworkManager-DnsManager.RcManager">The "RcManager" property</a>
 </dt>
-<dt id="ientry-idm45708567294528">org.freedesktop.NetworkManager.IP4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-interface-org-freedesktop-NetworkManager-IP4Config.top_of_page">org.freedesktop.NetworkManager.IP4Config</a>
+<dt id="ientry-idm45741758651008">org.freedesktop.NetworkManager.IP4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-interface-org-freedesktop-NetworkManager-IP4Config.top_of_page">org.freedesktop.NetworkManager.IP4Config</a>
 </dt>
-<dt id="ientry-idm45708571921552">org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-signal-org-freedesktop-NetworkManager-IP4Config.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752528080">org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-signal-org-freedesktop-NetworkManager-IP4Config.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556792768">org.freedesktop.NetworkManager.IP4Config:AddressData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.AddressData">The "AddressData" property</a>
+<dt id="ientry-idm45741752784864">org.freedesktop.NetworkManager.IP4Config:AddressData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.AddressData">The "AddressData" property</a>
 </dt>
-<dt id="ientry-idm45708571912256">org.freedesktop.NetworkManager.IP4Config:Addresses, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Addresses">The "Addresses" property</a>
+<dt id="ientry-idm45741751536368">org.freedesktop.NetworkManager.IP4Config:Addresses, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Addresses">The "Addresses" property</a>
 </dt>
-<dt id="ientry-idm45708556356192">org.freedesktop.NetworkManager.IP4Config:DnsOptions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">The "DnsOptions" property</a>
+<dt id="ientry-idm45741752795008">org.freedesktop.NetworkManager.IP4Config:DnsOptions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsOptions">The "DnsOptions" property</a>
 </dt>
-<dt id="ientry-idm45708556351888">org.freedesktop.NetworkManager.IP4Config:DnsPriority, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">The "DnsPriority" property</a>
+<dt id="ientry-idm45741751820896">org.freedesktop.NetworkManager.IP4Config:DnsPriority, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.DnsPriority">The "DnsPriority" property</a>
 </dt>
-<dt id="ientry-idm45708556771808">org.freedesktop.NetworkManager.IP4Config:Domains, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">The "Domains" property</a>
+<dt id="ientry-idm45741751468000">org.freedesktop.NetworkManager.IP4Config:Domains, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Domains">The "Domains" property</a>
 </dt>
-<dt id="ientry-idm45708556788688">org.freedesktop.NetworkManager.IP4Config:Gateway, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Gateway">The "Gateway" property</a>
+<dt id="ientry-idm45741751493952">org.freedesktop.NetworkManager.IP4Config:Gateway, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Gateway">The "Gateway" property</a>
 </dt>
-<dt id="ientry-idm45708556775984">org.freedesktop.NetworkManager.IP4Config:Nameservers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Nameservers">The "Nameservers" property</a>
+<dt id="ientry-idm45741751503216">org.freedesktop.NetworkManager.IP4Config:Nameservers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Nameservers">The "Nameservers" property</a>
 </dt>
-<dt id="ientry-idm45708556780384">org.freedesktop.NetworkManager.IP4Config:RouteData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.RouteData">The "RouteData" property</a>
+<dt id="ientry-idm45741752649808">org.freedesktop.NetworkManager.IP4Config:RouteData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.RouteData">The "RouteData" property</a>
 </dt>
-<dt id="ientry-idm45708556784528">org.freedesktop.NetworkManager.IP4Config:Routes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Routes">The "Routes" property</a>
+<dt id="ientry-idm45741755184480">org.freedesktop.NetworkManager.IP4Config:Routes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Routes">The "Routes" property</a>
 </dt>
-<dt id="ientry-idm45708556360384">org.freedesktop.NetworkManager.IP4Config:Searches, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches">The "Searches" property</a>
+<dt id="ientry-idm45741752490560">org.freedesktop.NetworkManager.IP4Config:Searches, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.Searches">The "Searches" property</a>
 </dt>
-<dt id="ientry-idm45708556347744">org.freedesktop.NetworkManager.IP4Config:WinsServers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">The "WinsServers" property</a>
+<dt id="ientry-idm45741751560688">org.freedesktop.NetworkManager.IP4Config:WinsServers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServers">The "WinsServers" property</a>
 </dt>
-<dt id="ientry-idm45708566016304">org.freedesktop.NetworkManager.IP6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-interface-org-freedesktop-NetworkManager-IP6Config.top_of_page">org.freedesktop.NetworkManager.IP6Config</a>
+<dt id="ientry-idm45741759669536">org.freedesktop.NetworkManager.IP6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-interface-org-freedesktop-NetworkManager-IP6Config.top_of_page">org.freedesktop.NetworkManager.IP6Config</a>
 </dt>
-<dt id="ientry-idm45708567098224">org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-signal-org-freedesktop-NetworkManager-IP6Config.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752639216">org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-signal-org-freedesktop-NetworkManager-IP6Config.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556896576">org.freedesktop.NetworkManager.IP6Config:AddressData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.AddressData">The "AddressData" property</a>
+<dt id="ientry-idm45741752577696">org.freedesktop.NetworkManager.IP6Config:AddressData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.AddressData">The "AddressData" property</a>
 </dt>
-<dt id="ientry-idm45708559959696">org.freedesktop.NetworkManager.IP6Config:Addresses, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Addresses">The "Addresses" property</a>
+<dt id="ientry-idm45741752621632">org.freedesktop.NetworkManager.IP6Config:Addresses, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Addresses">The "Addresses" property</a>
 </dt>
-<dt id="ientry-idm45708559902032">org.freedesktop.NetworkManager.IP6Config:DnsOptions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">The "DnsOptions" property</a>
+<dt id="ientry-idm45741751922512">org.freedesktop.NetworkManager.IP6Config:DnsOptions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsOptions">The "DnsOptions" property</a>
 </dt>
-<dt id="ientry-idm45708559227040">org.freedesktop.NetworkManager.IP6Config:DnsPriority, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">The "DnsPriority" property</a>
+<dt id="ientry-idm45741751918208">org.freedesktop.NetworkManager.IP6Config:DnsPriority, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.DnsPriority">The "DnsPriority" property</a>
 </dt>
-<dt id="ientry-idm45708556454016">org.freedesktop.NetworkManager.IP6Config:Domains, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">The "Domains" property</a>
+<dt id="ientry-idm45741751930832">org.freedesktop.NetworkManager.IP6Config:Domains, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Domains">The "Domains" property</a>
 </dt>
-<dt id="ientry-idm45708555332464">org.freedesktop.NetworkManager.IP6Config:Gateway, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Gateway">The "Gateway" property</a>
+<dt id="ientry-idm45741752573568">org.freedesktop.NetworkManager.IP6Config:Gateway, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Gateway">The "Gateway" property</a>
 </dt>
-<dt id="ientry-idm45708556440048">org.freedesktop.NetworkManager.IP6Config:Nameservers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Nameservers">The "Nameservers" property</a>
+<dt id="ientry-idm45741751935008">org.freedesktop.NetworkManager.IP6Config:Nameservers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Nameservers">The "Nameservers" property</a>
 </dt>
-<dt id="ientry-idm45708555888048">org.freedesktop.NetworkManager.IP6Config:RouteData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.RouteData">The "RouteData" property</a>
+<dt id="ientry-idm45741752565264">org.freedesktop.NetworkManager.IP6Config:RouteData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.RouteData">The "RouteData" property</a>
 </dt>
-<dt id="ientry-idm45708559256912">org.freedesktop.NetworkManager.IP6Config:Routes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Routes">The "Routes" property</a>
+<dt id="ientry-idm45741752569408">org.freedesktop.NetworkManager.IP6Config:Routes, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Routes">The "Routes" property</a>
 </dt>
-<dt id="ientry-idm45708567005360">org.freedesktop.NetworkManager.IP6Config:Searches, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches">The "Searches" property</a>
+<dt id="ientry-idm45741751926704">org.freedesktop.NetworkManager.IP6Config:Searches, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP6Config.html#gdbus-property-org-freedesktop-NetworkManager-IP6Config.Searches">The "Searches" property</a>
 </dt>
-<dt id="ientry-idm45708564221824">org.freedesktop.NetworkManager.SecretAgent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-interface-org-freedesktop-NetworkManager-SecretAgent.top_of_page">org.freedesktop.NetworkManager.SecretAgent</a>
+<dt id="ientry-idm45741759853184">org.freedesktop.NetworkManager.SecretAgent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-interface-org-freedesktop-NetworkManager-SecretAgent.top_of_page">org.freedesktop.NetworkManager.SecretAgent</a>
 </dt>
-<dt id="ientry-idm45708556276624">org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets">The CancelGetSecrets() method</a>
+<dt id="ientry-idm45741752231184">org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.CancelGetSecrets">The CancelGetSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708553109456">org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets">The DeleteSecrets() method</a>
+<dt id="ientry-idm45741749760000">org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.DeleteSecrets">The DeleteSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708553430624">org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets">The GetSecrets() method</a>
+<dt id="ientry-idm45741749875216">org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.GetSecrets">The GetSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708553093680">org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets">The SaveSecrets() method</a>
+<dt id="ientry-idm45741752220976">org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.SecretAgent.html#gdbus-method-org-freedesktop-NetworkManager-SecretAgent.SaveSecrets">The SaveSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708563842128">org.freedesktop.NetworkManager.Settings, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-interface-org-freedesktop-NetworkManager-Settings.top_of_page">org.freedesktop.NetworkManager.Settings</a>
+<dt id="ientry-idm45741760903680">org.freedesktop.NetworkManager.Settings, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-interface-org-freedesktop-NetworkManager-Settings.top_of_page">org.freedesktop.NetworkManager.Settings</a>
 </dt>
-<dt id="ientry-idm45708558196976">org.freedesktop.NetworkManager.Settings.AddConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection">The AddConnection() method</a>
+<dt id="ientry-idm45741762599392">org.freedesktop.NetworkManager.Settings.AddConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection">The AddConnection() method</a>
 </dt>
-<dt id="ientry-idm45708558647312">org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved">The AddConnectionUnsaved() method</a>
+<dt id="ientry-idm45741754323312">org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnectionUnsaved">The AddConnectionUnsaved() method</a>
 </dt>
-<dt id="ientry-idm45708563988016">org.freedesktop.NetworkManager.Settings.Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-interface-org-freedesktop-NetworkManager-Settings-Connection.top_of_page">org.freedesktop.NetworkManager.Settings.Connection</a>
+<dt id="ientry-idm45741763278880">org.freedesktop.NetworkManager.Settings.Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-interface-org-freedesktop-NetworkManager-Settings-Connection.top_of_page">org.freedesktop.NetworkManager.Settings.Connection</a>
 </dt>
-<dt id="ientry-idm45708558175616">org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets">The ClearSecrets() method</a>
+<dt id="ientry-idm45741754283216">org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.ClearSecrets">The ClearSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708559645984">org.freedesktop.NetworkManager.Settings.Connection.Delete(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete">The Delete() method</a>
+<dt id="ientry-idm45741757284560">org.freedesktop.NetworkManager.Settings.Connection.Delete(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Delete">The Delete() method</a>
 </dt>
-<dt id="ientry-idm45708558185792">org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets">The GetSecrets() method</a>
+<dt id="ientry-idm45741754604432">org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSecrets">The GetSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708559641808">org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings">The GetSettings() method</a>
+<dt id="ientry-idm45741757280384">org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.GetSettings">The GetSettings() method</a>
 </dt>
-<dt id="ientry-idm45708558515440">org.freedesktop.NetworkManager.Settings.Connection.Save(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save">The Save() method</a>
+<dt id="ientry-idm45741754538016">org.freedesktop.NetworkManager.Settings.Connection.Save(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Save">The Save() method</a>
 </dt>
-<dt id="ientry-idm45708558343456">org.freedesktop.NetworkManager.Settings.Connection.Update(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update">The Update() method</a>
+<dt id="ientry-idm45741760993504">org.freedesktop.NetworkManager.Settings.Connection.Update(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update">The Update() method</a>
 </dt>
-<dt id="ientry-idm45708558511088">org.freedesktop.NetworkManager.Settings.Connection.Update2(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update2">The Update2() method</a>
+<dt id="ientry-idm45741754533664">org.freedesktop.NetworkManager.Settings.Connection.Update2(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.Update2">The Update2() method</a>
 </dt>
-<dt id="ientry-idm45708559653392">org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved">The UpdateUnsaved() method</a>
+<dt id="ientry-idm45741757153232">org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-method-org-freedesktop-NetworkManager-Settings-Connection.UpdateUnsaved">The UpdateUnsaved() method</a>
 </dt>
-<dt id="ientry-idm45708558323440">org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741757824400">org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708558328032">org.freedesktop.NetworkManager.Settings.Connection::Removed, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Removed">The "Removed" signal</a>
+<dt id="ientry-idm45741757828992">org.freedesktop.NetworkManager.Settings.Connection::Removed, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Removed">The "Removed" signal</a>
 </dt>
-<dt id="ientry-idm45708558332528">org.freedesktop.NetworkManager.Settings.Connection::Updated, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Updated">The "Updated" signal</a>
+<dt id="ientry-idm45741757833440">org.freedesktop.NetworkManager.Settings.Connection::Updated, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-Settings-Connection.Updated">The "Updated" signal</a>
 </dt>
-<dt id="ientry-idm45708558541216">org.freedesktop.NetworkManager.Settings.Connection:Filename, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Filename">The "Filename" property</a>
+<dt id="ientry-idm45741757815904">org.freedesktop.NetworkManager.Settings.Connection:Filename, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Filename">The "Filename" property</a>
 </dt>
-<dt id="ientry-idm45708558309440">org.freedesktop.NetworkManager.Settings.Connection:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Flags">The "Flags" property</a>
+<dt id="ientry-idm45741754621232">org.freedesktop.NetworkManager.Settings.Connection:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Flags">The "Flags" property</a>
 </dt>
-<dt id="ientry-idm45708558313888">org.freedesktop.NetworkManager.Settings.Connection:Unsaved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Unsaved">The "Unsaved" property</a>
+<dt id="ientry-idm45741754625680">org.freedesktop.NetworkManager.Settings.Connection:Unsaved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.Connection.html#gdbus-property-org-freedesktop-NetworkManager-Settings-Connection.Unsaved">The "Unsaved" property</a>
 </dt>
-<dt id="ientry-idm45708562039536">org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid">The GetConnectionByUuid() method</a>
+<dt id="ientry-idm45741759775200">org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.GetConnectionByUuid">The GetConnectionByUuid() method</a>
 </dt>
-<dt id="ientry-idm45708558863632">org.freedesktop.NetworkManager.Settings.ListConnections(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections">The ListConnections() method</a>
+<dt id="ientry-idm45741760464160">org.freedesktop.NetworkManager.Settings.ListConnections(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.ListConnections">The ListConnections() method</a>
 </dt>
-<dt id="ientry-idm45708566740656">org.freedesktop.NetworkManager.Settings.LoadConnections(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections">The LoadConnections() method</a>
+<dt id="ientry-idm45741763227680">org.freedesktop.NetworkManager.Settings.LoadConnections(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.LoadConnections">The LoadConnections() method</a>
 </dt>
-<dt id="ientry-idm45708558450592">org.freedesktop.NetworkManager.Settings.ReloadConnections(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections">The ReloadConnections() method</a>
+<dt id="ientry-idm45741761766544">org.freedesktop.NetworkManager.Settings.ReloadConnections(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.ReloadConnections">The ReloadConnections() method</a>
 </dt>
-<dt id="ientry-idm45708558442688">org.freedesktop.NetworkManager.Settings.SaveHostname(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname">The SaveHostname() method</a>
+<dt id="ientry-idm45741762499776">org.freedesktop.NetworkManager.Settings.SaveHostname(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.SaveHostname">The SaveHostname() method</a>
 </dt>
-<dt id="ientry-idm45708558633344">org.freedesktop.NetworkManager.Settings::ConnectionRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-signal-org-freedesktop-NetworkManager-Settings.ConnectionRemoved">The "ConnectionRemoved" signal</a>
+<dt id="ientry-idm45741762723792">org.freedesktop.NetworkManager.Settings::ConnectionRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-signal-org-freedesktop-NetworkManager-Settings.ConnectionRemoved">The "ConnectionRemoved" signal</a>
 </dt>
-<dt id="ientry-idm45708558700560">org.freedesktop.NetworkManager.Settings::NewConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-signal-org-freedesktop-NetworkManager-Settings.NewConnection">The "NewConnection" signal</a>
+<dt id="ientry-idm45741762994224">org.freedesktop.NetworkManager.Settings::NewConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-signal-org-freedesktop-NetworkManager-Settings.NewConnection">The "NewConnection" signal</a>
 </dt>
-<dt id="ientry-idm45708558708160">org.freedesktop.NetworkManager.Settings::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-signal-org-freedesktop-NetworkManager-Settings.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741762938656">org.freedesktop.NetworkManager.Settings::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-signal-org-freedesktop-NetworkManager-Settings.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708561035744">org.freedesktop.NetworkManager.Settings:CanModify, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-property-org-freedesktop-NetworkManager-Settings.CanModify">The "CanModify" property</a>
+<dt id="ientry-idm45741761472416">org.freedesktop.NetworkManager.Settings:CanModify, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-property-org-freedesktop-NetworkManager-Settings.CanModify">The "CanModify" property</a>
 </dt>
-<dt id="ientry-idm45708561044176">org.freedesktop.NetworkManager.Settings:Connections, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-property-org-freedesktop-NetworkManager-Settings.Connections">The "Connections" property</a>
+<dt id="ientry-idm45741761652368">org.freedesktop.NetworkManager.Settings:Connections, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-property-org-freedesktop-NetworkManager-Settings.Connections">The "Connections" property</a>
 </dt>
-<dt id="ientry-idm45708561039968">org.freedesktop.NetworkManager.Settings:Hostname, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-property-org-freedesktop-NetworkManager-Settings.Hostname">The "Hostname" property</a>
+<dt id="ientry-idm45741761476640">org.freedesktop.NetworkManager.Settings:Hostname, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-property-org-freedesktop-NetworkManager-Settings.Hostname">The "Hostname" property</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>A</h3>
 <dl>
-<dt id="ientry-idm45708562104496">org.freedesktop.NetworkManager.Connection.Active, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-interface-org-freedesktop-NetworkManager-Connection-Active.top_of_page">org.freedesktop.NetworkManager.Connection.Active</a>
+<dt id="ientry-idm45741759499904">org.freedesktop.NetworkManager.Connection.Active, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-interface-org-freedesktop-NetworkManager-Connection-Active.top_of_page">org.freedesktop.NetworkManager.Connection.Active</a>
 </dt>
-<dt id="ientry-idm45708556856208">org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752381248">org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556816544">org.freedesktop.NetworkManager.Connection.Active::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.StateChanged">The "StateChanged" signal</a>
+<dt id="ientry-idm45741752418464">org.freedesktop.NetworkManager.Connection.Active::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-signal-org-freedesktop-NetworkManager-Connection-Active.StateChanged">The "StateChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556846880">org.freedesktop.NetworkManager.Connection.Active:Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Connection">The "Connection" property</a>
+<dt id="ientry-idm45741752371824">org.freedesktop.NetworkManager.Connection.Active:Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Connection">The "Connection" property</a>
 </dt>
-<dt id="ientry-idm45708556603920">org.freedesktop.NetworkManager.Connection.Active:Default, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default">The "Default" property</a>
+<dt id="ientry-idm45741752041600">org.freedesktop.NetworkManager.Connection.Active:Default, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default">The "Default" property</a>
 </dt>
-<dt id="ientry-idm45708556590688">org.freedesktop.NetworkManager.Connection.Active:Default6, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default6">The "Default6" property</a>
+<dt id="ientry-idm45741752028368">org.freedesktop.NetworkManager.Connection.Active:Default6, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Default6">The "Default6" property</a>
 </dt>
-<dt id="ientry-idm45708556090816">org.freedesktop.NetworkManager.Connection.Active:Devices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Devices">The "Devices" property</a>
+<dt id="ientry-idm45741752056352">org.freedesktop.NetworkManager.Connection.Active:Devices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Devices">The "Devices" property</a>
 </dt>
-<dt id="ientry-idm45708556595216">org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp4Config">The "Dhcp4Config" property</a>
+<dt id="ientry-idm45741752032896">org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp4Config">The "Dhcp4Config" property</a>
 </dt>
-<dt id="ientry-idm45708556581968">org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config">The "Dhcp6Config" property</a>
+<dt id="ientry-idm45741752019648">org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Dhcp6Config">The "Dhcp6Config" property</a>
 </dt>
-<dt id="ientry-idm45708556103584">org.freedesktop.NetworkManager.Connection.Active:Id, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Id">The "Id" property</a>
+<dt id="ientry-idm45741752069120">org.freedesktop.NetworkManager.Connection.Active:Id, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Id">The "Id" property</a>
 </dt>
-<dt id="ientry-idm45708556599504">org.freedesktop.NetworkManager.Connection.Active:Ip4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip4Config">The "Ip4Config" property</a>
+<dt id="ientry-idm45741752037184">org.freedesktop.NetworkManager.Connection.Active:Ip4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip4Config">The "Ip4Config" property</a>
 </dt>
-<dt id="ientry-idm45708556586256">org.freedesktop.NetworkManager.Connection.Active:Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config">The "Ip6Config" property</a>
+<dt id="ientry-idm45741752023936">org.freedesktop.NetworkManager.Connection.Active:Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Ip6Config">The "Ip6Config" property</a>
 </dt>
-<dt id="ientry-idm45708556573296">org.freedesktop.NetworkManager.Connection.Active:Master, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">The "Master" property</a>
+<dt id="ientry-idm45741752010976">org.freedesktop.NetworkManager.Connection.Active:Master, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Master">The "Master" property</a>
 </dt>
-<dt id="ientry-idm45708556107728">org.freedesktop.NetworkManager.Connection.Active:SpecificObject, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.SpecificObject">The "SpecificObject" property</a>
+<dt id="ientry-idm45741752073344">org.freedesktop.NetworkManager.Connection.Active:SpecificObject, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.SpecificObject">The "SpecificObject" property</a>
 </dt>
-<dt id="ientry-idm45708556086480">org.freedesktop.NetworkManager.Connection.Active:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.State">The "State" property</a>
+<dt id="ientry-idm45741752052016">org.freedesktop.NetworkManager.Connection.Active:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.State">The "State" property</a>
 </dt>
-<dt id="ientry-idm45708556609152">org.freedesktop.NetworkManager.Connection.Active:StateFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.StateFlags">The "StateFlags" property</a>
+<dt id="ientry-idm45741752046832">org.freedesktop.NetworkManager.Connection.Active:StateFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.StateFlags">The "StateFlags" property</a>
 </dt>
-<dt id="ientry-idm45708556095072">org.freedesktop.NetworkManager.Connection.Active:Type, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Type">The "Type" property</a>
+<dt id="ientry-idm45741752060608">org.freedesktop.NetworkManager.Connection.Active:Type, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Type">The "Type" property</a>
 </dt>
-<dt id="ientry-idm45708556099328">org.freedesktop.NetworkManager.Connection.Active:Uuid, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Uuid">The "Uuid" property</a>
+<dt id="ientry-idm45741752064864">org.freedesktop.NetworkManager.Connection.Active:Uuid, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Uuid">The "Uuid" property</a>
 </dt>
-<dt id="ientry-idm45708556577488">org.freedesktop.NetworkManager.Connection.Active:Vpn, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn">The "Vpn" property</a>
+<dt id="ientry-idm45741752015168">org.freedesktop.NetworkManager.Connection.Active:Vpn, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Connection.Active.html#gdbus-property-org-freedesktop-NetworkManager-Connection-Active.Vpn">The "Vpn" property</a>
 </dt>
-<dt id="ientry-idm45708554956400">addr-gen-mode, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751046976">addr-gen-mode, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555048224">address-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751137808">address-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555044624">addresses, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751134208">addresses, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554244016">ageing, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750351152">ageing, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708555293584">ageing-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751382992">ageing-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45708557135680">altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755796656">altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557131616">anonymous-identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755792592">anonymous-identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708555127792">apn, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751217376">apn, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708555206240">app-fcoe-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751295744">app-fcoe-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555202656">app-fcoe-mode, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751292160">app-fcoe-mode, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555199168">app-fcoe-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751288672">app-fcoe-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555195472">app-fip-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751284976">app-fip-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555191888">app-fip-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751281392">app-fip-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555188192">app-iscsi-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751277696">app-iscsi-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555184608">app-iscsi-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751274112">app-iscsi-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708554155824">assigned-mac-address, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750263024">assigned-mac-address, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708553998112">auth-alg, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750105312">auth-alg, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708566169920">auth-retries, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741763535616">auth-retries, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708557127936">auth-timeout, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755788912">auth-timeout, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554152144">auto-negotiate, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750259344">auto-negotiate, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708562613888">autoconnect, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741763192176">autoconnect, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708564105824">autoconnect-priority, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741761950032">autoconnect-priority, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708564101792">autoconnect-retries, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741761946192">autoconnect-retries, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708566632832">autoconnect-slaves, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741762081824">autoconnect-slaves, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>B</h3>
 <dl>
-<dt id="ientry-idm45708554080864">band, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750188064">band, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554645776">baud, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45741750741728">baud, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45708555323152">bdaddr, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>
+<dt id="ientry-idm45741751412560">bdaddr, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>
 </dt>
-<dt id="ientry-idm45708554508912">bits, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45741750615472">bits, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45708554677424">bond-downdelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45741750770208">bond-downdelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45708554673504">bond-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45741750766720">bond-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45708554669744">bond-updelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45741750763360">bond-updelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45708554537248">browser-only, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45741750643744">browser-only, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45708554076752">bssid, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750183952">bssid, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>C</h3>
 <dl>
-<dt id="ientry-idm45708557123936">ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755784912">ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557120256">ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755781232">ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557116576">ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755777552">ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557112928">ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755773904">ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554740256">channel, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750832432">channel, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708563841280">org.freedesktop.NetworkManager.Checkpoint, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-interface-org-freedesktop-NetworkManager-Checkpoint.top_of_page">org.freedesktop.NetworkManager.Checkpoint</a>
+<dt id="ientry-idm45741761333232">org.freedesktop.NetworkManager.Checkpoint, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-interface-org-freedesktop-NetworkManager-Checkpoint.top_of_page">org.freedesktop.NetworkManager.Checkpoint</a>
 </dt>
-<dt id="ientry-idm45708556563264">org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-signal-org-freedesktop-NetworkManager-Checkpoint.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741751890528">org.freedesktop.NetworkManager.Checkpoint::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-signal-org-freedesktop-NetworkManager-Checkpoint.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556340352">org.freedesktop.NetworkManager.Checkpoint:Created, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-property-org-freedesktop-NetworkManager-Checkpoint.Created">The "Created" property</a>
+<dt id="ientry-idm45741751866064">org.freedesktop.NetworkManager.Checkpoint:Created, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-property-org-freedesktop-NetworkManager-Checkpoint.Created">The "Created" property</a>
 </dt>
-<dt id="ientry-idm45708556344192">org.freedesktop.NetworkManager.Checkpoint:Devices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-property-org-freedesktop-NetworkManager-Checkpoint.Devices">The "Devices" property</a>
+<dt id="ientry-idm45741751951552">org.freedesktop.NetworkManager.Checkpoint:Devices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-property-org-freedesktop-NetworkManager-Checkpoint.Devices">The "Devices" property</a>
 </dt>
-<dt id="ientry-idm45708556487232">org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-property-org-freedesktop-NetworkManager-Checkpoint.RollbackTimeout">The "RollbackTimeout" property</a>
+<dt id="ientry-idm45741751861840">org.freedesktop.NetworkManager.Checkpoint:RollbackTimeout, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Checkpoint.html#gdbus-property-org-freedesktop-NetworkManager-Checkpoint.RollbackTimeout">The "RollbackTimeout" property</a>
 </dt>
-<dt id="ientry-idm45708557109040">client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755770016">client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557105360">client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755766336">client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557101520">client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755762496">client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554147840">cloned-mac-address, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750255040">cloned-mac-address, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554467664">config, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750574240">config, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45708554641936">crtscts, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750738240">crtscts, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt id="ientry-idm45708555041136">dad-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751130176">dad-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554322544">data, <a class="indexterm" href="settings-user.html">user</a>, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45741750429680">data, <a class="indexterm" href="settings-user.html">user</a>, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45708554240096">destination-port, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750347232">destination-port, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708555123968">device-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751213552">device-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708562626544">org.freedesktop.NetworkManager.Device.Wired, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Wired.top_of_page">org.freedesktop.NetworkManager.Device.Wired</a>
+<dt id="ientry-idm45741759193760">org.freedesktop.NetworkManager.Device.Wired, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Wired.top_of_page">org.freedesktop.NetworkManager.Device.Wired</a>
 </dt>
-<dt id="ientry-idm45708559241696">org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wired.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741763071744">org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wired.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708561121872">org.freedesktop.NetworkManager.Device.Wired:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Carrier">The "Carrier" property</a>
+<dt id="ientry-idm45741755022944">org.freedesktop.NetworkManager.Device.Wired:Carrier, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Carrier">The "Carrier" property</a>
 </dt>
-<dt id="ientry-idm45708561104752">org.freedesktop.NetworkManager.Device.Wired:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741754558928">org.freedesktop.NetworkManager.Device.Wired:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708561100640">org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.PermHwAddress">The "PermHwAddress" property</a>
+<dt id="ientry-idm45741754997168">org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.PermHwAddress">The "PermHwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708559937504">org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.S390Subchannels">The "S390Subchannels" property</a>
+<dt id="ientry-idm45741754516144">org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.S390Subchannels">The "S390Subchannels" property</a>
 </dt>
-<dt id="ientry-idm45708559941680">org.freedesktop.NetworkManager.Device.Wired:Speed, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Speed">The "Speed" property</a>
+<dt id="ientry-idm45741763002112">org.freedesktop.NetworkManager.Device.Wired:Speed, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wired.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wired.Speed">The "Speed" property</a>
 </dt>
-<dt id="ientry-idm45708565457280">org.freedesktop.NetworkManager.Device.Wireless, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Wireless.top_of_page">org.freedesktop.NetworkManager.Device.Wireless</a>
+<dt id="ientry-idm45741759904208">org.freedesktop.NetworkManager.Device.Wireless, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Wireless.top_of_page">org.freedesktop.NetworkManager.Device.Wireless</a>
 </dt>
-<dt id="ientry-idm45708555940368">org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints">The GetAccessPoints() method</a>
+<dt id="ientry-idm45741755151856">org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAccessPoints">The GetAccessPoints() method</a>
 </dt>
-<dt id="ientry-idm45708555880752">org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints">The GetAllAccessPoints() method</a>
+<dt id="ientry-idm45741752895424">org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.GetAllAccessPoints">The GetAllAccessPoints() method</a>
 </dt>
-<dt id="ientry-idm45708555873600">org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan">The RequestScan() method</a>
+<dt id="ientry-idm45741752782208">org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-method-org-freedesktop-NetworkManager-Device-Wireless.RequestScan">The RequestScan() method</a>
 </dt>
-<dt id="ientry-idm45708556414512">org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointAdded">The "AccessPointAdded" signal</a>
+<dt id="ientry-idm45741755269520">org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointAdded">The "AccessPointAdded" signal</a>
 </dt>
-<dt id="ientry-idm45708556407024">org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointRemoved">The "AccessPointRemoved" signal</a>
+<dt id="ientry-idm45741755434176">org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.AccessPointRemoved">The "AccessPointRemoved" signal</a>
 </dt>
-<dt id="ientry-idm45708556422000">org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752438928">org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-signal-org-freedesktop-NetworkManager-Device-Wireless.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556379664">org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.AccessPoints">The "AccessPoints" property</a>
+<dt id="ientry-idm45741752851280">org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.AccessPoints">The "AccessPoints" property</a>
 </dt>
-<dt id="ientry-idm45708556808240">org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.ActiveAccessPoint">The "ActiveAccessPoint" property</a>
+<dt id="ientry-idm45741752847040">org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.ActiveAccessPoint">The "ActiveAccessPoint" property</a>
 </dt>
-<dt id="ientry-idm45708556383952">org.freedesktop.NetworkManager.Device.Wireless:Bitrate, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Bitrate">The "Bitrate" property</a>
+<dt id="ientry-idm45741752855728">org.freedesktop.NetworkManager.Device.Wireless:Bitrate, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Bitrate">The "Bitrate" property</a>
 </dt>
-<dt id="ientry-idm45708556397568">org.freedesktop.NetworkManager.Device.Wireless:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45741754570560">org.freedesktop.NetworkManager.Device.Wireless:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708556798592">org.freedesktop.NetworkManager.Device.Wireless:LastScan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.LastScan">The "LastScan" property</a>
+<dt id="ientry-idm45741752686896">org.freedesktop.NetworkManager.Device.Wireless:LastScan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.LastScan">The "LastScan" property</a>
 </dt>
-<dt id="ientry-idm45708556389072">org.freedesktop.NetworkManager.Device.Wireless:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Mode">The "Mode" property</a>
+<dt id="ientry-idm45741752874272">org.freedesktop.NetworkManager.Device.Wireless:Mode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.Mode">The "Mode" property</a>
 </dt>
-<dt id="ientry-idm45708556393296">org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.PermHwAddress">The "PermHwAddress" property</a>
+<dt id="ientry-idm45741752878176">org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.PermHwAddress">The "PermHwAddress" property</a>
 </dt>
-<dt id="ientry-idm45708556803856">org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.WirelessCapabilities">The "WirelessCapabilities" property</a>
+<dt id="ientry-idm45741752691920">org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wireless.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wireless.WirelessCapabilities">The "WirelessCapabilities" property</a>
 </dt>
-<dt id="ientry-idm45708554736768">dhcp-anycast-address, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>
+<dt id="ientry-idm45741750828944">dhcp-anycast-address, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>
 </dt>
-<dt id="ientry-idm45708555037648">dhcp-client-id, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
+<dt id="ientry-idm45741751126688">dhcp-client-id, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
 </dt>
-<dt id="ientry-idm45708554940576">dhcp-duid, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751031152">dhcp-duid, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555033184">dhcp-fqdn, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
+<dt id="ientry-idm45741751122240">dhcp-fqdn, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
 </dt>
-<dt id="ientry-idm45708555029584">dhcp-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751118640">dhcp-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555026000">dhcp-send-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751115056">dhcp-send-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555022176">dhcp-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751111232">dhcp-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708563414800">org.freedesktop.NetworkManager.DHCP4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config.top_of_page">org.freedesktop.NetworkManager.DHCP4Config</a>
+<dt id="ientry-idm45741763263328">org.freedesktop.NetworkManager.DHCP4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-interface-org-freedesktop-NetworkManager-DHCP4Config.top_of_page">org.freedesktop.NetworkManager.DHCP4Config</a>
 </dt>
-<dt id="ientry-idm45708556113152">org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-signal-org-freedesktop-NetworkManager-DHCP4Config.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741751905568">org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-signal-org-freedesktop-NetworkManager-DHCP4Config.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556495104">org.freedesktop.NetworkManager.DHCP4Config:Options, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-property-org-freedesktop-NetworkManager-DHCP4Config.Options">The "Options" property</a>
+<dt id="ientry-idm45741752399504">org.freedesktop.NetworkManager.DHCP4Config:Options, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP4Config.html#gdbus-property-org-freedesktop-NetworkManager-DHCP4Config.Options">The "Options" property</a>
 </dt>
-<dt id="ientry-idm45708559234128">org.freedesktop.NetworkManager.DHCP6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-interface-org-freedesktop-NetworkManager-DHCP6Config.top_of_page">org.freedesktop.NetworkManager.DHCP6Config</a>
+<dt id="ientry-idm45741760161232">org.freedesktop.NetworkManager.DHCP6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-interface-org-freedesktop-NetworkManager-DHCP6Config.top_of_page">org.freedesktop.NetworkManager.DHCP6Config</a>
 </dt>
-<dt id="ientry-idm45708556570432">org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-signal-org-freedesktop-NetworkManager-DHCP6Config.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752549536">org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-signal-org-freedesktop-NetworkManager-DHCP6Config.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556490560">org.freedesktop.NetworkManager.DHCP6Config:Options, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-property-org-freedesktop-NetworkManager-DHCP6Config.Options">The "Options" property</a>
+<dt id="ientry-idm45741751970304">org.freedesktop.NetworkManager.DHCP6Config:Options, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.DHCP6Config.html#gdbus-property-org-freedesktop-NetworkManager-DHCP6Config.Options">The "Options" property</a>
 </dt>
-<dt id="ientry-idm45708555018688">dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751107744">dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555015120">dns-options, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751104256">dns-options, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555011392">dns-priority, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751100528">dns-priority, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708555006336">dns-search, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751095472">dns-search, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708557097936">domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755758816">domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554143936">duplex, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750251136">duplex, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>E</h3>
 <dl>
-<dt id="ientry-idm45708557093888">eap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755754768">eap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554309520">egress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45741750416656">egress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45708556955888">encapsulation, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45741755615824">encapsulation, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45708554856208">encapsulation-limit, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45741750948304">encapsulation-limit, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45708554801872">encrypt, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45741750893968">encrypt, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>F</h3>
 <dl>
-<dt id="ientry-idm45708554722208">fail-mode, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45741750814384">fail-mode, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45708553994048">fils, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750101248">fils, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708554852576">flags, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45741750944672">flags, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45708554848704">flow-label, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45741750940800">flow-label, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45708555290096">forward-delay, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751379504">forward-delay, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>G</h3>
 <dl>
-<dt id="ientry-idm45708555002608">gateway, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751091744">gateway, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708566629184">gateway-ping-timeout, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741762077600">gateway-ping-timeout, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554139488">generate-mac-address-mask, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750246688">generate-mac-address-mask, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554355104">group, <a class="indexterm" href="settings-tun.html">tun</a>, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750462176">group, <a class="indexterm" href="settings-tun.html">tun</a>, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708555286608">group-forward-mask, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751376016">group-forward-mask, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>H</h3>
 <dl>
-<dt id="ientry-idm45708555250096">hairpin-mode, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45741751339600">hairpin-mode, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
 </dt>
-<dt id="ientry-idm45708555282736">hello-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751372144">hello-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45708554059344">hidden, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750166544">hidden, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708555120416">home-only, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751210000">home-only, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>I</h3>
 <dl>
-<dt id="ientry-idm45708558410880">id, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741754553616">id, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708557089728">identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755750608">identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554999136">ignore-auto-dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751088272">ignore-auto-dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554995392">ignore-auto-routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751084528">ignore-auto-routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554297792">ingress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45741750404928">ingress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45708554845120">input-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45741750937216">input-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45708558407088">interface-name, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bond.html">bond</a>, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45741754549824">interface-name, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bond.html">bond</a>, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45708554897696">ip6-privacy, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741750988352">ip6-privacy, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>K</h3>
-<dl><dt id="ientry-idm45708553985472">key-mgmt, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dl><dt id="ientry-idm45741750092672">key-mgmt, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt></dl>
 </div>
 <div class="indexdiv">
 <h3>L</h3>
 <dl>
-<dt id="ientry-idm45708554232224">l2-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750339360">l2-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554228304">l3-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750335440">l3-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554665824">lacp, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45741750759872">lacp, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45708554387968">lacp-key, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750495104">lacp-key, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45708554384064">lacp-prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750491200">lacp-prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45708554637920">lcp-echo-failure, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750734576">lcp-echo-failure, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554633824">lcp-echo-interval, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750730832">lcp-echo-interval, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708553981504">leap-password, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750088704">leap-password, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553977696">leap-password-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750084896">leap-password-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553973904">leap-username, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750081104">leap-username, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708554224384">learning, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750331520">learning, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554220400">limit, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750327536">limit, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554459856">link-watchers, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750566432">link-watchers, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45708558403408">lldp, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741754546144">lldp, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554841616">local, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750933712">local, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>M</h3>
 <dl>
-<dt id="ientry-idm45708555275728">mac-address, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-wimax.html">wimax</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741751365136">mac-address, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-wimax.html">wimax</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554130256">mac-address-blacklist, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750237456">mac-address-blacklist, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554047504">mac-address-randomization, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750154704">mac-address-randomization, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708565418384">org.freedesktop.NetworkManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-interface-org-freedesktop-NetworkManager.top_of_page">org.freedesktop.NetworkManager</a>
+<dt id="ientry-idm45741760189952">org.freedesktop.NetworkManager, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-interface-org-freedesktop-NetworkManager.top_of_page">org.freedesktop.NetworkManager</a>
 </dt>
-<dt id="ientry-idm45708562046256">org.freedesktop.NetworkManager.ActivateConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.ActivateConnection">The ActivateConnection() method</a>
+<dt id="ientry-idm45741762948992">org.freedesktop.NetworkManager.ActivateConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.ActivateConnection">The ActivateConnection() method</a>
 </dt>
-<dt id="ientry-idm45708560940368">org.freedesktop.NetworkManager.AddAndActivateConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection">The AddAndActivateConnection() method</a>
+<dt id="ientry-idm45741761630688">org.freedesktop.NetworkManager.AddAndActivateConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection">The AddAndActivateConnection() method</a>
 </dt>
-<dt id="ientry-idm45708560926976">org.freedesktop.NetworkManager.CheckConnectivity(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity">The CheckConnectivity() method</a>
+<dt id="ientry-idm45741762615568">org.freedesktop.NetworkManager.CheckConnectivity(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckConnectivity">The CheckConnectivity() method</a>
 </dt>
-<dt id="ientry-idm45708564604560">org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointAdjustRollbackTimeout">The CheckpointAdjustRollbackTimeout() method</a>
+<dt id="ientry-idm45741762343536">org.freedesktop.NetworkManager.CheckpointAdjustRollbackTimeout(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointAdjustRollbackTimeout">The CheckpointAdjustRollbackTimeout() method</a>
 </dt>
-<dt id="ientry-idm45708558733712">org.freedesktop.NetworkManager.CheckpointCreate(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointCreate">The CheckpointCreate() method</a>
+<dt id="ientry-idm45741757198944">org.freedesktop.NetworkManager.CheckpointCreate(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointCreate">The CheckpointCreate() method</a>
 </dt>
-<dt id="ientry-idm45708567012256">org.freedesktop.NetworkManager.CheckpointDestroy(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointDestroy">The CheckpointDestroy() method</a>
+<dt id="ientry-idm45741761938400">org.freedesktop.NetworkManager.CheckpointDestroy(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointDestroy">The CheckpointDestroy() method</a>
 </dt>
-<dt id="ientry-idm45708567305728">org.freedesktop.NetworkManager.CheckpointRollback(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointRollback">The CheckpointRollback() method</a>
+<dt id="ientry-idm45741761419168">org.freedesktop.NetworkManager.CheckpointRollback(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.CheckpointRollback">The CheckpointRollback() method</a>
 </dt>
-<dt id="ientry-idm45708561407120">org.freedesktop.NetworkManager.DeactivateConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection">The DeactivateConnection() method</a>
+<dt id="ientry-idm45741763149952">org.freedesktop.NetworkManager.DeactivateConnection(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.DeactivateConnection">The DeactivateConnection() method</a>
 </dt>
-<dt id="ientry-idm45708558849520">org.freedesktop.NetworkManager.Enable(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Enable">The Enable() method</a>
+<dt id="ientry-idm45741761671088">org.freedesktop.NetworkManager.Enable(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Enable">The Enable() method</a>
 </dt>
-<dt id="ientry-idm45708560906880">org.freedesktop.NetworkManager.GetAllDevices(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetAllDevices">The GetAllDevices() method</a>
+<dt id="ientry-idm45741761905088">org.freedesktop.NetworkManager.GetAllDevices(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetAllDevices">The GetAllDevices() method</a>
 </dt>
-<dt id="ientry-idm45708558872624">org.freedesktop.NetworkManager.GetDeviceByIpIface(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface">The GetDeviceByIpIface() method</a>
+<dt id="ientry-idm45741761298880">org.freedesktop.NetworkManager.GetDeviceByIpIface(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDeviceByIpIface">The GetDeviceByIpIface() method</a>
 </dt>
-<dt id="ientry-idm45708565622400">org.freedesktop.NetworkManager.GetDevices(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDevices">The GetDevices() method</a>
+<dt id="ientry-idm45741754486000">org.freedesktop.NetworkManager.GetDevices(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetDevices">The GetDevices() method</a>
 </dt>
-<dt id="ientry-idm45708559630272">org.freedesktop.NetworkManager.GetLogging(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetLogging">The GetLogging() method</a>
+<dt id="ientry-idm45741760961504">org.freedesktop.NetworkManager.GetLogging(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetLogging">The GetLogging() method</a>
 </dt>
-<dt id="ientry-idm45708562015392">org.freedesktop.NetworkManager.GetPermissions(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetPermissions">The GetPermissions() method</a>
+<dt id="ientry-idm45741758263792">org.freedesktop.NetworkManager.GetPermissions(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.GetPermissions">The GetPermissions() method</a>
 </dt>
-<dt id="ientry-idm45708561976064">org.freedesktop.NetworkManager.Reload(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Reload">The Reload() method</a>
+<dt id="ientry-idm45741756897136">org.freedesktop.NetworkManager.Reload(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Reload">The Reload() method</a>
 </dt>
-<dt id="ientry-idm45708562008048">org.freedesktop.NetworkManager.SetLogging(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.SetLogging">The SetLogging() method</a>
+<dt id="ientry-idm45741760612544">org.freedesktop.NetworkManager.SetLogging(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.SetLogging">The SetLogging() method</a>
 </dt>
-<dt id="ientry-idm45708559792864">org.freedesktop.NetworkManager.Sleep(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Sleep">The Sleep() method</a>
+<dt id="ientry-idm45741763576320">org.freedesktop.NetworkManager.Sleep(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.Sleep">The Sleep() method</a>
 </dt>
-<dt id="ientry-idm45708560919072">org.freedesktop.NetworkManager.state(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.state">The state() method</a>
+<dt id="ientry-idm45741757247072">org.freedesktop.NetworkManager.state(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.state">The state() method</a>
 </dt>
-<dt id="ientry-idm45708558674752">org.freedesktop.NetworkManager::CheckPermissions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.CheckPermissions">The "CheckPermissions" signal</a>
+<dt id="ientry-idm45741762383584">org.freedesktop.NetworkManager::CheckPermissions, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.CheckPermissions">The "CheckPermissions" signal</a>
 </dt>
-<dt id="ientry-idm45708558662128">org.freedesktop.NetworkManager::DeviceAdded, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.DeviceAdded">The "DeviceAdded" signal</a>
+<dt id="ientry-idm45741758644336">org.freedesktop.NetworkManager::DeviceAdded, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.DeviceAdded">The "DeviceAdded" signal</a>
 </dt>
-<dt id="ientry-idm45708558654704">org.freedesktop.NetworkManager::DeviceRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.DeviceRemoved">The "DeviceRemoved" signal</a>
+<dt id="ientry-idm45741758636912">org.freedesktop.NetworkManager::DeviceRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.DeviceRemoved">The "DeviceRemoved" signal</a>
 </dt>
-<dt id="ientry-idm45708558255824">org.freedesktop.NetworkManager::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741757112320">org.freedesktop.NetworkManager::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708558670448">org.freedesktop.NetworkManager::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.StateChanged">The "StateChanged" signal</a>
+<dt id="ientry-idm45741755106192">org.freedesktop.NetworkManager::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-signal-org-freedesktop-NetworkManager.StateChanged">The "StateChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708558204640">org.freedesktop.NetworkManager:ActivatingConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ActivatingConnection">The "ActivatingConnection" property</a>
+<dt id="ientry-idm45741756906352">org.freedesktop.NetworkManager:ActivatingConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ActivatingConnection">The "ActivatingConnection" property</a>
 </dt>
-<dt id="ientry-idm45708558303216">org.freedesktop.NetworkManager:ActiveConnections, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ActiveConnections">The "ActiveConnections" property</a>
+<dt id="ientry-idm45741762466032">org.freedesktop.NetworkManager:ActiveConnections, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ActiveConnections">The "ActiveConnections" property</a>
 </dt>
-<dt id="ientry-idm45708561006912">org.freedesktop.NetworkManager:AllDevices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.AllDevices">The "AllDevices" property</a>
+<dt id="ientry-idm45741755404848">org.freedesktop.NetworkManager:AllDevices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.AllDevices">The "AllDevices" property</a>
 </dt>
-<dt id="ientry-idm45708566406208">org.freedesktop.NetworkManager:Capabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Capabilities">The "Capabilities" property</a>
+<dt id="ientry-idm45741754459200">org.freedesktop.NetworkManager:Capabilities, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Capabilities">The "Capabilities" property</a>
 </dt>
-<dt id="ientry-idm45708561002512">org.freedesktop.NetworkManager:Checkpoints, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Checkpoints">The "Checkpoints" property</a>
+<dt id="ientry-idm45741757314064">org.freedesktop.NetworkManager:Checkpoints, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Checkpoints">The "Checkpoints" property</a>
 </dt>
-<dt id="ientry-idm45708566395712">org.freedesktop.NetworkManager:Connectivity, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Connectivity">The "Connectivity" property</a>
+<dt id="ientry-idm45741754480576">org.freedesktop.NetworkManager:Connectivity, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Connectivity">The "Connectivity" property</a>
 </dt>
-<dt id="ientry-idm45708558226544">org.freedesktop.NetworkManager:ConnectivityCheckAvailable, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckAvailable">The "ConnectivityCheckAvailable" property</a>
+<dt id="ientry-idm45741754474480">org.freedesktop.NetworkManager:ConnectivityCheckAvailable, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckAvailable">The "ConnectivityCheckAvailable" property</a>
 </dt>
-<dt id="ientry-idm45708558222096">org.freedesktop.NetworkManager:ConnectivityCheckEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckEnabled">The "ConnectivityCheckEnabled" property</a>
+<dt id="ientry-idm45741759558304">org.freedesktop.NetworkManager:ConnectivityCheckEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckEnabled">The "ConnectivityCheckEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708558682512">org.freedesktop.NetworkManager:Devices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Devices">The "Devices" property</a>
+<dt id="ientry-idm45741755409248">org.freedesktop.NetworkManager:Devices, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Devices">The "Devices" property</a>
 </dt>
-<dt id="ientry-idm45708558217776">org.freedesktop.NetworkManager:GlobalDnsConfiguration, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.GlobalDnsConfiguration">The "GlobalDnsConfiguration" property</a>
+<dt id="ientry-idm45741759553984">org.freedesktop.NetworkManager:GlobalDnsConfiguration, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.GlobalDnsConfiguration">The "GlobalDnsConfiguration" property</a>
 </dt>
-<dt id="ientry-idm45708558209824">org.freedesktop.NetworkManager:Metered, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Metered">The "Metered" property</a>
+<dt id="ientry-idm45741756911536">org.freedesktop.NetworkManager:Metered, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Metered">The "Metered" property</a>
 </dt>
-<dt id="ientry-idm45708560998368">org.freedesktop.NetworkManager:NetworkingEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.NetworkingEnabled">The "NetworkingEnabled" property</a>
+<dt id="ientry-idm45741757309920">org.freedesktop.NetworkManager:NetworkingEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.NetworkingEnabled">The "NetworkingEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708558299056">org.freedesktop.NetworkManager:PrimaryConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.PrimaryConnection">The "PrimaryConnection" property</a>
+<dt id="ientry-idm45741762461872">org.freedesktop.NetworkManager:PrimaryConnection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.PrimaryConnection">The "PrimaryConnection" property</a>
 </dt>
-<dt id="ientry-idm45708558213936">org.freedesktop.NetworkManager:PrimaryConnectionType, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.PrimaryConnectionType">The "PrimaryConnectionType" property</a>
+<dt id="ientry-idm45741762457712">org.freedesktop.NetworkManager:PrimaryConnectionType, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.PrimaryConnectionType">The "PrimaryConnectionType" property</a>
 </dt>
-<dt id="ientry-idm45708559154368">org.freedesktop.NetworkManager:Startup, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Startup">The "Startup" property</a>
+<dt id="ientry-idm45741763211392">org.freedesktop.NetworkManager:Startup, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Startup">The "Startup" property</a>
 </dt>
-<dt id="ientry-idm45708566401488">org.freedesktop.NetworkManager:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.State">The "State" property</a>
+<dt id="ientry-idm45741754454480">org.freedesktop.NetworkManager:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.State">The "State" property</a>
 </dt>
-<dt id="ientry-idm45708559150240">org.freedesktop.NetworkManager:Version, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Version">The "Version" property</a>
+<dt id="ientry-idm45741763207264">org.freedesktop.NetworkManager:Version, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.Version">The "Version" property</a>
 </dt>
-<dt id="ientry-idm45708559134336">org.freedesktop.NetworkManager:WimaxEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WimaxEnabled">The "WimaxEnabled" property</a>
+<dt id="ientry-idm45741763095904">org.freedesktop.NetworkManager:WimaxEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WimaxEnabled">The "WimaxEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708558307504">org.freedesktop.NetworkManager:WimaxHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WimaxHardwareEnabled">The "WimaxHardwareEnabled" property</a>
+<dt id="ientry-idm45741763091680">org.freedesktop.NetworkManager:WimaxHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WimaxHardwareEnabled">The "WimaxHardwareEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708558465872">org.freedesktop.NetworkManager:WirelessEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WirelessEnabled">The "WirelessEnabled" property</a>
+<dt id="ientry-idm45741757140032">org.freedesktop.NetworkManager:WirelessEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WirelessEnabled">The "WirelessEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708558461648">org.freedesktop.NetworkManager:WirelessHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WirelessHardwareEnabled">The "WirelessHardwareEnabled" property</a>
+<dt id="ientry-idm45741757135808">org.freedesktop.NetworkManager:WirelessHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WirelessHardwareEnabled">The "WirelessHardwareEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708559142768">org.freedesktop.NetworkManager:WwanEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WwanEnabled">The "WwanEnabled" property</a>
+<dt id="ientry-idm45741759324848">org.freedesktop.NetworkManager:WwanEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WwanEnabled">The "WwanEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708559138624">org.freedesktop.NetworkManager:WwanHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled">The "WwanHardwareEnabled" property</a>
+<dt id="ientry-idm45741759320704">org.freedesktop.NetworkManager:WwanHardwareEnabled, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.WwanHardwareEnabled">The "WwanHardwareEnabled" property</a>
 </dt>
-<dt id="ientry-idm45708558399568">master, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741754542304">master, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708555272368">max-age, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751361776">max-age, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45708554991712">may-fail, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751080848">may-fail, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554455456">mcast-rejoin-count, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750562592">mcast-rejoin-count, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554451552">mcast-rejoin-interval, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750558688">mcast-rejoin-interval, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554718768">mcast-snooping-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45741750811024">mcast-snooping-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45708559176400">mdns, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741757801152">mdns, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708559172560">metered, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741757797312">metered, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554987760">method, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45741751076896">method, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45708554798384">mka-cak, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45741750890480">mka-cak, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45708554794928">mka-cak-flags, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45741750887024">mka-cak-flags, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45708554791568">mka-ckn, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45741750883664">mka-ckn, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45708554838128">mode, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-macvlan.html">macvlan</a>, <a class="indexterm" href="settings-tun.html">tun</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750930224">mode, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-macvlan.html">macvlan</a>, <a class="indexterm" href="settings-tun.html">tun</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554629728">mppe-stateful, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750727088">mppe-stateful, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554625776">mru, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750723488">mru, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708555231552">mtu, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741751321056">mtu, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554347264">multi-queue, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45741750454336">multi-queue, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
-<dt id="ientry-idm45708555268880">multicast-snooping, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751358288">multicast-snooping, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>N</h3>
 <dl>
-<dt id="ientry-idm45708559168720">name, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>, <a class="indexterm" href="settings-bond.html">bond</a>, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-dcb.html">dcb</a>, <a class="indexterm" href="settings-dummy.html">dummy</a>, <a class="indexterm" href="settings-generic.html">generic</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-macvlan.html">macvlan</a>, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>, <a class="indexterm" href="settings-ovs-interface.html">ovs-interface</a>, <a class="indexterm" href="settings-ovs-patch.html">ovs-patch</a>, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>, <a class="indexterm" href="settings-proxy.html">proxy</a>, <a class="indexterm" href="settings-serial.html">serial</a>, <a class="indexterm" href="settings-tc.html">tc</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>, <a class="indexterm" href="settings-tun.html">tun</a>, <a class="indexterm" href="settings-user.html">user</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vpn.html">vpn</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>, <a class="indexterm" href="settings-wimax.html">wimax</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741757793472">name, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>, <a class="indexterm" href="settings-bond.html">bond</a>, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-dcb.html">dcb</a>, <a class="indexterm" href="settings-dummy.html">dummy</a>, <a class="indexterm" href="settings-generic.html">generic</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-macvlan.html">macvlan</a>, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>, <a class="indexterm" href="settings-ovs-interface.html">ovs-interface</a>, <a class="indexterm" href="settings-ovs-patch.html">ovs-patch</a>, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>, <a class="indexterm" href="settings-proxy.html">proxy</a>, <a class="indexterm" href="settings-serial.html">serial</a>, <a class="indexterm" href="settings-tc.html">tc</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>, <a class="indexterm" href="settings-tun.html">tun</a>, <a class="indexterm" href="settings-user.html">user</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vpn.html">vpn</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>, <a class="indexterm" href="settings-wimax.html">wimax</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708555109504">network-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751199088">network-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708554164560">network-name, <a class="indexterm" href="settings-wimax.html">wimax</a>
+<dt id="ientry-idm45741750271760">network-name, <a class="indexterm" href="settings-wimax.html">wimax</a>
 </dt>
-<dt id="ientry-idm45708554980720">never-default, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751069856">never-default, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708551965856">NM80211ApFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApFlags">enum NM80211ApFlags</a>
+<dt id="ientry-idm45741747611632">NM80211ApFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApFlags">enum NM80211ApFlags</a>
 </dt>
-<dt id="ientry-idm45708551938832">NM80211ApSecurityFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApSecurityFlags">enum NM80211ApSecurityFlags</a>
+<dt id="ientry-idm45741747584608">NM80211ApSecurityFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApSecurityFlags">enum NM80211ApSecurityFlags</a>
 </dt>
-<dt id="ientry-idm45708551889056">NM80211Mode, <a class="indexterm" href="nm-dbus-types.html#NM80211Mode">enum NM80211Mode</a>
+<dt id="ientry-idm45741747534832">NM80211Mode, <a class="indexterm" href="nm-dbus-types.html#NM80211Mode">enum NM80211Mode</a>
 </dt>
-<dt id="ientry-idm45708551139760">NMActivationStateFlags, <a class="indexterm" href="nm-dbus-types.html#NMActivationStateFlags">enum NMActivationStateFlags</a>
+<dt id="ientry-idm45741746780688">NMActivationStateFlags, <a class="indexterm" href="nm-dbus-types.html#NMActivationStateFlags">enum NMActivationStateFlags</a>
 </dt>
-<dt id="ientry-idm45708551441648">NMActiveConnectionState, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionState">enum NMActiveConnectionState</a>
+<dt id="ientry-idm45741747082544">NMActiveConnectionState, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionState">enum NMActiveConnectionState</a>
 </dt>
-<dt id="ientry-idm45708551410240">NMActiveConnectionStateReason, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionStateReason">enum NMActiveConnectionStateReason</a>
+<dt id="ientry-idm45741747051136">NMActiveConnectionStateReason, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionStateReason">enum NMActiveConnectionStateReason</a>
 </dt>
-<dt id="ientry-idm45708551865232">NMBluetoothCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMBluetoothCapabilities">enum NMBluetoothCapabilities</a>
+<dt id="ientry-idm45741747511008">NMBluetoothCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMBluetoothCapabilities">enum NMBluetoothCapabilities</a>
 </dt>
-<dt id="ientry-idm45708564116048">NMCapability, <a class="indexterm" href="nm-dbus-types.html#NMCapability">enum NMCapability</a>
+<dt id="ientry-idm45741756796400">NMCapability, <a class="indexterm" href="nm-dbus-types.html#NMCapability">enum NMCapability</a>
 </dt>
-<dt id="ientry-idm45708551225104">NMCheckpointCreateFlags, <a class="indexterm" href="nm-dbus-types.html#NMCheckpointCreateFlags">enum NMCheckpointCreateFlags</a>
+<dt id="ientry-idm45741746865872">NMCheckpointCreateFlags, <a class="indexterm" href="nm-dbus-types.html#NMCheckpointCreateFlags">enum NMCheckpointCreateFlags</a>
 </dt>
-<dt id="ientry-idm45708553420064">NMConnectivityState, <a class="indexterm" href="nm-dbus-types.html#NMConnectivityState">enum NMConnectivityState</a>
+<dt id="ientry-idm45741749694608">NMConnectivityState, <a class="indexterm" href="nm-dbus-types.html#NMConnectivityState">enum NMConnectivityState</a>
 </dt>
-<dt id="ientry-idm45708553266064">NMDeviceCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceCapabilities">enum NMDeviceCapabilities</a>
+<dt id="ientry-idm45741749541136">NMDeviceCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceCapabilities">enum NMDeviceCapabilities</a>
 </dt>
-<dt id="ientry-idm45708551845232">NMDeviceModemCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceModemCapabilities">enum NMDeviceModemCapabilities</a>
+<dt id="ientry-idm45741747491008">NMDeviceModemCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceModemCapabilities">enum NMDeviceModemCapabilities</a>
 </dt>
-<dt id="ientry-idm45708551794208">NMDeviceState, <a class="indexterm" href="nm-dbus-types.html#NMDeviceState">enum NMDeviceState</a>
+<dt id="ientry-idm45741747439984">NMDeviceState, <a class="indexterm" href="nm-dbus-types.html#NMDeviceState">enum NMDeviceState</a>
 </dt>
-<dt id="ientry-idm45708551736368">NMDeviceStateReason, <a class="indexterm" href="nm-dbus-types.html#NMDeviceStateReason">enum NMDeviceStateReason</a>
+<dt id="ientry-idm45741747382144">NMDeviceStateReason, <a class="indexterm" href="nm-dbus-types.html#NMDeviceStateReason">enum NMDeviceStateReason</a>
 </dt>
-<dt id="ientry-idm45708553389632">NMDeviceType, <a class="indexterm" href="nm-dbus-types.html#NMDeviceType">enum NMDeviceType</a>
+<dt id="ientry-idm45741749664608">NMDeviceType, <a class="indexterm" href="nm-dbus-types.html#NMDeviceType">enum NMDeviceType</a>
 </dt>
-<dt id="ientry-idm45708553235424">NMDeviceWifiCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceWifiCapabilities">enum NMDeviceWifiCapabilities</a>
+<dt id="ientry-idm45741749510496">NMDeviceWifiCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceWifiCapabilities">enum NMDeviceWifiCapabilities</a>
 </dt>
-<dt id="ientry-idm45708551277152">NMIPTunnelMode, <a class="indexterm" href="nm-dbus-types.html#NMIPTunnelMode">enum NMIPTunnelMode</a>
+<dt id="ientry-idm45741746917920">NMIPTunnelMode, <a class="indexterm" href="nm-dbus-types.html#NMIPTunnelMode">enum NMIPTunnelMode</a>
 </dt>
-<dt id="ientry-idm45708551472320">NMMetered, <a class="indexterm" href="nm-dbus-types.html#NMMetered">enum NMMetered</a>
+<dt id="ientry-idm45741747113280">NMMetered, <a class="indexterm" href="nm-dbus-types.html#NMMetered">enum NMMetered</a>
 </dt>
-<dt id="ientry-idm45708551193936">NMRollbackResult, <a class="indexterm" href="nm-dbus-types.html#NMRollbackResult">enum NMRollbackResult</a>
+<dt id="ientry-idm45741746834640">NMRollbackResult, <a class="indexterm" href="nm-dbus-types.html#NMRollbackResult">enum NMRollbackResult</a>
 </dt>
-<dt id="ientry-idm45708551295856">NMSecretAgentCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentCapabilities">enum NMSecretAgentCapabilities</a>
+<dt id="ientry-idm45741746936688">NMSecretAgentCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentCapabilities">enum NMSecretAgentCapabilities</a>
 </dt>
-<dt id="ientry-idm45708551336224">NMSecretAgentGetSecretsFlags, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags">enum NMSecretAgentGetSecretsFlags</a>
+<dt id="ientry-idm45741746977056">NMSecretAgentGetSecretsFlags, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags">enum NMSecretAgentGetSecretsFlags</a>
 </dt>
-<dt id="ientry-idm45708551167104">NMSettingsConnectionFlags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsConnectionFlags">enum NMSettingsConnectionFlags</a>
+<dt id="ientry-idm45741746807744">NMSettingsConnectionFlags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsConnectionFlags">enum NMSettingsConnectionFlags</a>
 </dt>
-<dt id="ientry-idm45708551100160">NMSettingsUpdate2Flags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsUpdate2Flags">enum NMSettingsUpdate2Flags</a>
+<dt id="ientry-idm45741746741024">NMSettingsUpdate2Flags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsUpdate2Flags">enum NMSettingsUpdate2Flags</a>
 </dt>
-<dt id="ientry-idm45708556325024">NMState, <a class="indexterm" href="nm-dbus-types.html#NMState">enum NMState</a>
+<dt id="ientry-idm45741747739088">NMState, <a class="indexterm" href="nm-dbus-types.html#NMState">enum NMState</a>
 </dt>
-<dt id="ientry-idm45708556298864">NMVpnConnectionState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionState">enum NMVpnConnectionState</a>
+<dt id="ientry-idm45741749732672">NMVpnConnectionState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionState">enum NMVpnConnectionState</a>
 </dt>
-<dt id="ientry-idm45708553010512">NMVpnConnectionStateReason, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionStateReason">enum NMVpnConnectionStateReason</a>
+<dt id="ientry-idm45741749221920">NMVpnConnectionStateReason, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionStateReason">enum NMVpnConnectionStateReason</a>
 </dt>
-<dt id="ientry-idm45708552951520">NMVpnPluginFailure, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnPluginFailure">enum NMVpnPluginFailure</a>
+<dt id="ientry-idm45741749162928">NMVpnPluginFailure, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnPluginFailure">enum NMVpnPluginFailure</a>
 </dt>
-<dt id="ientry-idm45708562815200">NMVpnServiceState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnServiceState">enum NMVpnServiceState</a>
+<dt id="ientry-idm45741757742784">NMVpnServiceState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnServiceState">enum NMVpnServiceState</a>
 </dt>
-<dt id="ientry-idm45708551817472">NMWimaxNspNetworkType, <a class="indexterm" href="nm-dbus-types.html#NMWimaxNspNetworkType">enum NMWimaxNspNetworkType</a>
+<dt id="ientry-idm45741747463248">NMWimaxNspNetworkType, <a class="indexterm" href="nm-dbus-types.html#NMWimaxNspNetworkType">enum NMWimaxNspNetworkType</a>
 </dt>
-<dt id="ientry-idm45708554613792">no-vj-comp, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750712560">no-vj-comp, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554609872">noauth, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750709072">noauth, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554605808">nobsdcomp, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750705360">nobsdcomp, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554601904">nodeflate, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750701872">nodeflate, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554443616">notify-peers-count, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750550752">notify-peers-count, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554439712">notify-peers-interval, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750546848">notify-peers-interval, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708555224256">number, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751313760">number, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>O</h3>
 <dl>
-<dt id="ientry-idm45708555301232">options, <a class="indexterm" href="settings-bond.html">bond</a>
+<dt id="ientry-idm45741751390640">options, <a class="indexterm" href="settings-bond.html">bond</a>
 </dt>
-<dt id="ientry-idm45708554827216">output-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45741750919312">output-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45708554339184">owner, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45741750446256">owner, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>P</h3>
 <dl>
-<dt id="ientry-idm45708555063136">p-key, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
+<dt id="ientry-idm45741751152720">p-key, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
 </dt>
-<dt id="ientry-idm45708557082016">pac-file, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755742896">pac-file, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554525376">pac-script, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45741750631936">pac-script, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45708554521648">pac-url, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45741750628208">pac-url, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45708553966032">pairwise, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750073232">pairwise, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708555059408">parent, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-macvlan.html">macvlan</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741751148992">parent, <a class="indexterm" href="settings-infiniband.html">infiniband</a>, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-macvlan.html">macvlan</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554500960">parity, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45741750607600">parity, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45708557078336">password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
+<dt id="ientry-idm45741755739216">password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
 </dt>
-<dt id="ientry-idm45708557074656">password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
+<dt id="ientry-idm45741755735536">password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
 </dt>
-<dt id="ientry-idm45708557071008">password-raw, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755731840">password-raw, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557067072">password-raw-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755727904">password-raw-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708555242784">path-cost, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45741751332288">path-cost, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
 </dt>
-<dt id="ientry-idm45708554820160">path-mtu-discovery, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45741750912256">path-mtu-discovery, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45708554685584">peer, <a class="indexterm" href="settings-ovs-patch.html">ovs-patch</a>
+<dt id="ientry-idm45741750777840">peer, <a class="indexterm" href="settings-ovs-patch.html">ovs-patch</a>
 </dt>
-<dt id="ientry-idm45708559164688">permissions, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741757789632">permissions, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554269024">persistent, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45741750376160">persistent, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45708557063424">phase1-auth-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755724208">phase1-auth-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557059232">phase1-fast-provisioning, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755719968">phase1-fast-provisioning, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557055232">phase1-peaplabel, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755715872">phase1-peaplabel, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557051552">phase1-peapver, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755712192">phase1-peapver, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557047488">phase2-altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755708128">phase2-altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557043344">phase2-auth, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755703984">phase2-auth, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557039664">phase2-autheap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755700304">phase2-autheap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557035984">phase2-ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755696624">phase2-ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557032304">phase2-ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755692240">phase2-ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557028416">phase2-ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755688352">phase2-ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557024688">phase2-ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755684624">phase2-ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557020800">phase2-client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755680736">phase2-client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557016400">phase2-client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755676336">phase2-client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557012464">phase2-client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755672400">phase2-client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557008720">phase2-domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755668656">phase2-domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557005008">phase2-private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755664944">phase2-private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708557000224">phase2-private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755660160">phase2-private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708556996304">phase2-private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755656240">phase2-private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708556992480">phase2-subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755652416">phase2-subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554335392">pi, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45741750442464">pi, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
-<dt id="ientry-idm45708556988416">pin, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741755648352">pin, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708556984736">pin-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741755644672">pin-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708553961920">pmf, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750069120">pmf, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708554777216">port, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750869312">port, <a class="indexterm" href="settings-macsec.html">macsec</a>, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708554031760">powersave, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750138960">powersave, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708563173920">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>
+<dt id="ientry-idm45741761339120">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>
 </dt>
-<dt id="ientry-idm45708555892528">org.freedesktop.NetworkManager.PPP.NeedSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets">The NeedSecrets() method</a>
+<dt id="ientry-idm45741752704400">org.freedesktop.NetworkManager.PPP.NeedSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.NeedSecrets">The NeedSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708556864208">org.freedesktop.NetworkManager.PPP.SetIfindex(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetIfindex">The SetIfindex() method</a>
+<dt id="ientry-idm45741752716992">org.freedesktop.NetworkManager.PPP.SetIfindex(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetIfindex">The SetIfindex() method</a>
 </dt>
-<dt id="ientry-idm45708555906096">org.freedesktop.NetworkManager.PPP.SetIp4Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config">The SetIp4Config() method</a>
+<dt id="ientry-idm45741752869200">org.freedesktop.NetworkManager.PPP.SetIp4Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp4Config">The SetIp4Config() method</a>
 </dt>
-<dt id="ientry-idm45708556368448">org.freedesktop.NetworkManager.PPP.SetIp6Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config">The SetIp6Config() method</a>
+<dt id="ientry-idm45741752674960">org.freedesktop.NetworkManager.PPP.SetIp6Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetIp6Config">The SetIp6Config() method</a>
 </dt>
-<dt id="ientry-idm45708556871072">org.freedesktop.NetworkManager.PPP.SetState(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetState">The SetState() method</a>
+<dt id="ientry-idm45741752723856">org.freedesktop.NetworkManager.PPP.SetState(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.PPP.html#gdbus-method-org-freedesktop-NetworkManager-PPP.SetState">The SetState() method</a>
 </dt>
-<dt id="ientry-idm45708554371728">prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750478864">prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45708555261488">priority, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45741751350896">priority, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
 </dt>
-<dt id="ientry-idm45708555177232">priority-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751266736">priority-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555173424">priority-flow-control, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751262928">priority-flow-control, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555169728">priority-flow-control-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751259232">priority-flow-control-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555166144">priority-group-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751255648">priority-group-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555162384">priority-group-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751251888">priority-group-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555158816">priority-group-id, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751248320">priority-group-id, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555155104">priority-strict-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751244608">priority-strict-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708555151312">priority-traffic-class, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45741751240896">priority-traffic-class, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45708556981040">private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755640976">private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708556976048">private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755635984">private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708556972160">private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755632096">private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708554751472">promiscuous, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
+<dt id="ientry-idm45741750843568">promiscuous, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
 </dt>
-<dt id="ientry-idm45708553957504">proto, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750064704">proto, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708556940800">protocol, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45741755600736">protocol, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45708554204864">proxy, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750312000">proxy, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708553953440">psk, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750060640">psk, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553949344">psk-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750056544">psk-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>Q</h3>
 <dl>
-<dt id="ientry-idm45708554480320">qdiscs, <a class="indexterm" href="settings-tc.html">tc</a>
+<dt id="ientry-idm45741750586960">qdiscs, <a class="indexterm" href="settings-tc.html">tc</a>
 </dt>
-<dt id="ientry-idm45708554367824">queue-id, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750474960">queue-id, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
-<dt id="ientry-idm45708554027536">rate, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750134736">rate, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708557173808">read-only, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741755834784">read-only, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554598000">refuse-chap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750698384">refuse-chap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554594080">refuse-eap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750694896">refuse-eap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554590160">refuse-mschap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750691408">refuse-mschap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554586240">refuse-mschapv2, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750687920">refuse-mschapv2, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554582320">refuse-pap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750684432">refuse-pap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554816672">remote, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750908768">remote, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554578400">require-mppe, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750680944">require-mppe, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554574320">require-mppe-128, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45741750677216">require-mppe-128, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45708554977072">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751066208">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554973200">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751062848">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554969168">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751058816">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554964752">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741751055328">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554197056">rsc, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750304192">rsc, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554711600">rstp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45741750803856">rstp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45708554435808">runner, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750542944">runner, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554431600">runner-active, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750538736">runner-active, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554427696">runner-agg-select-policy, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750534832">runner-agg-select-policy, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554423920">runner-fast-rate, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750531056">runner-fast-rate, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554420016">runner-hwaddr-policy, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750527152">runner-hwaddr-policy, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554416272">runner-min-ports, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750523408">runner-min-ports, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554412368">runner-sys-prio, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750519504">runner-sys-prio, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554408464">runner-tx-balancer, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750515600">runner-tx-balancer, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554404704">runner-tx-balancer-interval, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750511840">runner-tx-balancer-interval, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45708554400768">runner-tx-hash, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45741750507904">runner-tx-hash, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>S</h3>
 <dl>
-<dt id="ientry-idm45708554114192">s390-nettype, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750221392">s390-nettype, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708554110352">s390-options, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750217552">s390-options, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708554106224">s390-subchannels, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750213424">s390-subchannels, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708557169776">secondaries, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741755830752">secondaries, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554264992">secrets, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45741750372128">secrets, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45708554023424">security, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750130624">security, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554019488">seen-bssids, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750126688">seen-bssids, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708554497152">send-delay, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45741750603792">send-delay, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45708554773632">send-sci, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45741750865728">send-sci, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45708554549904">service, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
+<dt id="ientry-idm45741750655344">service, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
 </dt>
-<dt id="ientry-idm45708554260992">service-type, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45741750368128">service-type, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45708555088976">sim-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751178560">sim-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708555085360">sim-operator-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45741751174944">sim-operator-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45708557165776">slave-type, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741755826752">slave-type, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554193152">source-port-max, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750300288">source-port-max, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554189200">source-port-min, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750296336">source-port-min, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554102384">speed, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750209584">speed, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708554729728">ssid, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750821904">ssid, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708557161952">stable-id, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741755822928">stable-id, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554363856">sticky, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45741750470992">sticky, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45708554493232">stopbits, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45741750599872">stopbits, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45708555257840">stp, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45741751347248">stp, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45708554708112">stp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45741750800368">stp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45708556968432">subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755628368">subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45708556964416">system-ca-certs, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45741755624352">system-ca-certs, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>T</h3>
 <dl>
-<dt id="ientry-idm45708554658176">tag, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45741750752832">tag, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45708554747904">tap, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
+<dt id="ientry-idm45741750840080">tap, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
 </dt>
-<dt id="ientry-idm45708554476432">tfilters, <a class="indexterm" href="settings-tc.html">tc</a>
+<dt id="ientry-idm45741750583072">tfilters, <a class="indexterm" href="settings-tc.html">tc</a>
 </dt>
-<dt id="ientry-idm45708554257152">timeout, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45741750364288">timeout, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45708557156384">timestamp, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741755817360">timestamp, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45708554863888">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45741750955984">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45708554813216">tos, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750905312">tos, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708555055840">transport-mode, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
+<dt id="ientry-idm45741751145424">transport-mode, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
 </dt>
-<dt id="ientry-idm45708554809632">ttl, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45741750901728">ttl, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45708554011872">tx-power, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750119072">tx-power, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708557152176">type, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>, <a class="indexterm" href="settings-ovs-interface.html">ovs-interface</a>
+<dt id="ientry-idm45741755813152">type, <a class="indexterm" href="settings-connection.html">connection</a>, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>, <a class="indexterm" href="settings-ovs-interface.html">ovs-interface</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>U</h3>
 <dl>
-<dt id="ientry-idm45708554253024">user-name, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45741750360160">user-name, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45708556937120">username, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
+<dt id="ientry-idm45741755597056">username, <a class="indexterm" href="settings-adsl.html">adsl</a>, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
 </dt>
-<dt id="ientry-idm45708557148128">uuid, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45741755809104">uuid, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>V</h3>
 <dl>
-<dt id="ientry-idm45708554770048">validation, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45741750862144">validation, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45708556933440">vci, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45741755593376">vci, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45708554654288">vlan-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45741750749344">vlan-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45708554331440">vnet-hdr, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45741750438512">vnet-hdr, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
-<dt id="ientry-idm45708556929568">vpi, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45741755589504">vpi, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45708563906832">org.freedesktop.NetworkManager.VPN.Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-interface-org-freedesktop-NetworkManager-VPN-Connection.top_of_page">org.freedesktop.NetworkManager.VPN.Connection</a>
+<dt id="ientry-idm45741757171488">org.freedesktop.NetworkManager.VPN.Connection, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-interface-org-freedesktop-NetworkManager-VPN-Connection.top_of_page">org.freedesktop.NetworkManager.VPN.Connection</a>
 </dt>
-<dt id="ientry-idm45708556766160">org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.PropertiesChanged">The "PropertiesChanged" signal</a>
+<dt id="ientry-idm45741752562960">org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.PropertiesChanged">The "PropertiesChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556749840">org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.VpnStateChanged">The "VpnStateChanged" signal</a>
+<dt id="ientry-idm45741752555616">org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Connection.VpnStateChanged">The "VpnStateChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708556459520">org.freedesktop.NetworkManager.VPN.Connection:Banner, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.Banner">The "Banner" property</a>
+<dt id="ientry-idm45741752630896">org.freedesktop.NetworkManager.VPN.Connection:Banner, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.Banner">The "Banner" property</a>
 </dt>
-<dt id="ientry-idm45708556443280">org.freedesktop.NetworkManager.VPN.Connection:VpnState, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.VpnState">The "VpnState" property</a>
+<dt id="ientry-idm45741752345888">org.freedesktop.NetworkManager.VPN.Connection:VpnState, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Connection.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Connection.VpnState">The "VpnState" property</a>
 </dt>
-<dt id="ientry-idm45708564816464">org.freedesktop.NetworkManager.VPN.Plugin, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin.top_of_page">org.freedesktop.NetworkManager.VPN.Plugin</a>
+<dt id="ientry-idm45741761643552">org.freedesktop.NetworkManager.VPN.Plugin, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-interface-org-freedesktop-NetworkManager-VPN-Plugin.top_of_page">org.freedesktop.NetworkManager.VPN.Plugin</a>
 </dt>
-<dt id="ientry-idm45708556185120">org.freedesktop.NetworkManager.VPN.Plugin.Connect(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect">The Connect() method</a>
+<dt id="ientry-idm45741751842672">org.freedesktop.NetworkManager.VPN.Plugin.Connect(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Connect">The Connect() method</a>
 </dt>
-<dt id="ientry-idm45708556665072">org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive">The ConnectInteractive() method</a>
+<dt id="ientry-idm45741749814944">org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.ConnectInteractive">The ConnectInteractive() method</a>
 </dt>
-<dt id="ientry-idm45708556235792">org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect">The Disconnect() method</a>
+<dt id="ientry-idm45741752253360">org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.Disconnect">The Disconnect() method</a>
 </dt>
-<dt id="ientry-idm45708556654768">org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets">The NeedSecrets() method</a>
+<dt id="ientry-idm45741749804624">org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NeedSecrets">The NeedSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708553586912">org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets">The NewSecrets() method</a>
+<dt id="ientry-idm45741749799968">org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.NewSecrets">The NewSecrets() method</a>
 </dt>
-<dt id="ientry-idm45708556231680">org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig">The SetConfig() method</a>
+<dt id="ientry-idm45741752249200">org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetConfig">The SetConfig() method</a>
 </dt>
-<dt id="ientry-idm45708556209040">org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure">The SetFailure() method</a>
+<dt id="ientry-idm45741749709408">org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetFailure">The SetFailure() method</a>
 </dt>
-<dt id="ientry-idm45708556224224">org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config">The SetIp4Config() method</a>
+<dt id="ientry-idm45741749724592">org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp4Config">The SetIp4Config() method</a>
 </dt>
-<dt id="ientry-idm45708556216624">org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config">The SetIp6Config() method</a>
+<dt id="ientry-idm45741749716992">org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-method-org-freedesktop-NetworkManager-VPN-Plugin.SetIp6Config">The SetIp6Config() method</a>
 </dt>
-<dt id="ientry-idm45708553559168">org.freedesktop.NetworkManager.VPN.Plugin::Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Config">The "Config" signal</a>
+<dt id="ientry-idm45741749772304">org.freedesktop.NetworkManager.VPN.Plugin::Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Config">The "Config" signal</a>
 </dt>
-<dt id="ientry-idm45708553529184">org.freedesktop.NetworkManager.VPN.Plugin::Failure, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Failure">The "Failure" signal</a>
+<dt id="ientry-idm45741747703328">org.freedesktop.NetworkManager.VPN.Plugin::Failure, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Failure">The "Failure" signal</a>
 </dt>
-<dt id="ientry-idm45708553551632">org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip4Config">The "Ip4Config" signal</a>
+<dt id="ientry-idm45741747725776">org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip4Config">The "Ip4Config" signal</a>
 </dt>
-<dt id="ientry-idm45708553544192">org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip6Config">The "Ip6Config" signal</a>
+<dt id="ientry-idm45741747718336">org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.Ip6Config">The "Ip6Config" signal</a>
 </dt>
-<dt id="ientry-idm45708553536736">org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.LoginBanner">The "LoginBanner" signal</a>
+<dt id="ientry-idm45741747710880">org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.LoginBanner">The "LoginBanner" signal</a>
 </dt>
-<dt id="ientry-idm45708553569520">org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.SecretsRequired">The "SecretsRequired" signal</a>
+<dt id="ientry-idm45741749782656">org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.SecretsRequired">The "SecretsRequired" signal</a>
 </dt>
-<dt id="ientry-idm45708553577712">org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.StateChanged">The "StateChanged" signal</a>
+<dt id="ientry-idm45741749790848">org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-signal-org-freedesktop-NetworkManager-VPN-Plugin.StateChanged">The "StateChanged" signal</a>
 </dt>
-<dt id="ientry-idm45708553519104">org.freedesktop.NetworkManager.VPN.Plugin:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Plugin.State">The "State" property</a>
+<dt id="ientry-idm45741747693248">org.freedesktop.NetworkManager.VPN.Plugin:State, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html#gdbus-property-org-freedesktop-NetworkManager-VPN-Plugin.State">The "State" property</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>W</h3>
 <dl>
-<dt id="ientry-idm45708554097792">wake-on-lan, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750204992">wake-on-lan, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708554093376">wake-on-lan-password, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45741750200576">wake-on-lan-password, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45708554007808">wake-on-wlan, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45741750115008">wake-on-wlan, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45708553945632">wep-key-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750052832">wep-key-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553941808">wep-key-type, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750049008">wep-key-type, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553937728">wep-key0, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750044928">wep-key0, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553933872">wep-key1, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750041072">wep-key1, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553930016">wep-key2, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750037216">wep-key2, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553926160">wep-key3, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750033360">wep-key3, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553922304">wep-tx-keyidx, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750029504">wep-tx-keyidx, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45708553918176">wps-method, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45741750025376">wps-method, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>Z</h3>
-<dl><dt id="ientry-idm45708557143872">zone, <a class="indexterm" href="settings-connection.html">connection</a>
+<dl><dt id="ientry-idm45741755804848">zone, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt></dl>
 </div>
 </div>
diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html
index 99cc039b..74a1d06f 100644
--- a/docs/api/html/nm-openvswitch.html
+++ b/docs/api/html/nm-openvswitch.html
@@ -100,9 +100,9 @@
 <div class="example-contents">
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-bridge conn.interface bridge0</code></strong>
 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
-<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port0 conn.master bridge0</code></strong>
+<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port0 master bridge0</code></strong>
 Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added.
-<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-interface conn.interface iface0 conn.master port0 \
+<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-interface conn.interface iface0 master port0 \
   ipv4.method manual ipv4.address 192.0.2.1/24</code></strong>
 Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added.
 </pre>
@@ -115,9 +115,9 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success
 <br class="example-break"><div class="example">
 <a name="id-1.2.11.5.3"></a><p class="title"><b>Example 15. Adding a Linux interface to a Bridge</b></p>
 <div class="example-contents">
-<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port1 conn.master bridge0</code></strong>
+<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port1 master bridge0</code></strong>
 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
-<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth0 conn.master port1</code></strong>
+<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth0 master port1</code></strong>
 Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added.
 </pre>
 <p>Again, you need a port.</p>
@@ -126,9 +126,9 @@ Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully
 <br class="example-break"><div class="example">
 <a name="id-1.2.11.5.4"></a><p class="title"><b>Example 16. Creating a VLAN</b></p>
 <div class="example-contents">
-<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120</code></strong>
+<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120</code></strong>
 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
-<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth1 conn.master port2</code></strong>
+<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth1 master port2</code></strong>
 Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added.
 </pre>
 <p>It's just a port with a tag.</p>
@@ -137,11 +137,11 @@ Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully
 <br class="example-break"><div class="example">
 <a name="id-1.2.11.5.5"></a><p class="title"><b>Example 17. Creating a Bond</b></p>
 <div class="example-contents">
-<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface bond0 conn.master bridge0</code></strong>
+<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface bond0 master bridge0</code></strong>
 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
-<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth2 conn.master bond0</code></strong>
+<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth2 master bond0</code></strong>
 Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added.
-<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth3 conn.master bond0</code></strong>
+<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth3 master bond0</code></strong>
 Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added.
 </pre>
 <p>It's just a Port with multiple interfaces. See nm-settings manual for
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 722b55ac..2b9aa0ca 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -1385,7 +1385,7 @@
 <a name="nm-settings.property.ipv4.dhcp-client-id"></a>dhcp-client-id</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
+<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
 </tr>
 <tr>
 <td align="left">
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
index 08a6ec7e..d1cd3398 100644
--- a/docs/api/html/settings-ipv4.html
+++ b/docs/api/html/settings-ipv4.html
@@ -75,7 +75,7 @@
 <td><pre class="screen">dhcp-client-id</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
+<td>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</td>
 </tr>
 <tr>
 <td><pre class="screen">dhcp-fqdn</pre></td>
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 703871e2..271313f0 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -199,7 +199,7 @@
     <row><entry><screen>address-data<indexterm zone="settings-ipv4"><primary sortas="address-data">address-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry>Array of IPv4 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<indexterm zone="settings-ipv4"><primary sortas="addresses">addresses</primary></indexterm></screen></entry><entry><screen>array of array of uint32</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 IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.</entry></row>
     <row><entry><screen>dad-timeout<indexterm zone="settings-ipv4"><primary sortas="dad-timeout">dad-timeout</primary></indexterm></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 zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.</entry></row>
-    <row><entry><screen>dhcp-client-id<indexterm zone="settings-ipv4"><primary sortas="dhcp-client-id">dhcp-client-id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
+    <row><entry><screen>dhcp-client-id<indexterm zone="settings-ipv4"><primary sortas="dhcp-client-id">dhcp-client-id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
     <row><entry><screen>dhcp-fqdn<indexterm zone="settings-ipv4"><primary sortas="dhcp-fqdn">dhcp-fqdn</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row>
     <row><entry><screen>dhcp-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname">dhcp-hostname</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>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.</entry></row>
     <row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv4"><primary sortas="dhcp-send-hostname">dhcp-send-hostname</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.</entry></row>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 6b89d58f..89c881bc 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.12.2
+1.12.4
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 3ec17351..406e92bf 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-flags" title="nm_access_point_get_flags ()">nm_access_point_get_flags</a> <span class="c_punctuation">()</span>
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-wpa-flags" title="nm_access_point_get_wpa_flags ()">nm_access_point_get_wpa_flags</a> <span class="c_punctuation">()</span>
@@ -67,7 +67,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-rsn-flags" title="nm_access_point_get_rsn_flags ()">nm_access_point_get_rsn_flags</a> <span class="c_punctuation">()</span>
@@ -97,7 +97,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMAccessPoint.html#nm-access-point-get-mode" title="nm_access_point_get_mode ()">nm_access_point_get_mode</a> <span class="c_punctuation">()</span>
@@ -327,7 +327,7 @@ nm_access_point_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/htm
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-flags"></a><h3>nm_access_point_get_flags ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApFlags"><span class="returnvalue">NM80211ApFlags</span></a>
 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">
@@ -353,7 +353,7 @@ nm_access_point_get_flags (<em class="parameter"><code><a class="link" href="NMA
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-wpa-flags"></a><h3>nm_access_point_get_wpa_flags ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 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">
@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-rsn-flags"></a><h3>nm_access_point_get_rsn_flags ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211ApSecurityFlags"><span class="returnvalue">NM80211ApSecurityFlags</span></a>
 nm_access_point_get_rsn_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 RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.</p>
@@ -486,7 +486,7 @@ nm_access_point_get_frequency (<em class="parameter"><code><a class="link" href=
 <hr>
 <div class="refsect2">
 <a name="nm-access-point-get-mode"></a><h3>nm_access_point_get_mode ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 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">
@@ -622,7 +622,7 @@ filter that list with this function.</p>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
 <td class="parameter_description"><p>a list of
-<span class="type">NMConnection</span> objects to filter. </p></td>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects 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>
@@ -631,7 +631,7 @@ filter that list with this function.</p>
 <div class="refsect3">
 <a name="nm-access-point-filter-connections.returns"></a><h4>Returns</h4>
 <p>a
-list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>ap</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>ap</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -644,7 +644,7 @@ be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Lin
 <a name="nm-access-point-connection-valid"></a><h3>nm_access_point_connection_valid ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 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><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -667,7 +667,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>ap</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>ap</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 89ab0c68..b5621a85 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -93,7 +93,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMActiveConnection.html#nm-active-connection-get-state" title="nm_active_connection_get_state ()">nm_active_connection_get_state</a> <span class="c_punctuation">()</span>
@@ -386,7 +386,7 @@ nm_active_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-do
 <a name="nm-active-connection-get-connection"></a><h3>nm_active_connection_get_connection ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 nm_active_connection_get_connection (<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 <span class="type">NMConnection</span>'s DBus object path.  This is often used with
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s DBus object path.  This is often used with
 <a class="link" href="NMRemoteSettings.html#nm-remote-settings-get-connection-by-path" title="nm_remote_settings_get_connection_by_path ()"><code class="function">nm_remote_settings_get_connection_by_path()</code></a> to retrieve the
 <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object that describes the connection.</p>
 <div class="refsect3">
@@ -406,7 +406,7 @@ nm_active_connection_get_connection (<em class="parameter"><code><a class="link"
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-connection.returns"></a><h4>Returns</h4>
-<p> the object path of the <span class="type">NMConnection</span> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
+<p> the object path of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> which this <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.</p>
 </div>
@@ -416,7 +416,7 @@ connection, and must not be modified.</p>
 <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 <span class="type">NMConnection</span>'s ID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s ID.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-id.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -434,7 +434,7 @@ nm_active_connection_get_id (<em class="parameter"><code><a class="link" href="N
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-id.returns"></a><h4>Returns</h4>
-<p> the ID of the <span class="type">NMConnection</span> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the ID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
 <p class="since">Since: 0.9.10</p>
@@ -444,7 +444,7 @@ 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 <span class="type">NMConnection</span>'s UUID.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s UUID.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-uuid.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-uuid.returns"></a><h4>Returns</h4>
-<p> the UUID of the <span class="type">NMConnection</span> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the UUID of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -472,7 +472,7 @@ 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 <span class="type">NMConnection</span>'s type.</p>
+<p>Gets the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a>'s type.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-connection-type.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-connection-type.returns"></a><h4>Returns</h4>
-<p> the type of the <span class="type">NMConnection</span> that backs the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>.
+<p> the type of the <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
 <p class="since">Since: 0.9.10</p>
@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-active-connection-get-state"></a><h3>nm_active_connection_get_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMActiveConnectionState"><span class="returnvalue">NMActiveConnectionState</span></a>
 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">
@@ -655,7 +655,7 @@ nm_active_connection_get_ip4_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="nm-active-connection-get-ip4-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMIP4Config.html" title="NMIP4Config"><span class="type">NMIP4Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
-connection is not in the <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
+connection is not in the <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.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>
 </div>
@@ -687,7 +687,7 @@ nm_active_connection_get_dhcp4_config (<em class="parameter"><code><a class="lin
 <a name="nm-active-connection-get-dhcp4-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config"><span class="type">NMDHCP4Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 connection does not use DHCP, or is not in the
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.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>
 </div>
 <p class="since">Since: 0.9.10</p>
@@ -743,7 +743,7 @@ nm_active_connection_get_ip6_config (<em class="parameter"><code><a class="link"
 <div class="refsect3">
 <a name="nm-active-connection-get-ip6-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMIP6Config.html" title="NMIP6Config"><span class="type">NMIP6Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
-connection is not in the <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a>
+connection is not in the <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.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>
 </div>
@@ -775,7 +775,7 @@ nm_active_connection_get_dhcp6_config (<em class="parameter"><code><a class="lin
 <a name="nm-active-connection-get-dhcp6-config.returns"></a><h4>Returns</h4>
 <p>the <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config"><span class="type">NMDHCP6Config</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 connection does not use DHCPv6, or is not in the
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM-ACTIVE-CONNECTION-STATE-ACTIVATED:CAPS"><code class="literal">NM_ACTIVE_CONNECTION_STATE_ACTIVATED</code></a> state. </p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.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>
 </div>
 <p class="since">Since: 0.9.10</p>
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 3e3e7a07..d6d70258 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -241,7 +241,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMState"><span class="returnvalue">NMState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-get-state" title="nm_client_get_state ()">nm_client_get_state</a> <span class="c_punctuation">()</span>
@@ -304,7 +304,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-get-connectivity" title="nm_client_get_connectivity ()">nm_client_get_connectivity</a> <span class="c_punctuation">()</span>
@@ -312,7 +312,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()">nm_client_check_connectivity</a> <span class="c_punctuation">()</span>
@@ -328,7 +328,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMClient.html#nm-client-check-connectivity-finish" title="nm_client_check_connectivity_finish ()">nm_client_check_connectivity_finish</a> <span class="c_punctuation">()</span>
@@ -861,7 +861,7 @@ or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#
 <a name="nm-client-activate-connection"></a><h3>nm_client_activate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_activate_connection (<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><span class="type">NMConnection</span> *connection</code></em>,
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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><a class="link" href="NMClient.html#NMClientActivateFn" title="NMClientActivateFn ()"><span class="type">NMClientActivateFn</span></a> callback</code></em>,
@@ -899,7 +899,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span>. </p></td>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -948,7 +948,7 @@ details of the newly added connection. </p></td>
 <a name="nm-client-add-and-activate-connection"></a><h3>nm_client_add_and_activate_connection ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_client_add_and_activate_connection (<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><span class="type">NMConnection</span> *partial</code></em>,
+                                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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><a class="link" href="NMClient.html#NMClientAddActivateFn" title="NMClientAddActivateFn ()"><span class="type">NMClientAddActivateFn</span></a> callback</code></em>,
@@ -977,7 +977,7 @@ track the activation to its completion.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>partial</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to add; the connection may be
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to add; the connection may be
 partially filled (or even <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) 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>
@@ -1379,7 +1379,7 @@ nm_client_get_version (<em class="parameter"><code><a class="link" href="NMClien
 <hr>
 <div class="refsect2">
 <a name="nm-client-get-state"></a><h3>nm_client_get_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMState"><span class="returnvalue">NMState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><span class="returnvalue">NMState</span></a>
 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">
@@ -1399,7 +1399,7 @@ nm_client_get_state (<em class="parameter"><code><a class="link" href="NMClient.
 </div>
 <div class="refsect3">
 <a name="nm-client-get-state.returns"></a><h4>Returns</h4>
-<p> the current <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMState"><code class="literal">NMState</code></a></p>
+<p> the current <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMState"><code class="literal">NMState</code></a></p>
 </div>
 </div>
 <hr>
@@ -1649,7 +1649,7 @@ domains separated by ",". (<a href="https://developer.gnome.org/glib/unstable/gl
 <hr>
 <div class="refsect2">
 <a name="nm-client-get-connectivity"></a><h3>nm_client_get_connectivity ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_get_connectivity (<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 network connectivity state. Contrast
 <a class="link" href="NMClient.html#nm-client-check-connectivity" title="nm_client_check_connectivity ()"><code class="function">nm_client_check_connectivity()</code></a> and
@@ -1679,7 +1679,7 @@ connectivity state first before returning any information.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-client-check-connectivity"></a><h3>nm_client_check_connectivity ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_check_connectivity (<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="https://developer.gnome.org/gio/unstable/GCancellable.html#GCancellable-struct"><span class="type">GCancellable</span></a> *cancellable</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
@@ -1772,7 +1772,7 @@ re-checking, and <a class="link" href="NMClient.html#nm-client-check-connectivit
 <hr>
 <div class="refsect2">
 <a name="nm-client-check-connectivity-finish"></a><h3>nm_client_check_connectivity_finish ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMConnectivityState"><span class="returnvalue">NMConnectivityState</span></a>
 nm_client_check_connectivity_finish (<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="https://developer.gnome.org/gio/unstable/GAsyncResult.html#GAsyncResult-struct"><span class="type">GAsyncResult</span></a> *result</code></em>,
                                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index a6811017..db233e19 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-device-type" title="nm_device_get_device_type ()">nm_device_get_device_type</a> <span class="c_punctuation">()</span>
@@ -124,7 +124,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-capabilities" title="nm_device_get_capabilities ()">nm_device_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -204,7 +204,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-state" title="nm_device_get_state ()">nm_device_get_state</a> <span class="c_punctuation">()</span>
@@ -212,7 +212,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDevice.html#nm-device-get-state-reason" title="nm_device_get_state_reason ()">nm_device_get_state_reason</a> <span class="c_punctuation">()</span>
@@ -766,7 +766,7 @@ used by the device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-device-type"></a><h3>nm_device_get_device_type ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceType"><span class="returnvalue">NMDeviceType</span></a>
 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">
@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-capabilities"></a><h3>nm_device_get_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceCapabilities"><span class="returnvalue">NMDeviceCapabilities</span></a>
 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">
@@ -1249,7 +1249,7 @@ using DHCP. </p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-state"></a><h3>nm_device_get_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 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">
@@ -1275,9 +1275,9 @@ nm_device_get_state (<em class="parameter"><code><a class="link" href="NMDevice.
 <hr>
 <div class="refsect2">
 <a name="nm-device-get-state-reason"></a><h3>nm_device_get_state_reason ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceState"><span class="returnvalue">NMDeviceState</span></a>
 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>,
-                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a> *reason</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a> *reason</code></em>);</pre>
 <p>Gets the current <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> state (return value) and the reason for entering
 the state (<em class="parameter"><code>reason</code></em>
  argument).</p>
@@ -1297,7 +1297,7 @@ the state (<em class="parameter"><code>reason</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>reason</p></td>
-<td class="parameter_description"><p>location to store reason (<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a>), or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
+<td class="parameter_description"><p>location to store reason (<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceStateReason"><span class="type">NMDeviceStateReason</span></a>), or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -1725,7 +1725,7 @@ 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>a list of <span class="type">NMConnection</span> objects to filter. </p></td>
+<td class="parameter_description"><p>a list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects 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>
@@ -1734,7 +1734,7 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="nm-device-filter-connections.returns"></a><h4>Returns</h4>
 <p>a
-list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>device</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>device</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -1747,7 +1747,7 @@ be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Lin
 <a name="nm-device-connection-valid"></a><h3>nm_device_connection_valid ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 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><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                            <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -1773,7 +1773,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1791,7 +1791,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"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 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><span class="type">NMConnection</span> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **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
@@ -1821,7 +1821,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>device</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>device</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1844,7 +1844,7 @@ if is incompatible with the device's capabilities and characteristics.</p>
 <a name="nm-device-get-setting-type"></a><h3>nm_device_get_setting_type ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
 nm_device_get_setting_type (<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 (primary) <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> subtype associated with connections
+<p>Gets the (primary) <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> subtype associated with connections
 that can be used on <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
@@ -1865,7 +1865,7 @@ that can be used on <em class="parameter"><code>device</code></em>
 <div class="refsect3">
 <a name="nm-device-get-setting-type.returns"></a><h4>Returns</h4>
 <p> <em class="parameter"><code>device</code></em>
-'s associated <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> type</p>
+'s associated <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> type</p>
 </div>
 <p class="since">Since: 0.9.10</p>
 </div>
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 288fff50..97d250bd 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceBt.html#nm-device-bt-get-capabilities" title="nm_device_bt_get_capabilities ()">nm_device_bt_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -256,7 +256,7 @@ nm_device_bt_get_name (<em class="parameter"><code><a class="link" href="NMDevic
 <hr>
 <div class="refsect2">
 <a name="nm-device-bt-get-capabilities"></a><h3>nm_device_bt_get_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="returnvalue">NMBluetoothCapabilities</span></a>
 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">
@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 </div>
 <div class="refsect3">
 <a name="nm-device-bt-get-capabilities.returns"></a><h4>Returns</h4>
-<p> a combination of <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
+<p> a combination of <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a></p>
 </div>
 </div>
 </div>
@@ -369,7 +369,7 @@ nm_device_bt_get_capabilities (<em class="parameter"><code><a class="link" href=
 <div class="refsect2">
 <a name="NMDeviceBt--bt-capabilities"></a><h3>The <code class="literal">“bt-capabilities�</code> property</h3>
 <pre class="programlisting">  “bt-capabilities�          <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
-<p>The device's bluetooth capabilities, a combination of <a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
+<p>The device's bluetooth capabilities, a combination of <a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMBluetoothCapabilities"><span class="type">NMBluetoothCapabilities</span></a>.</p>
 <p>Flags: Read</p>
 <p>Default value: 0</p>
 </div>
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 95e583c6..a8b933e7 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -51,7 +51,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceModem.html#nm-device-modem-get-modem-capabilities" title="nm_device_modem_get_modem_capabilities ()">nm_device_modem_get_modem_capabilities</a> <span class="c_punctuation">()</span>
@@ -59,7 +59,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceModem.html#nm-device-modem-get-current-capabilities" title="nm_device_modem_get_current_capabilities ()">nm_device_modem_get_current_capabilities</a> <span class="c_punctuation">()</span>
@@ -143,7 +143,7 @@ nm_device_modem_error_quark (<em class="parameter"><code><span class="type">void
 <hr>
 <div class="refsect2">
 <a name="nm-device-modem-get-modem-capabilities"></a><h3>nm_device_modem_get_modem_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 nm_device_modem_get_modem_capabilities
                                (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
 <p>Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-modem-get-current-capabilities"></a><h3>nm_device_modem_get_current_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceModemCapabilities"><span class="returnvalue">NMDeviceModemCapabilities</span></a>
 nm_device_modem_get_current_capabilities
                                (<em class="parameter"><code><a class="link" href="NMDeviceModem.html" title="NMDeviceModem"><span class="type">NMDeviceModem</span></a> *self</code></em>);</pre>
 <p>Returns a bitfield of the generic access technology families the modem
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index 3db56403..ade9f23c 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-mode" title="nm_device_wifi_get_mode ()">nm_device_wifi_get_mode</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMDeviceWifi.html#nm-device-wifi-get-capabilities" title="nm_device_wifi_get_capabilities ()">nm_device_wifi_get_capabilities</a> <span class="c_punctuation">()</span>
@@ -374,7 +374,7 @@ device, and must not be modified.</p>
 <hr>
 <div class="refsect2">
 <a name="nm-device-wifi-get-mode"></a><h3>nm_device_wifi_get_mode ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NM80211Mode"><span class="returnvalue">NM80211Mode</span></a>
 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">
@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (<em class="parameter"><code><a class="link" href="NM
 <hr>
 <div class="refsect2">
 <a name="nm-device-wifi-get-capabilities"></a><h3>nm_device_wifi_get_capabilities ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-dbus-interface.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManager.html#NMDeviceWifiCapabilities"><span class="returnvalue">NMDeviceWifiCapabilities</span></a>
 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">
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 15e8843c..a747bd36 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -519,7 +519,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 <a name="NMIP6Config--addresses"></a><h3>The <code class="literal">“addresses�</code> property</h3>
 <pre class="programlisting">  “addresses�                <span class="type">NMIP6AddressObjectArray</span> *</pre>
 <p>The <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the IPv6 addresses;  use
-<code class="function">nm_utils_ip6_addresses_from_gvalue()</code> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-addresses-from-gvalue"><code class="function">nm_utils_ip6_addresses_from_gvalue()</code></a> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
@@ -552,7 +552,7 @@ contain the addresses of nameservers of the configuration.</p>
 <a name="NMIP6Config--routes"></a><h3>The <code class="literal">“routes�</code> property</h3>
 <pre class="programlisting">  “routes�                   <span class="type">NMIP6RouteObjectArray</span> *</pre>
 <p>The <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the IPv6 routes;  use
-<code class="function">nm_utils_ip6_routes_from_gvalue()</code> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-ip6-routes-from-gvalue"><code class="function">nm_utils_ip6_routes_from_gvalue()</code></a> to return a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of
 <span class="type">NMSettingIP6Address</span> objects that is more usable than the raw data.</p>
 <p>Flags: Read</p>
 </div>
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index f6979b3b..342b2089 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -229,7 +229,7 @@
 <div class="refsect1">
 <a name="NMRemoteConnection.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
-    <span class="lineart">╰──</span> NMConnection
+    <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>
         <span class="lineart">╰──</span> NMRemoteConnection
 </pre>
 </div>
@@ -548,7 +548,7 @@ nm_remote_connection_get_secrets (<em class="parameter"><code><a class="link" hr
 </tr>
 <tr>
 <td class="parameter_name"><p>setting_name</p></td>
-<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object name to get secrets for</p></td>
+<td class="parameter_description"><p>the <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object name to get secrets for</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -716,7 +716,7 @@ invisible to the current user.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <span class="type">NMConnection</span></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -748,7 +748,7 @@ still visible to the user.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>a <span class="type">NMConnection</span></p></td>
+<td class="parameter_description"><p>a <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index b423de58..667007f6 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-<span class="type">NMConnection</span> object.  Once a connection is known to NetworkManager, having
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> object creates a <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object which
 represents this stored connection.  Use the <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a> object to
 perform any operations like modification or deletion.</p>
 <p>To add a new network connection to the NetworkManager settings service, first
-build up a template <span class="type">NMConnection</span> object.  Since this connection is not yet
+build up a template <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection"><span class="type">NMRemoteConnection</span></a>.  Then ask <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -368,7 +368,7 @@ the stored object known to NetworkManager.</p>
 <span class="normal">   </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">)</span>
 <span class="normal">       </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Error adding connection: %s"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-&gt;</span><span class="normal">message</span><span class="symbol">);</span>
 <span class="normal">   </span><span class="keyword">else</span><span class="normal"> </span><span class="cbracket">{</span>
-<span class="normal">       </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Added: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-get-path">nm_connection_get_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">NM_CONNECTION</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">remote</span><span class="symbol">)));</span>
+<span class="normal">       </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Added: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-get-path">nm_connection_get_path</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">NM_CONNECTION</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">remote</span><span class="symbol">)));</span>
 <span class="normal">       </span><span class="comment">/* Use 'remote' with nm_remote_connection_commit_changes() to save</span>
 <span class="comment">        * changes and nm_remote_connection_delete() to delete the connection */</span>
 <span class="normal">   </span><span class="cbracket">}</span>
@@ -383,28 +383,28 @@ the stored object known to NetworkManager.</p>
 <span class="normal">   </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">uuid</span><span class="symbol">;</span>
 <span class="normal">   </span><span class="usertype">gboolean</span><span class="normal"> success</span><span class="symbol">;</span>
 
-<span class="normal">   connection </span><span class="symbol">=</span><span class="normal"> </span><span class="function">nm_connection_new</span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   connection </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 
 <span class="normal">   </span><span class="comment">/* Build up the 'connection' setting */</span>
-<span class="normal">   s_con </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NMSettingConnection-struct">NMSettingConnection</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#nm-setting-connection-new">nm_setting_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">   uuid </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/libnm-nm-utils.html#nm-utils-uuid-generate">nm_utils_uuid_generate</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   s_con </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NMSettingConnection-struct">NMSettingConnection</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#nm-setting-connection-new">nm_setting_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   uuid </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate">nm_utils_uuid_generate</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set">g_object_set</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_con</span><span class="symbol">),</span>
-<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">NM_SETTING_CONNECTION_UUID</a></span><span class="symbol">,</span><span class="normal"> uuid</span><span class="symbol">,</span>
-<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">NM_SETTING_CONNECTION_ID</a></span><span class="symbol">,</span><span class="normal"> human_name</span><span class="symbol">,</span>
-<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">NM_SETTING_CONNECTION_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">NM_SETTING_WIRED_SETTING_NAME</a></span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-UUID:CAPS">NM_SETTING_CONNECTION_UUID</a></span><span class="symbol">,</span><span class="normal"> uuid</span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-ID:CAPS">NM_SETTING_CONNECTION_ID</a></span><span class="symbol">,</span><span class="normal"> human_name</span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingConnection.html#NM-SETTING-CONNECTION-TYPE:CAPS">NM_SETTING_CONNECTION_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#NM-SETTING-WIRED-SETTING-NAME:CAPS">NM_SETTING_WIRED_SETTING_NAME</a></span><span class="symbol">,</span>
 <span class="normal">                 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
 <span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free">g_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">uuid</span><span class="symbol">);</span>
-<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</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_con</span><span class="symbol">));</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</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_con</span><span class="symbol">));</span>
 
 <span class="normal">   </span><span class="comment">/* Add the required 'wired' setting as this is a wired connection */</span>
-<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWired.html#nm-setting-wired-new">nm_setting_wired_new</a></span><span class="normal"> </span><span class="symbol">());</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">,</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWired.html#nm-setting-wired-new">nm_setting_wired_new</a></span><span class="normal"> </span><span class="symbol">());</span>
 
 <span class="normal">   </span><span class="comment">/* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */</span>
-<span class="normal">   s_ip4 </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#NMSettingIP4Config-struct">NMSettingIP4Config</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#nm-setting-ip4-config-new">nm_setting_ip4_config_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">   s_ip4 </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#NMSettingIP4Config-struct">NMSettingIP4Config</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#nm-setting-ip4-config-new">nm_setting_ip4_config_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="normal">   </span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set">g_object_set</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_ip4</span><span class="symbol">),</span>
-<span class="normal">                 NM_SETTING_IP4_CONFIG_METHOD</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></span><span class="symbol">,</span>
+<span class="normal">                 <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD:CAPS">NM_SETTING_IP4_CONFIG_METHOD</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSettingIP4Config.html#NM-SETTING-IP4-CONFIG-METHOD-AUTO:CAPS">NM_SETTING_IP4_CONFIG_METHOD_AUTO</a></span><span class="symbol">,</span>
 <span class="normal">                 <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
-<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</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_ip4</span><span class="symbol">));</span>
+<span class="normal">   </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-add-setting">nm_connection_add_setting</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</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_ip4</span><span class="symbol">));</span>
 
 <span class="normal">   </span><span class="comment">/* Ask NetworkManager to store the connection */</span>
 <span class="normal">   success </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="NMRemoteSettings.html#nm-remote-settings-add-connection">nm_remote_settings_add_connection</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">settings</span><span class="symbol">,</span><span class="normal"> connection</span><span class="symbol">,</span><span class="normal"> added_cb</span><span class="symbol">,</span><span class="normal"> loop</span><span class="symbol">);</span>
@@ -725,7 +725,7 @@ not known. </p>
 <a name="nm-remote-settings-add-connection"></a><h3>nm_remote_settings_add_connection ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_remote_settings_add_connection (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
-                                   <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Requests that the remote settings service add the given settings to a new
@@ -785,7 +785,7 @@ added, not the object itself</p></td>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_remote_settings_add_connection_unsaved
                                (<em class="parameter"><code><a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings"><span class="type">NMRemoteSettings</span></a> *settings</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMRemoteSettings.html#NMRemoteSettingsAddConnectionFunc" title="NMRemoteSettingsAddConnectionFunc ()"><span class="type">NMRemoteSettingsAddConnectionFunc</span></a> callback</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Requests that the remote settings service add the given settings to a new
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 4126336f..3146a1bf 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -241,7 +241,7 @@ nm_secret_agent_error_quark (<em class="parameter"><code><span class="type">void
 <a name="NMSecretAgentGetSecretsFunc"></a><h3>NMSecretAgentGetSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentGetSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *secrets</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
@@ -277,13 +277,13 @@ something like this:</p>
 <span class="usertype">NMSettingWirelessSecurity</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">s_wsec</span><span class="symbol">;</span>
 <span class="usertype">GHashTable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">secrets_hash</span><span class="symbol">;</span>
 
-<span class="normal">secrets </span><span class="symbol">=</span><span class="normal"> </span><span class="function">nm_connection_new</span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">s_wsec </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">NMSettingWirelessSecurity</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#nm-setting-wireless-security-new">nm_setting_wireless_security_new</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"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-new">nm_connection_new</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">s_wsec </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/libnm/NMSettingWirelessSecurity.html#NMSettingWirelessSecurity-struct">NMSettingWirelessSecurity</a> </span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMSettingWirelessSecurity.html#nm-setting-wireless-security-new">nm_setting_wireless_security_new</a></span><span class="normal"> </span><span class="symbol">();</span>
 <span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set">g_object_set</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s_wsec</span><span class="symbol">),</span>
-<span class="normal">              <a href="/usr/share/gtk-doc/html/libnm/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">              <a href="/usr/share/gtk-doc/html/libnm-util/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">              <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
-<span class="function"><a href="/usr/share/gtk-doc/html/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_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function">nm_connection_to_hash</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> NM_SETTING_HASH_FLAG_ALL</span><span class="symbol">);</span>
+<span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/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_hash </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-to-hash">nm_connection_to_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">secrets</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NM-SETTING-HASH-FLAG-ALL:CAPS">NM_SETTING_HASH_FLAG_ALL</a></span><span class="symbol">);</span>
 
 <span class="symbol">(</span><span class="normal">call the NMSecretAgentGetSecretsFunc </span><span class="usertype">with</span><span class="normal"> secrets_hash</span><span class="symbol">)</span>
 
@@ -320,9 +320,9 @@ has returned. </p></td>
 <tr>
 <td class="parameter_name"><p>secrets</p></td>
 <td class="parameter_description"><p>the <a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> containing
-the requested secrets in the same format as an <span class="type">NMConnection</span> hash (as
-created by <code class="function">nm_connection_to_hash()</code> for example).  Each key in <em class="parameter"><code>secrets</code></em>
-should be the name of a <a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
+the requested secrets in the same format as an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> hash (as
+created by <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#nm-connection-to-hash"><code class="function">nm_connection_to_hash()</code></a> for example).  Each key in <em class="parameter"><code>secrets</code></em>
+should be the name of a <a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSetting-struct"><span class="type">NMSetting</span></a> object (like "802-11-wireless-security")
 and each value should be a <a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a>.  The sub-hashes map string:<a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>
 where the string is the setting property name (like "psk") and the value
 is the secret. </p></td>
@@ -347,7 +347,7 @@ is the secret. </p></td>
 <a name="NMSecretAgentSaveSecretsFunc"></a><h3>NMSecretAgentSaveSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentSaveSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                 <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                 <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to save secrets.  When the
@@ -394,7 +394,7 @@ has returned. </p></td>
 <a name="NMSecretAgentDeleteSecretsFunc"></a><h3>NMSecretAgentDeleteSecretsFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 <span class="c_punctuation">(</span>*NMSecretAgentDeleteSecretsFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *agent</code></em>,
-                                   <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>Called as a result of a request by NM to delete secrets.  When the
@@ -526,7 +526,7 @@ nm_secret_agent_get_registered (<em class="parameter"><code><a class="link" href
 <a name="nm-secret-agent-get-secrets"></a><h3>nm_secret_agent_get_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_get_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                             <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                             <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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="NMSecretAgent.html#NMSecretAgentGetSecretsFlags" title="enum NMSecretAgentGetSecretsFlags"><span class="type">NMSecretAgentGetSecretsFlags</span></a> flags</code></em>,
@@ -538,7 +538,7 @@ nm_secret_agent_get_secrets (<em class="parameter"><code><a class="link" href="N
 <a name="nm-secret-agent-save-secrets"></a><h3>nm_secret_agent_save_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_save_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                              <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                              <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                               <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentSaveSecretsFunc" title="NMSecretAgentSaveSecretsFunc ()"><span class="type">NMSecretAgentSaveSecretsFunc</span></a> callback</code></em>,
                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
@@ -547,7 +547,7 @@ nm_secret_agent_save_secrets (<em class="parameter"><code><a class="link" href="
 <a name="nm-secret-agent-delete-secrets"></a><h3>nm_secret_agent_delete_secrets ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_secret_agent_delete_secrets (<em class="parameter"><code><a class="link" href="NMSecretAgent.html" title="NMSecretAgent"><span class="type">NMSecretAgent</span></a> *self</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a class="link" href="NMSecretAgent.html#NMSecretAgentDeleteSecretsFunc" title="NMSecretAgentDeleteSecretsFunc ()"><span class="type">NMSecretAgentDeleteSecretsFunc</span></a> callback</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 </div>
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 5c2661be..f91b1000 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -52,7 +52,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMVPNConnectionState</span>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState"><span class="returnvalue">NMVPNConnectionState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="NMVPNConnection.html#nm-vpn-connection-get-vpn-state" title="nm_vpn_connection_get_vpn_state ()">nm_vpn_connection_get_vpn_state</a> <span class="c_punctuation">()</span>
@@ -175,7 +175,7 @@ nm_vpn_connection_new (<em class="parameter"><code><a href="/usr/share/gtk-doc/h
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-connection-get-vpn-state"></a><h3>nm_vpn_connection_get_vpn_state ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMVPNConnectionState</span>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNConnectionState"><span class="returnvalue">NMVPNConnectionState</span></a>
 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">
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 3f3332ec..677b5036 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -297,7 +297,7 @@ returned connections will match the <em class="parameter"><code>nsp</code></em>
 <tr>
 <td class="parameter_name"><p>connections</p></td>
 <td class="parameter_description"><p>a list of
-<span class="type">NMConnection</span> objects to filter. </p></td>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects 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>
@@ -306,7 +306,7 @@ returned connections will match the <em class="parameter"><code>nsp</code></em>
 <div class="refsect3">
 <a name="nm-wimax-nsp-filter-connections.returns"></a><h4>Returns</h4>
 <p>a
-list of <span class="type">NMConnection</span> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>
+list of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> objects that could be activated with the given <em class="parameter"><code>nsp</code></em>
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -319,7 +319,7 @@ be freed with <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Lin
 <a name="nm-wimax-nsp-connection-valid"></a><h3>nm_wimax_nsp_connection_valid ()</h3>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 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><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                               <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -341,7 +341,7 @@ against</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>connection</p></td>
-<td class="parameter_description"><p>an <span class="type">NMConnection</span> to validate against <em class="parameter"><code>nsp</code></em>
+<td class="parameter_description"><p>an <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> to validate against <em class="parameter"><code>nsp</code></em>
 </p></td>
 <td class="parameter_annotations"> </td>
 </tr>
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 0c84c25d..b365fa4f 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.12.2
+      for libnm-glib 1.12.4
 
       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/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index 8e31144d..698e3d73 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMVPNServiceState</span>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 </td>
 <td class="function_name">
 <a class="link" href="libnm-glib-NMVPNPlugin.html#nm-vpn-plugin-get-state" title="nm_vpn_plugin_get_state ()">nm_vpn_plugin_get_state</a> <span class="c_punctuation">()</span>
@@ -172,7 +172,7 @@ nm_vpn_plugin_get_connection (<em class="parameter"><code><span class="type">NMV
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-get-state"></a><h3>nm_vpn_plugin_get_state ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMVPNServiceState</span>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="returnvalue">NMVPNServiceState</span></a>
 nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>);</pre>
 </div>
 <hr>
@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (<em class="parameter"><code><span class="type">NMVPNPlu
 <a name="nm-vpn-plugin-set-state"></a><h3>nm_vpn_plugin_set_state ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_set_state (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
-                         <em class="parameter"><code><span class="type">NMVPNServiceState</span> state</code></em>);</pre>
+                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNServiceState"><span class="type">NMVPNServiceState</span></a> state</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -235,7 +235,7 @@ nm_vpn_plugin_set_login_banner (<em class="parameter"><code><span class="type">N
 <a name="nm-vpn-plugin-failure"></a><h3>nm_vpn_plugin_failure ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 nm_vpn_plugin_failure (<em class="parameter"><code><span class="type">NMVPNPlugin</span> *plugin</code></em>,
-                       <em class="parameter"><code><span class="type">NMVPNPluginFailure</span> reason</code></em>);</pre>
+                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NMVPNPluginFailure"><span class="type">NMVPNPluginFailure</span></a> reason</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index 60104e62..65f65e11 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<span class="returnvalue">NMConnection</span> *
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="returnvalue">NMConnection</span></a> *
 </td>
 <td class="function_name">
 <a class="link" href="libnm-glib-NMVpnPluginUiWidget.html#nm-vpn-plugin-ui-interface-import" title="nm_vpn_plugin_ui_interface_import ()">nm_vpn_plugin_ui_interface_import</a> <span class="c_punctuation">()</span>
@@ -254,7 +254,7 @@ nm_vpn_plugin_ui_factory (<em class="parameter"><code><a href="https://developer
 <a name="nm-vpn-plugin-ui-interface-ui-factory"></a><h3>nm_vpn_plugin_ui_interface_ui_factory ()</h3>
 <pre class="programlisting"><span class="returnvalue">NMVpnPluginUiWidgetInterface</span> *
 nm_vpn_plugin_ui_interface_ui_factory (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                       <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                       <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 </div>
 <hr>
@@ -267,7 +267,7 @@ nm_vpn_plugin_ui_interface_get_capabilities
 <hr>
 <div class="refsect2">
 <a name="nm-vpn-plugin-ui-interface-import"></a><h3>nm_vpn_plugin_ui_interface_import ()</h3>
-<pre class="programlisting"><span class="returnvalue">NMConnection</span> *
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="returnvalue">NMConnection</span></a> *
 nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
@@ -278,7 +278,7 @@ nm_vpn_plugin_ui_interface_import (<em class="parameter"><code><span class="type
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
                                    <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
-                                   <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                   <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 </div>
 <hr>
@@ -287,7 +287,7 @@ nm_vpn_plugin_ui_interface_export (<em class="parameter"><code><span class="type
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>);</pre>
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>);</pre>
 </div>
 <hr>
 <div class="refsect2">
@@ -295,7 +295,7 @@ nm_vpn_plugin_ui_interface_get_suggested_name
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_interface_delete_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_interface_delete_connection</code> is deprecated and should not be used in newly-written code.</p></div>
 </div>
@@ -312,7 +312,7 @@ nm_vpn_plugin_ui_widget_interface_get_widget
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 </div>
 <hr>
@@ -321,7 +321,7 @@ nm_vpn_plugin_ui_widget_interface_update_connection
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (<em class="parameter"><code><span class="type">NMVpnPluginUiWidgetInterface</span> *iface</code></em>,
-                                <em class="parameter"><code><span class="type">NMConnection</span> *connection</code></em>,
+                                <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnection</span></a> *connection</code></em>,
                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <div class="warning"><p><code class="literal">nm_vpn_plugin_ui_widget_interface_save_secrets</code> is deprecated and should not be used in newly-written code.</p></div>
 </div>
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 31689fb9..4ef123fa 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -111,11 +111,11 @@ an applet when the applet calls the authentication dialog of the VPN plugin.</p>
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_vpn_plugin_utils_get_secret_flags (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *data</code></em>,
                                       <em class="parameter"><code>const <span class="type">char</span> *secret_name</code></em>,
-                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>);</pre>
+                                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> *out_flags</code></em>);</pre>
 <p>Given a VPN secret key name, attempts to find the corresponding flags data
 item in <em class="parameter"><code>data</code></em>
 .  If found, converts the flags data item to
-<a href="/usr/share/gtk-doc/html/libnm/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> and returns it.</p>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMSetting.html#NMSettingSecretFlags"><span class="type">NMSettingSecretFlags</span></a> and returns it.</p>
 <div class="refsect3">
 <a name="nm-vpn-plugin-utils-get-secret-flags.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 0f41a3ea..c399f2ce 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -49,7 +49,7 @@
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="NMDHCP4Config.html" title="NMDHCP4Config">NMDHCP4Config</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMDHCP6Config.html" title="NMDHCP6Config">NMDHCP6Config</a>
     <span class="lineart">├──</span> <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>
-    <span class="lineart">├──</span> NMConnection
+    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="NMRemoteConnection.html" title="NMRemoteConnection">NMRemoteConnection</a>
     <span class="lineart">╰──</span> <a class="link" href="NMSecretAgent.html" title="NMSecretAgent">NMSecretAgent</a>
 </pre>
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 6b89d58f..89c881bc 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.12.2
+1.12.4
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 840f0842..c325c248 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (<em class="parameter"><code><a class="link" h
 <pre class="programlisting"><span class="returnvalue">char</span> *
 nm_connection_get_virtual_device_description
                                (<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 href="/usr/share/gtk-doc/html/libnm/NMDevice.html#nm-device-disambiguate-names"><code class="function">nm_device_disambiguate_names()</code></a> would
+<p>Returns the name that <a href="/usr/share/gtk-doc/html/libnm-glib/NMDevice.html#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>
 .
 Eg, "VLAN (eth1.1)".</p>
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index dc458a8b..79bf0175 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.12.2
+      for libnm-util 1.12.4
 
       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/version.xml b/docs/libnm-util/version.xml
index 6b89d58f..89c881bc 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.12.2
+1.12.4
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 3f3b1b3f..f4b131a7 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -584,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 <span class="type">NMConnections</span> to
+<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -594,7 +594,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-access-point-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>ap</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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 <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> 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>
diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 1427a1f5..eb235518 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -1314,7 +1314,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)</p>
 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 <span class="type">“path�</span>
+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>
 property.</p>
 <div class="refsect3">
 <a name="nm-connection-set-path.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 490a54f2..2ccf01b9 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -2419,7 +2419,7 @@ 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 <span class="type">NMConnections</span> to filter. </p></td>
+<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -2428,7 +2428,7 @@ incompatible with the device. To get the full list of connections see
 <div class="refsect3">
 <a name="nm-device-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>device</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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 <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> 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>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 0141badf..6534ddb7 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -2096,7 +2096,7 @@ provider, or <a class="link" href="NMSettingConnection.html#NMSettingConnection-
 <p>The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664"
 (ie, contains only hexadecimal characters and "-").  A suitable UUID may
 be generated by <a class="link" href="libnm-nm-utils.html#nm-utils-uuid-generate" title="nm_utils_uuid_generate ()"><code class="function">nm_utils_uuid_generate()</code></a> or
-<code class="function">nm_utils_uuid_generate_from_string()</code>.</p>
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-nm-utils.html#nm-utils-uuid-generate-from-string"><code class="function">nm_utils_uuid_generate_from_string()</code></a>.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: NULL</p>
 </div>
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index 9a19e6f6..6796788c 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -81,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 <span class="type">NMConnections</span> for generic devices.</p>
+the "connection type" setting on <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><span class="type">NMConnections</span></a> for generic devices.</p>
 </div>
 <div class="refsect1">
 <a name="NMSettingGeneric.functions_details"></a><h2>Functions</h2>
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index bde2d93c..d1cd98b8 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -321,7 +321,7 @@ If the property is not a hex string it is considered as a
 non-hardware-address client ID and the 'type' field is set to 0.</p>
 <p>The special values "mac" and "perm-mac" are supported, which use the
 current or permanent MAC address of the device to generate a client identifier
-with type ethernet type (01). Currently, these options only work for ethernet
+with type ethernet (01). Currently, these options only work for ethernet
 type of links.</p>
 <p>The special value "stable" is supported to generate a type 0 client identifier based
 on the stable-id (see connection.stable-id) and a per-host key.</p>
diff --git a/docs/libnm/html/NMVpnEditor.html b/docs/libnm/html/NMVpnEditor.html
index bd52915c..1c1bb6a6 100644
--- a/docs/libnm/html/NMVpnEditor.html
+++ b/docs/libnm/html/NMVpnEditor.html
@@ -140,7 +140,7 @@ nm_vpn_editor_update_connection (<em class="parameter"><code><a class="link" hre
 <tbody>
 <tr>
 <td class="struct_member_name"><p><em class="structfield"><code><a name="NMVpnEditorInterface.get-widget"></a>get_widget</code></em> ()</p></td>
-<td class="struct_member_description"><p>return the <a href="https://developer.gnome.org/gtk4/GtkWidget.html#GtkWidget-struct"><span class="type">GtkWidget</span></a> for the VPN editor's UI</p></td>
+<td class="struct_member_description"><p>return the <span class="type">GtkWidget</span> for the VPN editor's UI</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index c797f206..b5b55348 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -260,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 <span class="type">NMConnections</span> to
+<td class="parameter_description"><p>an array of <a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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>
@@ -270,7 +270,7 @@ filter. </p></td>
 <div class="refsect3">
 <a name="nm-wimax-nsp-filter-connections.returns"></a><h4>Returns</h4>
 <p>an array of
-<span class="type">NMConnections</span> that could be activated with the given <em class="parameter"><code>nsp</code></em>
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct"><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 <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref"><code class="function">g_ptr_array_unref()</code></a> 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>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index d2782bd9..4e03d118 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -1109,19 +1109,19 @@ NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection, struct in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-struct">NMConnection</a>, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection::changed, object signal in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-changed">NMConnection::changed</a>, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection::secrets-cleared, object signal in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-cleared">NMConnection::secrets-cleared</a>, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NMConnection::secrets-updated, object signal in NMSettingOvs
+<a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html#NMConnection-secrets-updated">NMConnection::secrets-updated</a>, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1610,11 +1610,11 @@ NMConnection::secrets-updated, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN:CAPS">NM_DBUS_INTERFACE_VPN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INTERFACE-VPN-CONNECTION:CAPS">NM_DBUS_INTERFACE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1622,15 +1622,15 @@ NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-INVALID-VPN-CONNECTION:CAPS">NM_DBUS_INVALID_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-ACTIVE-VPN-CONNECTION:CAPS">NM_DBUS_NO_ACTIVE_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-NO-VPN-CONNECTIONS:CAPS">NM_DBUS_NO_VPN_CONNECTIONS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1662,11 +1662,11 @@ NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN:CAPS">NM_DBUS_PATH_VPN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-PATH-VPN-CONNECTION:CAPS">NM_DBUS_PATH_VPN_CONNECTION</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -1678,67 +1678,67 @@ NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STARTED:CAPS">NM_DBUS_VPN_ALREADY_STARTED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ALREADY-STOPPED:CAPS">NM_DBUS_VPN_ALREADY_STOPPED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-BAD-ARGUMENTS:CAPS">NM_DBUS_VPN_BAD_ARGUMENTS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-ERROR-PREFIX:CAPS">NM_DBUS_VPN_ERROR_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-INTERACTIVE-NOT-SUPPORTED:CAPS">NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-CONNECT-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_CONNECT_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP4-CONFIG:CAPS">NM_DBUS_VPN_SIGNAL_IP4_CONFIG</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-IP-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LAUNCH-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-BANNER:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-LOGIN-FAILED:CAPS">NM_DBUS_VPN_SIGNAL_LOGIN_FAILED</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-STATE-CHANGE:CAPS">NM_DBUS_VPN_SIGNAL_STATE_CHANGE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-SIGNAL-VPN-CONFIG-BAD:CAPS">NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STARTING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STARTING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-STOPPING-IN-PROGRESS:CAPS">NM_DBUS_VPN_STOPPING_IN_PROGRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-DBUS-VPN-WRONG-STATE:CAPS">NM_DBUS_VPN_WRONG_STATE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -4132,7 +4132,7 @@ json_object_iter_key, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/json-glib/json-glib-JSON-Object.html#json-object-iter-next">json_object_iter_next</a>, macro in nm-json
+json_object_iter_next, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
@@ -10956,11 +10956,11 @@ nm_utils_fixup_vendor_string, function in nm-libnm-utils
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-INTERFACE:CAPS">NM_VPN_DBUS_PLUGIN_INTERFACE</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-DBUS-PLUGIN-PATH:CAPS">NM_VPN_DBUS_PLUGIN_PATH</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11028,27 +11028,27 @@ NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CAN-PERSIST:CAPS">NM_VPN_PLUGIN_CAN_PERSIST</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP4:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP4</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-HAS-IP6:CAPS">NM_VPN_PLUGIN_CONFIG_HAS_IP6</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11056,7 +11056,7 @@ NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11092,55 +11092,55 @@ NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-BANNER:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_BANNER</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-EXT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-MTU:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_MTU</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NBNS:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NBNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11148,47 +11148,47 @@ NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP4-CONFIG-TUNDEV:CAPS">NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ADDRESS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DNS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DNS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAIN:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-DOMAINS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-INT-GATEWAY:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-MSS:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_MSS</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-NEVER-DEFAULT:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PREFIX:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PREFIX</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -11196,11 +11196,11 @@ NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-PTP:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_PTP</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
+<a href="/usr/share/gtk-doc/html/libnm-util/libnm-util-NetworkManagerVPN.html#NM-VPN-PLUGIN-IP6-CONFIG-ROUTES:CAPS">NM_VPN_PLUGIN_IP6_CONFIG_ROUTES</a>, macro in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index d938a636..09479404 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.12.2
+      for libnm 1.12.4
 
       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>.
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 0e4f8ab7..4730f5d6 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -254,7 +254,7 @@ nm_vpn_plugin_error_quark (<em class="parameter"><code><span class="type">void</
 <a name="NMAgentManagerError"></a><h3>enum NMAgentManagerError</h3>
 <p>Errors returned from the secret-agent manager.</p>
 <p>These errors may be returned from operations that could cause secrets to be
-requested (such as <code class="function">nm_client_activate_connection()</code>), and correspond to D-Bus
+requested (such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a>), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.</p>
 <div class="refsect3">
 <a name="NMAgentManagerError.members"></a><h4>Members</h4>
@@ -730,7 +730,7 @@ errors in that namespace.</p>
 when they encounter problems retrieving secrets on behalf of NM. They
 correspond to errors in the "org.freedesktop.NetworkManager.SecretManager"
 namespace.</p>
-<p>Client APIs such as <code class="function">nm_client_activate_connection()</code> will not see these error
+<p>Client APIs such as <a href="/usr/share/gtk-doc/html/libnm-glib/NMClient.html#nm-client-activate-connection"><code class="function">nm_client_activate_connection()</code></a> will not see these error
 codes; instead, the secret agent manager will translate them to the
 corresponding <a class="link" href="libnm-nm-errors.html#NMAgentManagerError" title="enum NMAgentManagerError"><span class="type">NMAgentManagerError</span></a> codes.</p>
 <div class="refsect3">
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index b6fec4c4..e1c92d15 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -339,7 +339,7 @@
 <hr>
 <div class="refsect2">
 <a name="NM-AVAILABLE-IN-1-12-2:CAPS"></a><h3>NM_AVAILABLE_IN_1_12_2</h3>
-<pre class="programlisting"># define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12,2)
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12.2)
 </pre>
 </div>
 </div>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 4f0fc164..92e567c7 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.12.2
+  NetworkManager version: 1.12.4
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 6b89d58f..89c881bc 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.12.2
+1.12.4
diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c
index c4e48475..319f8055 100644
--- a/libnm-core/crypto.c
+++ b/libnm-core/crypto.c
@@ -158,7 +158,13 @@ parse_old_openssl_key_file (const guint8 *data,
 				goto parse_error;
 			}
 		} else if (!strncmp (p, DEK_INFO_TAG, strlen (DEK_INFO_TAG))) {
+			static const char *const known_ciphers[] = { CIPHER_DES_EDE3_CBC,
+			                                             CIPHER_DES_CBC,
+			                                             CIPHER_AES_128_CBC,
+			                                             CIPHER_AES_192_CBC,
+			                                             CIPHER_AES_256_CBC };
 			char *comma;
+			guint i;
 
 			if (enc_tags++ != 1 || str->len != 0) {
 				g_set_error (error, NM_CRYPTO_ERROR,
@@ -187,13 +193,13 @@ parse_old_openssl_key_file (const guint8 *data,
 			iv = g_strdup (comma);
 
 			/* Get the private key cipher */
-			if (!strcasecmp (p, "DES-EDE3-CBC")) {
-				cipher = g_strdup (p);
-			} else if (!strcasecmp (p, "DES-CBC")) {
-				cipher = g_strdup (p);
-			} else if (!strcasecmp (p, "AES-128-CBC")) {
-				cipher = g_strdup (p);
-			} else {
+			for (i = 0; i < G_N_ELEMENTS (known_ciphers); i++) {
+				if (!g_ascii_strcasecmp (p, known_ciphers[i])) {
+					cipher = g_strdup (known_ciphers[i]);
+					break;
+				}
+			}
+			if (i == G_N_ELEMENTS (known_ciphers)) {
 				g_set_error (error, NM_CRYPTO_ERROR,
 				             NM_CRYPTO_ERROR_INVALID_DATA,
 				             _("Malformed PEM file: unknown private key cipher '%s'."),
@@ -383,12 +389,16 @@ crypto_make_des_aes_key (const char *cipher,
 	g_return_val_if_fail (password != NULL, NULL);
 	g_return_val_if_fail (out_len != NULL, NULL);
 
-	if (!strcmp (cipher, "DES-EDE3-CBC"))
+	if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
 		digest_len = 24;
-	else if (!strcmp (cipher, "DES-CBC"))
+	else if (!strcmp (cipher, CIPHER_DES_CBC))
 		digest_len = 8;
-	else if (!strcmp (cipher, "AES-128-CBC"))
+	else if (!strcmp (cipher, CIPHER_AES_128_CBC))
 		digest_len = 16;
+	else if (!strcmp (cipher, CIPHER_AES_192_CBC))
+		digest_len = 24;
+	else if (!strcmp (cipher, CIPHER_AES_256_CBC))
+		digest_len = 32;
 	else {
 		g_set_error (error, NM_CRYPTO_ERROR,
 		             NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h
index e89f0919..d20d6f31 100644
--- a/libnm-core/crypto.h
+++ b/libnm-core/crypto.h
@@ -30,8 +30,10 @@
 
 #define MD5_HASH_LEN 20
 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"
-#define CIPHER_DES_CBC "DES-CBC"
-#define CIPHER_AES_CBC "AES-128-CBC"
+#define CIPHER_DES_CBC      "DES-CBC"
+#define CIPHER_AES_128_CBC  "AES-128-CBC"
+#define CIPHER_AES_192_CBC  "AES-192-CBC"
+#define CIPHER_AES_256_CBC  "AES-256-CBC"
 
 typedef enum {
 	NM_CRYPTO_KEY_TYPE_UNKNOWN = 0,
diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c
index 53a3ba4a..49181ee7 100644
--- a/libnm-core/crypto_gnutls.c
+++ b/libnm-core/crypto_gnutls.c
@@ -82,9 +82,15 @@ crypto_decrypt (const char *cipher,
 	} else if (!strcmp (cipher, CIPHER_DES_CBC)) {
 		cipher_mech = GNUTLS_CIPHER_DES_CBC;
 		real_iv_len = SALT_LEN;
-	} else if (!strcmp (cipher, CIPHER_AES_CBC)) {
+	} else if (!strcmp (cipher, CIPHER_AES_128_CBC)) {
 		cipher_mech = GNUTLS_CIPHER_AES_128_CBC;
 		real_iv_len = 16;
+	} else if (!strcmp (cipher, CIPHER_AES_192_CBC)) {
+		cipher_mech = GNUTLS_CIPHER_AES_192_CBC;
+		real_iv_len = 16;
+	} else if (!strcmp (cipher, CIPHER_AES_256_CBC)) {
+		cipher_mech = GNUTLS_CIPHER_AES_256_CBC;
+		real_iv_len = 16;
 	} else {
 		g_set_error (error, NM_CRYPTO_ERROR,
 		             NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
@@ -189,8 +195,12 @@ crypto_encrypt (const char *cipher,
 
 	if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
 		cipher_mech = GNUTLS_CIPHER_3DES_CBC;
-	else if (!strcmp (cipher, CIPHER_AES_CBC))
+	else if (!strcmp (cipher, CIPHER_AES_128_CBC))
 		cipher_mech = GNUTLS_CIPHER_AES_128_CBC;
+	else if (!strcmp (cipher, CIPHER_AES_192_CBC))
+		cipher_mech = GNUTLS_CIPHER_AES_192_CBC;
+	else if (!strcmp (cipher, CIPHER_AES_256_CBC))
+		cipher_mech = GNUTLS_CIPHER_AES_256_CBC;
 	else {
 		g_set_error (error, NM_CRYPTO_ERROR,
 		             NM_CRYPTO_ERROR_UNKNOWN_CIPHER,
diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
index 56e91e26..9a0c4334 100644
--- a/libnm-core/crypto_nss.c
+++ b/libnm-core/crypto_nss.c
@@ -103,7 +103,9 @@ crypto_decrypt (const char *cipher,
 	} else if (!strcmp (cipher, CIPHER_DES_CBC)) {
 		cipher_mech = CKM_DES_CBC_PAD;
 		real_iv_len = 8;
-	} else if (!strcmp (cipher, CIPHER_AES_CBC)) {
+	} else if (NM_IN_STRSET (cipher, CIPHER_AES_128_CBC,
+	                                 CIPHER_AES_192_CBC,
+	                                 CIPHER_AES_256_CBC)) {
 		cipher_mech = CKM_AES_CBC_PAD;
 		real_iv_len = 16;
 	} else {
@@ -269,7 +271,10 @@ crypto_encrypt (const char *cipher,
 
 	if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
 		cipher_mech = CKM_DES3_CBC_PAD;
-	else if (!strcmp (cipher, CIPHER_AES_CBC))
+	else if (NM_IN_STRSET (cipher,
+	                       CIPHER_AES_128_CBC,
+	                       CIPHER_AES_192_CBC,
+	                       CIPHER_AES_256_CBC))
 		cipher_mech = CKM_AES_CBC_PAD;
 	else {
 		g_set_error (error, NM_CRYPTO_ERROR,
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index 5c94c35c..c894e250 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -926,7 +926,7 @@ get_bytes (KeyfileReaderInfo *info,
 		 * byte-array. The reason is that zero_terminate is there to terminate
 		 * *valid* strings. It's not there to terminated invalid (empty) strings.
 		 */
-		return g_bytes_new_take (tmp_string, 0);
+		return g_bytes_new_static ("", 0);
 	}
 
 	for (length = 0; tmp_string[length]; length++) {
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 3b4240e6..482cbbe2 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -2639,6 +2639,7 @@ nm_setting_802_1x_set_phase2_private_key (NMSetting8021x *setting,
 		password_changed = TRUE;
 	}
 
+	g_bytes_unref (priv->phase2_private_key);
 	if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
 		/* FIXME: potential race after verifying the private key above */
 		/* FIXME: ensure blob doesn't start with file:// */
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 0c668d8c..d855ccba 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -721,7 +721,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class)
 	 *
 	 * The special values "mac" and "perm-mac" are supported, which use the
 	 * current or permanent MAC address of the device to generate a client identifier
-	 * with type ethernet type (01). Currently, these options only work for ethernet
+	 * with type ethernet (01). Currently, these options only work for ethernet
 	 * type of links.
 	 *
 	 * The special value "stable" is supported to generate a type 0 client identifier based
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index ee6dbc0b..c2404895 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -161,7 +161,7 @@
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
-# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12,2)
+# define NM_AVAILABLE_IN_1_12_2          G_UNAVAILABLE(1,12.2)
 #else
 # define NM_AVAILABLE_IN_1_12_2
 #endif
diff --git a/libnm-core/tests/certs/test-aes-key.pem b/libnm-core/tests/certs/test-aes-128-key.pem
index aab8f463..aab8f463 100644
--- a/libnm-core/tests/certs/test-aes-key.pem
+++ b/libnm-core/tests/certs/test-aes-128-key.pem
diff --git a/libnm-core/tests/certs/test-aes-256-key.pem b/libnm-core/tests/certs/test-aes-256-key.pem
new file mode 100644
index 00000000..e51bafd3
--- /dev/null
+++ b/libnm-core/tests/certs/test-aes-256-key.pem
@@ -0,0 +1,54 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,5FF6BD2D4E57E8933D4A6814DEF5305A
+
+9Br+xw6XOg7qUqfeE5PJ4g/PAm7eTcPMb4FzSKkaEosLo6oj4f37TwXuojJZeAmi
+1EytpqM1vdYHCLdjg+qYaTIq6mzMZIyoaREokcOhcNrq5S0J39gJLVV9LjiXhCAH
+GQgDBnbRT6HGz70AyTRLcW9aj6uBzTv/m92sLUw2txFeBXK8n2AA1oHJTgsFNYjf
+/ZvTCE1VMQHDPx31Vn5WXSUHNc0hx4MTIwpHqWI17ohr8IiWCs5HXVfVaqrNeNEw
+haD7fg8oNxjLs46/4dDWmfWXhDsMFSweZv03gZdyVjwn1IOqeVGmTdLpllfgOW7E
++XE8Y/d55s5nkOxu6eXNMtWgjclKBGr2iMxxnODmEsUt2WcV98cPS+25o3hOfy3s
+NIcfxtWVRFUtjqf3ragyGLuXFqATkj1slj4LVMeewRJ1g+Z6ti0mwBN+ZrYtKdec
+FRNb4zr5FW+3SqkIIJVfxJEYJDB4zODhMg8tySEHLKuT0uz42YQ4aoOHTzO5WDBY
+2BI7TjRppXcExPnkAk5jqbKA6BjT9KcAVyypfxDKvCeXKdjDcL6ISOBSm6cQBh8D
+HxsFzMy9PF6kKNeiNiEsVPnKYvhvs1hTBtp+IAgJ6KZnCDKplZFxo/mBAlV2KyCT
+x+Mhmme3fXdLJkvxlVJAoAhwgXvomVCVTGI3JhcQIqVgxPIKYpqlHVFC7JjG+yQX
+tvzCPtr9G9+Ofrm6zXjlDD7zNyl/KfFtEWhO2ePHkQlCEuKJnsnRIf/wQ0viG0yY
+MH31Z/84o2pKLBKY5fq8+eYuYoP9Rk4W2LpjGMvdkKhEHL26kZofeFyqD+JcaxHc
+kQh7/SbWAsREGb9Jp7I2q1mo749mse1oSFIQa5gN3jB0mgHZd6edRYeW2Up+rqEK
+k6Xd6uqs7bZd5W9sP7Cf6yJOFEjqFVLQEVEXWSchgeta/JNrjGr3UzLFN2S+vhvX
+XgDa41y2UdXHRqj2s864u0ZDPyGXYZnVbvQn/8xHQ7rvxHowpTn+XXUEf0AQnk3j
+9h++3McwP8GuVxkwc6o9TfOL+ell5jup7F3SekwEiE3hqY8x87g6X2zD5VSnfCy3
+0t0LmPGI1b3LABeYjA1WEdhoTlHrNLkwOR4gsudrJ5nxIzfGy+IHaloXLJy4YKfX
+pJ+qyGRUR42YD9IhiEmmmO1VoJgVEYfBiz50Jg8emddku6eKdmv9IKjiSb2pTbDS
+4oUYKg109OOn+krk67dNXofAXrBa8v7QusC0yz9N25H05Xyou1iqpGk+uBrTqEO6
+lW9lWQo57BQU9og40xMKH/xQgIxfQRktUKsPizj8mKil4izo5KgjPSqBeEbj+Q3c
+0FKlrpTXQlXfX5Z5esqMuCSiwQEzoJR+V+SUaSVcg1av0k/CJMin4Cr8roai+OjK
+lhaQIvx35Bzd02yERYsfpDjmQCXmIeiDm8JtB6znbQPUJ4d8kzWR+5ACOZW/dUss
+YhWJRkZpkIwTY+/sDU4mnP2R37MNo+OH4CwZyUDHjlkRPGW+6JBEpnnlI9a/1Vb1
+pjAGpi/8u/luvZGTzCzxQG2dZc5YQR869U+wFsFbLRiD0aP2SpdOH0QxxPOcdR8+
+HWyL01BJBKyK/wZWJhe+63zlk1L5CA0XYpoNkYpMlPNZkcqR7QzUOATfuBgI2aPM
+AXaweaAWhpPCDsc2RypIs9DhTiCCkt8tq8Au15hVUKAoshLeewPtv0t75MEC0hVB
+z6FVnNlqq0cqqcSVqvUG6JUGtFOGgG3ifEMXggq5k12+wGzY63DLR8dFPNpOL6/1
+nocOayHJIU9M8PP817PzhAUAePRRUKRg8kkbKKeZnCJxoF7O15AFVEJnl9Vyokkz
+bULYhzYVx3xh8THMi+5jsnKWPJyMeYHbHH3C658SIw6Ff9fgEWscv5ZkGYdKMg+l
+8hBn+++SoqIO+F3lOGco+s8qlYox106lUwJEtORXcBxmkaHSo/X2AVO8Owt4vYli
+mjWnY6V9vooBgOuCMcY780pcoj2lSf9JPHDYK0j8t5VumDUSLyLt+tCj0yv/vl5L
+9L++vbu2akZRC9ChijYpfhTvXoG36ePhoT7AGGnhpFjjw1VqG80GY4XSODKzH86w
+kUcZoErb8swUPYOtsybtuPb+6c/YofQ8GfpVosPZgSRD4+U7v+zA3/z8xF2B0xt6
+uV8hXbropuni8KmbFuKrPZK3p2v2aZ8F0+GITwS75/hbT6D7ruUSr5q4V0VKeE8G
+k3QSI0s6+74stPv3S/ByCxu8q51ffYqVw00wzPpEc4SmHEa0R7IczJKXupmDdZZM
+1rASSBNzS5TZDBXP6S7npYQ8nHhgXTdCFO7eM3bp24B/i2o0s7+gkKrz0DkEbv9I
+UrCJjTL8OIIP4qSLMILzZ8pB28c+zyM482ZqFY/2b7j6WlTiqa9P1adrD1gLxTQ0
+Sw9xY+sY3PAJqcnPA5NjDZL/h5plgHhCqDa9pEtdBVG2Mxcl9bXbphwD1MIzj4gr
+xtlW1HUJ/iOhFcXldOJ1MCt++Bm5av4mL5adQ/oUnL5Q0oZZFwqT09k7xe7lZ98N
+uj2Lfl8NN7N3ama9KatgbX5g6IALuk/rJN/4KEiiu24m+lR7c5L0pg/cG6LIFjmk
+HlTsc0ANCgeZBhDJ8kvjcXDhFOqoYE/+D2VO6ZEHRsDibQ+kjpaH+DiD01/gh0N0
+HM6GGtm3GbOyZUhw5OFz04xzcyFYo2xaqzgaZieAOcrt2s6XyPVf1gww08/HtTMR
+gLg14MUQvRXV6kPJfdu4OLZ//b6J0KnzVyLDRdOrWIj2raLWmKwQN9qv05/yskcD
+Y6x7wq3v6iZpFjDc53sslhwp2XRsoWT9X5alVspz8WvP/kqgkTdzpPFdp1vIovOQ
+kRXdzzKICDGDJUIcTL8cJ3Dv4XqNR/sVyuB4dfndzQQApbdYTDNpwX0VJDBjMkQy
+Up6aiUknxa6Cbp7b1ZfUQY8yNBAIZL+R8dmobT3nAHW61DaASHSxn+elCD2Ja/6b
+EiWikskyN6crMAv35ILr5ySsZK97ttNNmRoGFbt8bTjRd83Ie+UfH445kCKsY83x
+aDCvWm+bbV6M9rSgjhJ3bWOudiw+EBMGvSamSnS7CYnRmwq4t+4bM2sh2nYKY0qw
+-----END RSA PRIVATE KEY-----
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index fb99ffea..5fb26c1f 100644
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -476,8 +476,11 @@ main (int argc, char **argv)
 	g_test_add_data_func ("/libnm/crypto/key/padding-8",
 	                      "test2_key_and_cert.pem, 12345testing",
 	                      test_key);
-	g_test_add_data_func ("/libnm/crypto/key/aes",
-	                      "test-aes-key.pem, test-aes-password",
+	g_test_add_data_func ("/libnm/crypto/key/aes-128",
+	                      "test-aes-128-key.pem, test-aes-password",
+	                      test_key);
+	g_test_add_data_func ("/libnm/crypto/key/aes-256",
+	                      "test-aes-256-key.pem, test-aes-password",
 	                      test_key);
 	g_test_add_data_func ("/libnm/crypto/key/decrypted",
 	                      "test-key-only-decrypted.pem",
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index 55df5501..1e30fd9a 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -57,7 +57,6 @@ libnm_utils_enum = gnome.mkenums(
 
 sources = files(
   'crypto.c',
-  'crypto_' + crypto + '.c',
   'nm-connection.c',
   'nm-param-spec-specialized.c',
   'nm-setting-8021x.c',
@@ -93,7 +92,6 @@ sources = files(
 sources += shared_files_libnm_util
 
 deps = [
-  crypto_dep,
   dbus_dep,
   dbus_glib_dep,
   shared_dep,
@@ -109,6 +107,32 @@ cflags = common_cflags + [
   '-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name)
 ]
 
+if crypto_gnutls_dep.found()
+  libnm_util_crypto_gnutls = static_library(
+    'nm-util-crypto-gnutls',
+    sources: [ 'crypto_gnutls.c' ],
+    dependencies: deps + [ crypto_gnutls_dep ],
+    c_args: cflags
+  )
+endif
+
+if crypto_nss_dep.found()
+  libnm_util_crypto_nss = static_library(
+    'nm-util-crypto-nss',
+    sources: [ 'crypto_nss.c' ],
+    dependencies: deps + [ crypto_nss_dep ],
+    c_args: cflags
+  )
+endif
+
+if crypto == 'gnutls'
+  libnm_util_crypto = libnm_util_crypto_gnutls
+elif crypto == 'nss'
+  libnm_util_crypto = libnm_util_crypto_nss
+else
+  error('bug')
+endif
+
 linker_script = join_paths(meson.current_source_dir(), 'libnm-util.ver')
 
 libnm_util = shared_library(
@@ -121,6 +145,7 @@ libnm_util = shared_library(
     '-Wl,--version-script,@0@'.format(linker_script),
   ],
   link_depends: linker_script,
+  link_with: libnm_util_crypto,
   install: true
 )
 
@@ -175,11 +200,9 @@ run_target(
 
 sources = files(
   'crypto.c',
-  'crypto_' + crypto + '.c'
 )
 
 deps = [
-  crypto_dep,
   shared_dep
 ]
 
@@ -187,6 +210,7 @@ libtest_crypto = static_library(
   'test-crypto',
   sources: sources,
   dependencies: deps,
+  link_with: libnm_util_crypto,
   c_args: cflags
 )
 
diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
index 61bd9774..af6028a5 100644
--- a/libnm-util/tests/test-crypto.c
+++ b/libnm-util/tests/test-crypto.c
@@ -383,8 +383,8 @@ main (int argc, char **argv)
 	g_test_add_data_func ("/libnm/crypto/key/padding-8",
 	                      "test2_key_and_cert.pem, 12345testing",
 	                      test_key);
-	g_test_add_data_func ("/libnm/crypto/key/aes",
-	                      "test-aes-key.pem, test-aes-password",
+	g_test_add_data_func ("/libnm/crypto/key/aes-128",
+	                      "test-aes-128-key.pem, test-aes-password",
 	                      test_key);
 
 	g_test_add_data_func ("/libnm/crypto/PKCS#12/1",
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index 98afd542..78d62e87 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -170,7 +170,7 @@
   <setting name="ipv4" description="IPv4 Settings" name_upper="IP4_CONFIG" >
     <property name="addresses" name_upper="ADDRESSES" type="array of array of uint32" default="[]" description="Array of IP addresses." />
     <property name="dad-timeout" name_upper="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 zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4." />
-    <property name="dhcp-client-id" name_upper="DHCP_CLIENT_ID" type="string" description="A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values &quot;mac&quot; and &quot;perm-mac&quot; are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value &quot;stable&quot; is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused." />
+    <property name="dhcp-client-id" name_upper="DHCP_CLIENT_ID" type="string" description="A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values &quot;mac&quot; and &quot;perm-mac&quot; are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value &quot;stable&quot; is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused." />
     <property name="dhcp-fqdn" name_upper="DHCP_FQDN" type="string" description="If the &quot;dhcp-send-hostname&quot; property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and &quot;dhcp-hostname&quot; are mutually exclusive and cannot be set at the same time." />
     <property name="dhcp-hostname" name_upper="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." />
     <property name="dhcp-send-hostname" name_upper="DHCP_SEND_HOSTNAME" type="boolean" default="TRUE" description="If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the &quot;dhcp-hostname&quot; property is NULL and this property is TRUE, the current persistent hostname of the computer is sent." />
diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml
index 8deac083..ab70aa7b 100644
--- a/libnm/nm-settings-docs.xml
+++ b/libnm/nm-settings-docs.xml
@@ -173,7 +173,7 @@
     <property name="address-data" name_upper="ADDRESS_DATA" type="array of vardict" description="Array of IPv4 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" name_upper="ADDRESSES" type="array of array of uint32" 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 IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet." />
     <property name="dad-timeout" name_upper="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 zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4." />
-    <property name="dhcp-client-id" name_upper="DHCP_CLIENT_ID" type="string" description="A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values &quot;mac&quot; and &quot;perm-mac&quot; are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value &quot;stable&quot; is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused." />
+    <property name="dhcp-client-id" name_upper="DHCP_CLIENT_ID" type="string" description="A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values &quot;mac&quot; and &quot;perm-mac&quot; are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value &quot;stable&quot; is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused." />
     <property name="dhcp-fqdn" name_upper="DHCP_FQDN" type="string" description="If the &quot;dhcp-send-hostname&quot; property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and &quot;dhcp-hostname&quot; are mutually exclusive and cannot be set at the same time." />
     <property name="dhcp-hostname" name_upper="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." />
     <property name="dhcp-send-hostname" name_upper="DHCP_SEND_HOSTNAME" type="boolean" default="TRUE" description="If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the &quot;dhcp-hostname&quot; property is NULL and this property is TRUE, the current persistent hostname of the computer is sent." />
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index db19e7be..5ce6c6ad 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.12\&.2" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.12\&.4" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 31af2759..4f912d3b 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.12\&.2" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.12\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 57b277b4..fd6378a4 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.12\&.2" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.12\&.4" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index f5d5ce0f..fcaf76a8 100644
--- a/man/nm-openvswitch.7
+++ b/man/nm-openvswitch.7
@@ -2,12 +2,12 @@
 .\"     Title: nm-openvswitch
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: OpenVSwitch support overview
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.12\&.2" "OpenVSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.12\&.4" "OpenVSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -131,9 +131,9 @@ of the link (e\&.g\&. "wired", "bond", "dummy", etc\&.)\&. Other interfaces ("in
 .nf
 $ \fBnmcli conn add type ovs\-bridge conn\&.interface bridge0\fR
 Connection \*(Aqovs\-bridge\-bridge0\*(Aq (d10fc64d\-1d48\-4394\-a1b8\-e1aea72f27d5) successfully added\&.
-$ \fBnmcli conn add type ovs\-port conn\&.interface port0 conn\&.master bridge0\fR
+$ \fBnmcli conn add type ovs\-port conn\&.interface port0 master bridge0\fR
 Connection \*(Aqovs\-port\-port0\*(Aq (5ae22bae\-bba4\-4815\-9ade\-7e635633e1f0) successfully added\&.
-$ \fBnmcli conn add type ovs\-interface conn\&.interface iface0 conn\&.master port0 \e
+$ \fBnmcli conn add type ovs\-interface conn\&.interface iface0 master port0 \e
   ipv4\&.method manual ipv4\&.address 192\&.0\&.2\&.1/24\fR
 Connection \*(Aqovs\-interface\-iface0\*(Aq (3640d2a1\-a2fd\-4718\-92f1\-cffadb5b6cdc) successfully added\&.
 .fi
@@ -150,9 +150,9 @@ As said above, you need to create a Port even for a single interface\&. Also, be
 .RS 4
 .\}
 .nf
-$ \fBnmcli conn add type ovs\-port conn\&.interface port1 conn\&.master bridge0\fR
+$ \fBnmcli conn add type ovs\-port conn\&.interface port1 master bridge0\fR
 Connection \*(Aqovs\-port\-port1\*(Aq (67d041eb\-8e7b\-4458\-afee\-a1d07c9c4552) successfully added\&.
-$ \fBnmcli conn add type ethernet conn\&.interface eth0 conn\&.master port1\fR
+$ \fBnmcli conn add type ethernet conn\&.interface eth0 master port1\fR
 Connection \*(Aqovs\-slave\-eth0\*(Aq (d459c45c\-cf78\-4c1c\-b4b7\-505e71379624) successfully added\&.
 .fi
 .if n \{\
@@ -167,9 +167,9 @@ Again, you need a port\&.
 .RS 4
 .\}
 .nf
-$ \fBnmcli conn add type ovs\-port conn\&.interface port2 conn\&.master bridge0 ovs\-port\&.tag 120\fR
+$ \fBnmcli conn add type ovs\-port conn\&.interface port2 master bridge0 ovs\-port\&.tag 120\fR
 Connection \*(Aqovs\-port\-port2\*(Aq (3994c093\-4ef7\-4549\-a4fd\-627b831c3cb8) successfully added\&.
-$ \fBnmcli conn add type ethernet conn\&.interface eth1 conn\&.master port2\fR
+$ \fBnmcli conn add type ethernet conn\&.interface eth1 master port2\fR
 Connection \*(Aqovs\-slave\-eth1\*(Aq (099be06e\-71ad\-484d\-8d5a\-fcadc5f207f5) successfully added\&.
 .fi
 .if n \{\
@@ -184,11 +184,11 @@ It\*(Aqs just a port with a tag\&.
 .RS 4
 .\}
 .nf
-$ \fBnmcli conn add type ovs\-port conn\&.interface bond0 conn\&.master bridge0\fR
+$ \fBnmcli conn add type ovs\-port conn\&.interface bond0 master bridge0\fR
 Connection \*(Aqovs\-port\-bond0\*(Aq (d154ebf9\-e999\-4e1b\-a084\-a3de53d25d8a) successfully added\&.
-$ \fBnmcli conn add type ethernet conn\&.interface eth2 conn\&.master bond0\fR
+$ \fBnmcli conn add type ethernet conn\&.interface eth2 master bond0\fR
 Connection \*(Aqovs\-slave\-eth2\*(Aq (475ac1bf\-30b2\-4534\-a877\-27f33f58b082) successfully added\&.
-$ \fBnmcli conn add type ethernet conn\&.interface eth3 conn\&.master bond0\fR
+$ \fBnmcli conn add type ethernet conn\&.interface eth3 master bond0\fR
 Connection \*(Aqovs\-slave\-eth3\*(Aq (8dedeecb\-ed12\-482b\-b77a\-24a4fb835136) successfully added\&.
 .fi
 .if n \{\
diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml
index c71e2008..2b824c0e 100644
--- a/man/nm-openvswitch.xml
+++ b/man/nm-openvswitch.xml
@@ -132,9 +132,9 @@
     <example><title>Creating a Bridge with a single internal Interface</title>
 <screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-bridge conn.interface bridge0</userinput>
 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 conn.master bridge0</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 master bridge0</userinput>
 Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface conn.interface iface0 conn.master port0 \
+<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface conn.interface iface0 master port0 \
   ipv4.method manual ipv4.address 192.0.2.1/24</userinput>
 Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added.
 </screen>
@@ -145,29 +145,29 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success
     </example>
 
     <example><title>Adding a Linux interface to a Bridge</title>
-<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 conn.master bridge0</userinput>
+<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 master bridge0</userinput>
 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 conn.master port1</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 master port1</userinput>
 Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added.
 </screen>
 <para>Again, you need a port.</para>
     </example>
 
     <example><title>Creating a VLAN</title>
-<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120</userinput>
+<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120</userinput>
 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 conn.master port2</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 master port2</userinput>
 Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added.
 </screen>
       <para>It's just a port with a tag.</para>
     </example>
 
     <example><title>Creating a Bond</title>
-<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 conn.master bridge0</userinput>
+<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 master bridge0</userinput>
 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 conn.master bond0</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 master bond0</userinput>
 Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added.
-<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 conn.master bond0</userinput>
+<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 master bond0</userinput>
 Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added.
 </screen>
       <para>It's just a Port with multiple interfaces. See nm-settings manual for
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index e4fb1c1e..a8dba20d 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 vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.12\&.2" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.12\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index a4578756..859a54f7 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.12.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>
+<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.12.4</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 f91ba161..976ce493 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 vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.12\&.2" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.12\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 28303684..1b39dd43 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.12.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>
+<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.12.4</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 ba832ea3..afa9841b 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.12\&.2" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.12\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1765,7 +1765,7 @@ string
 T}:T{
 \ \&
 T}:T{
-A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. When the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary client ID, in which case the first byte is assumed to be the \*(Aqtype\*(Aq field as per RFC 2132 section 9\&.14 and the remaining bytes may be an hardware address (e\&.g\&. \*(Aq01:xx:xx:xx:xx:xx:xx\*(Aq where 1 is the Ethernet ARP type and the rest is a MAC address)\&. If the property is not a hex string it is considered as a non\-hardware\-address client ID and the \*(Aqtype\*(Aq field is set to 0\&. The special values "mac" and "perm\-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01)\&. Currently, these options only work for ethernet type of links\&. The special value "stable" is supported to generate a type 0 client identifier based on the stable\-id (see connection\&.stable\-id) and a per\-host key\&. If unset, a globally configured default is used\&. If still unset, the client\-id from the last lease is reused\&.
+A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options\&. When the property is a hex string (\*(Aqaa:bb:cc\*(Aq) it is interpreted as a binary client ID, in which case the first byte is assumed to be the \*(Aqtype\*(Aq field as per RFC 2132 section 9\&.14 and the remaining bytes may be an hardware address (e\&.g\&. \*(Aq01:xx:xx:xx:xx:xx:xx\*(Aq where 1 is the Ethernet ARP type and the rest is a MAC address)\&. If the property is not a hex string it is considered as a non\-hardware\-address client ID and the \*(Aqtype\*(Aq field is set to 0\&. The special values "mac" and "perm\-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01)\&. Currently, these options only work for ethernet type of links\&. The special value "stable" is supported to generate a type 0 client identifier based on the stable\-id (see connection\&.stable\-id) and a per\-host key\&. If unset, a globally configured default is used\&. If still unset, the client\-id from the last lease is reused\&.
 T}
 T{
 dhcp\-fqdn
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index 21135fc9..9fda90f9 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.12.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>
+<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.12.4</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" id="nm-settings.property.ipv4.address-data">address-data</entry><entry align="left">array of vardict</entry><entry align="left"/><entry>Array of IPv4 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" id="nm-settings.property.ipv4.addresses">addresses</entry><entry align="left">array of array of uint32</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 IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dad-timeout">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 zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.</entry></row>
-    <row><entry align="left" id="nm-settings.property.ipv4.dhcp-client-id">dhcp-client-id</entry><entry align="left">string</entry><entry align="left"/><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet type (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
+    <row><entry align="left" id="nm-settings.property.ipv4.dhcp-client-id">dhcp-client-id</entry><entry align="left">string</entry><entry align="left"/><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values "mac" and "perm-mac" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value "stable" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If unset, a globally configured default is used. If still unset, the client-id from the last lease is reused.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dhcp-fqdn">dhcp-fqdn</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dhcp-hostname">dhcp-hostname</entry><entry align="left">string</entry><entry align="left"/><entry>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.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dhcp-send-hostname">dhcp-send-hostname</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.</entry></row>
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index 8e728a74..b2bddc6f 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.12\&.2" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.12\&.4" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index 9a934f0d..7a82b5ee 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.12\&.2" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.12\&.4" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index 63652b3f..b7c12291 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2018
+.\"      Date: 09/18/2018
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.12.2
+.\"    Source: NetworkManager 1.12.4
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.12\&.2" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.12\&.4" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 0fb21e2b..d997f479 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "shared/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.12.2',
+  version: '1.12.4',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -652,7 +652,11 @@ config_h.set_quoted('DNSMASQ_PATH', find_program(get_option('dnsmasq')).path())
 
 # dnssec-trigger-script path
 dnssec_trigger_script = find_program(get_option('dnssec_trigger'), required: false)
-config_h.set_quoted('DNSSEC_TRIGGER_SCRIPT', (dnssec_trigger_script.found() ? dnssec_trigger_script.path() : '/usr/libexec/dnssec-trigger-script'))
+if dnssec_trigger_script.found()
+  config_h.set_quoted('DNSSEC_TRIGGER_SCRIPT', dnssec_trigger_script.path())
+else
+  config_h.set_quoted('DNSSEC_TRIGGER_SCRIPT', join_paths(nm_libexecdir, 'dnssec-trigger-script'))
+endif
 
 # system CA certificates path
 system_ca_path = get_option('system_ca_path')
diff --git a/po/cs.po b/po/cs.po
index 007000bc..7490c7aa 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-05-29 17:44+0200\n"
-"PO-Revision-Date: 2018-03-29 17:52+0200\n"
+"PO-Revision-Date: 2018-09-13 16:02+0200\n"
 "Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.1.1\n"
 
 #: ../clients/cli/agent.c:40
 #, c-format
@@ -208,9 +208,9 @@ msgstr ""
 #. We should not really come here
 #: ../clients/cli/common.c:434 ../clients/cli/connections.c:3095
 #: ../clients/cli/connections.c:3155
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error"
-msgstr "Neznámý"
+msgstr "Neznámá chyba"
 
 #: ../clients/cli/common.c:437
 msgid "Device is now managed"
@@ -964,9 +964,8 @@ msgid "activated"
 msgstr "aktivováno"
 
 #: ../clients/cli/connections.c:530
-#, fuzzy
 msgid "deactivated"
-msgstr "aktivováno"
+msgstr "deaktivováno"
 
 #: ../clients/cli/connections.c:542
 msgid "VPN connecting (prepare)"
@@ -1617,9 +1616,9 @@ msgstr ""
 
 #: ../clients/cli/connections.c:6047 ../clients/cli/connections.c:6184
 #: ../clients/cli/connections.c:6610 ../clients/cli/connections.c:7569
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: '%s'\n"
-msgstr "Neznámá doména evidence „%s“"
+msgstr "Neznámý příkaz: „%s“\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
@@ -2739,9 +2738,8 @@ msgid "%s: device removed\n"
 msgstr ""
 
 #: ../clients/cli/devices.c:2609
-#, fuzzy
 msgid "Wi-Fi scan list"
-msgstr "Seznam prohledání WiFi"
+msgstr "Seznam prohledání Wi-Fi"
 
 #: ../clients/cli/devices.c:2657
 #, fuzzy, c-format
@@ -2947,9 +2945,8 @@ msgid "running"
 msgstr "běží"
 
 #: ../clients/cli/general.c:201
-#, fuzzy
 msgid "starting"
-msgstr "aktivuje se"
+msgstr "spouští se"
 
 #: ../clients/cli/general.c:201
 msgid "started"
@@ -3263,7 +3260,7 @@ msgstr "připojeno"
 
 #: ../clients/cli/general.c:1183
 msgid "fw missing"
-msgstr ""
+msgstr "fw chybí"
 
 #: ../clients/cli/general.c:1188
 #, fuzzy
@@ -3272,11 +3269,11 @@ msgstr "Chyba: schází argument %s."
 
 #: ../clients/cli/general.c:1193
 msgid "sw"
-msgstr ""
+msgstr "sw"
 
 #: ../clients/cli/general.c:1195
 msgid "hw"
-msgstr ""
+msgstr "hw"
 
 #: ../clients/cli/general.c:1200
 msgid "iface"
@@ -3284,11 +3281,11 @@ msgstr ""
 
 #: ../clients/cli/general.c:1203
 msgid "port"
-msgstr ""
+msgstr "port"
 
 #: ../clients/cli/general.c:1206
 msgid "mtu"
-msgstr ""
+msgstr "mtu"
 
 #: ../clients/cli/general.c:1223
 msgid "master"
@@ -3301,16 +3298,16 @@ msgstr "VPN"
 
 #: ../clients/cli/general.c:1229
 msgid "ip4 default"
-msgstr ""
+msgstr "ip4 výchozí"
 
 #: ../clients/cli/general.c:1231
 msgid "ip6 default"
-msgstr ""
+msgstr "ip6 výchozí"
 
 #: ../clients/cli/general.c:1314
-#, fuzzy, c-format
+#, c-format
 msgid "%s VPN connection"
-msgstr "VPN se připojuje"
+msgstr "%s VPN připojení"
 
 #: ../clients/cli/general.c:1384
 #, c-format
@@ -3503,9 +3500,9 @@ msgid "Warning: %s\n"
 msgstr ""
 
 #: ../clients/cli/settings.c:385
-#, fuzzy, c-format
+#, c-format
 msgid "Info: %s\n"
-msgstr "Chyba: %s."
+msgstr "Info: %s\n"
 
 #: ../clients/cli/settings.c:477
 msgid "don't know how to get the property value"
@@ -3755,14 +3752,14 @@ msgid "invalid option '%s', use one of [%s]"
 msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:1316
-#, fuzzy, c-format
+#, c-format
 msgid "%d (key)"
-msgstr "%d (hex-ascii-klí�)"
+msgstr "%d (klí�)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1318
-#, fuzzy, c-format
+#, c-format
 msgid "%d (passphrase)"
-msgstr "%d (104/128bitové heslo)"
+msgstr "%d (heslo)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1321
 #: ../clients/common/nm-meta-setting-desc.c:1410
@@ -3772,52 +3769,50 @@ msgstr "%d (neznámé)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1353
 msgid "0 (NONE)"
-msgstr ""
+msgstr "0 (Ž�DNÉ)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1359
 msgid "REORDER_HEADERS, "
-msgstr ""
+msgstr "REORDER_HEADERS, "
 
 #: ../clients/common/nm-meta-setting-desc.c:1361
 msgid "GVRP, "
-msgstr ""
+msgstr "GVRP, "
 
 #: ../clients/common/nm-meta-setting-desc.c:1363
 msgid "LOOSE_BINDING, "
-msgstr ""
+msgstr "LOOSE_BINDING, "
 
 #: ../clients/common/nm-meta-setting-desc.c:1365
 msgid "MVRP, "
-msgstr ""
+msgstr "MVRP, "
 
 #: ../clients/common/nm-meta-setting-desc.c:1404
-#, fuzzy, c-format
+#, c-format
 msgid "%d (disabled)"
-msgstr "zakázáno"
+msgstr "%d (zakázáno)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1406
 #, c-format
 msgid "%d (enabled, prefer public IP)"
-msgstr ""
+msgstr "%d (povoleno, preferovat veřejnou IP)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1408
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
-msgstr ""
+msgstr "%d (povoleno, preferovat do�asnou IP)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1423
-#, fuzzy
 msgid "0 (none)"
-msgstr "(nic)"
+msgstr "0 (žádné)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1429
 msgid "agent-owned, "
 msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:1431
-#, fuzzy
 msgid "not saved, "
-msgstr "nenastaveno"
+msgstr "neuloženo, "
 
 #: ../clients/common/nm-meta-setting-desc.c:1433
 msgid "not required, "
@@ -3950,14 +3945,12 @@ msgid "the property doesn't contain UUID '%s'"
 msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:2634
-#, fuzzy
 msgid "0 (disabled)"
-msgstr "zakázáno"
+msgstr "0 (zakázáno)"
 
 #: ../clients/common/nm-meta-setting-desc.c:2640
-#, fuzzy
 msgid "enabled, "
-msgstr "povoleno"
+msgstr "povoleno, "
 
 #: ../clients/common/nm-meta-setting-desc.c:2642
 msgid "advertise, "
@@ -4011,9 +4004,9 @@ msgid "default"
 msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:3134
-#, fuzzy, c-format
+#, c-format
 msgid "%d (off)"
-msgstr "%d (neznámé)"
+msgstr "%d (vypnuto)"
 
 #: ../clients/common/nm-meta-setting-desc.c:3171
 #: ../clients/common/nm-meta-setting-desc.c:3190
@@ -4296,14 +4289,14 @@ msgstr ""
 #: ../clients/common/nm-secret-agent-simple.c:328
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:321
 msgid "Username"
-msgstr ""
+msgstr "Uživatelské jméno"
 
 #: ../clients/common/nm-meta-setting-desc.c:4774
 #: ../clients/common/nm-meta-setting-desc.c:4952
 #: ../clients/common/nm-meta-setting-desc.c:5221
 #: ../clients/common/nm-meta-setting-desc.c:5788
 msgid "Password [none]"
-msgstr ""
+msgstr "Heslo [žádné]"
 
 #: ../clients/common/nm-meta-setting-desc.c:4821
 msgid "Bluetooth device address"
@@ -4396,23 +4389,22 @@ msgid ""
 msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:5232
-#, fuzzy
 msgid "APN"
-msgstr "AP"
+msgstr "APN"
 
 #: ../clients/common/nm-meta-setting-desc.c:5284
 #: ../clients/common/nm-meta-setting-desc.c:6276
 #: ../clients/common/nm-meta-setting-desc.c:6422
 msgid "MTU [auto]"
-msgstr ""
+msgstr "MTU [automaticky]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5303
 msgid "P_KEY [none]"
-msgstr ""
+msgstr "P_KL�Č [žádný]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5312
 msgid "Parent interface [none]"
-msgstr ""
+msgstr "Rodi�ovské rozhraní [žádné]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5335
 msgid ""
@@ -4420,10 +4412,13 @@ msgid ""
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
 msgstr ""
+"Vložte seznam IPv4 adres DNS serverů.\n"
+"\n"
+"Například: 8.8.8.8, 8.8.4.4\n"
 
 #: ../clients/common/nm-meta-setting-desc.c:5367
 msgid "IPv4 address (IP[/plen]) [none]"
-msgstr ""
+msgstr "IPv4 adresa (IP[/plen]) [žádná]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5369
 msgid ""
@@ -4436,7 +4431,7 @@ msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:5382
 msgid "IPv4 gateway [none]"
-msgstr ""
+msgstr "IPv4 brána [žádná]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5390
 msgid ""
@@ -4465,7 +4460,7 @@ msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:5494
 msgid "IPv6 address (IP[/plen]) [none]"
-msgstr ""
+msgstr "IPv6 adresa (IP[/plen]) [žádná]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5496
 msgid ""
@@ -4478,7 +4473,7 @@ msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:5509
 msgid "IPv6 gateway [none]"
-msgstr ""
+msgstr "IPv6 brána [žádná]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5517
 msgid ""
@@ -4506,7 +4501,7 @@ msgstr ""
 #: ../clients/common/nm-meta-setting-desc.c:5608
 #: ../clients/common/nm-meta-setting-desc.c:6156
 msgid "Remote"
-msgstr ""
+msgstr "Vzdálené"
 
 #: ../clients/common/nm-meta-setting-desc.c:5645
 msgid "MACsec parent device or connection UUID"
@@ -4514,16 +4509,16 @@ msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:5666
 msgid "Enable encryption [yes]"
-msgstr ""
+msgstr "Povolit šifrování [ano]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5672
 #: ../clients/common/nm-secret-agent-simple.c:520
 msgid "MKA CAK"
-msgstr ""
+msgstr "MKA CAK"
 
 #: ../clients/common/nm-meta-setting-desc.c:5682
 msgid "MKA_CKN"
-msgstr ""
+msgstr "MKA_CKN"
 
 #: ../clients/common/nm-meta-setting-desc.c:5688
 msgid "SCI port [1]"
@@ -4553,13 +4548,12 @@ msgid "DHCP anycast MAC address [none]"
 msgstr ""
 
 #: ../clients/common/nm-meta-setting-desc.c:5775
-#, fuzzy
 msgid "Service [none]"
-msgstr "Služba"
+msgstr "Služba [žádná]"
 
 #: ../clients/common/nm-meta-setting-desc.c:5782
 msgid "PPPoE username"
-msgstr ""
+msgstr "Uživatelské jméno PPPoE"
 
 #: ../clients/common/nm-meta-setting-desc.c:5881
 msgid "Browser only [no]"
@@ -4665,7 +4659,7 @@ msgstr ""
 #. ***************************************************************************
 #: ../clients/common/nm-meta-setting-desc.c:6708
 msgid "802-1x settings"
-msgstr ""
+msgstr "802-1x nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6709
 #: ../src/devices/adsl/nm-device-adsl.c:137
@@ -4673,23 +4667,20 @@ msgid "ADSL connection"
 msgstr "ADSL připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6710
-#, fuzzy
 msgid "bluetooth connection"
-msgstr "připojuje se"
+msgstr "bluetooth připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6711
 msgid "Bond device"
-msgstr ""
+msgstr "Zařízení Bond"
 
 #: ../clients/common/nm-meta-setting-desc.c:6712
-#, fuzzy
 msgid "Bridge device"
-msgstr "Aktivní připojení"
+msgstr "Zařízení Most"
 
 #: ../clients/common/nm-meta-setting-desc.c:6713
-#, fuzzy
 msgid "Bridge port"
-msgstr "Aktivní připojení"
+msgstr "Port Most"
 
 #: ../clients/common/nm-meta-setting-desc.c:6714
 msgid "CDMA mobile broadband connection"
@@ -4697,19 +4688,19 @@ msgstr "Mobilní širokopásmové připojení CDMA"
 
 #: ../clients/common/nm-meta-setting-desc.c:6715
 msgid "General settings"
-msgstr ""
+msgstr "Obecné nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6716
 msgid "DCB settings"
-msgstr ""
+msgstr "DCB nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6717
 msgid "Dummy settings"
-msgstr ""
+msgstr "Prázdné nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6718
 msgid "Generic settings"
-msgstr ""
+msgstr "Generické nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6719
 msgid "GSM mobile broadband connection"
@@ -4717,68 +4708,64 @@ msgstr "Mobilní širokopásmové připojení GSM"
 
 #: ../clients/common/nm-meta-setting-desc.c:6720
 #: ../src/devices/nm-device-infiniband.c:192
-#, fuzzy
 msgid "InfiniBand connection"
-msgstr "Drátové připojení %d"
+msgstr "InfiniBand připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6721
 msgid "IPv4 protocol"
-msgstr ""
+msgstr "IPv4 protokol"
 
 #: ../clients/common/nm-meta-setting-desc.c:6722
 msgid "IPv6 protocol"
-msgstr ""
+msgstr "IPv6 protokol"
 
 #: ../clients/common/nm-meta-setting-desc.c:6723
 msgid "IP-tunnel settings"
-msgstr ""
+msgstr "IP-tunel nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6724
 msgid "MACsec connection"
-msgstr ""
+msgstr "MACsec připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6725
-#, fuzzy
 msgid "macvlan connection"
-msgstr "připojuje se"
+msgstr "macvlan připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6726
-#, fuzzy
 msgid "OLPC Mesh connection"
-msgstr "Připojení CDMA %d"
+msgstr "OLPC Mesh připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6727
 msgid "PPP settings"
-msgstr ""
+msgstr "Nastavení PPP"
 
 #: ../clients/common/nm-meta-setting-desc.c:6728
 msgid "PPPoE"
-msgstr ""
+msgstr "PPPoE"
 
 #: ../clients/common/nm-meta-setting-desc.c:6729
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #: ../clients/common/nm-meta-setting-desc.c:6730
 msgid "Serial settings"
-msgstr ""
+msgstr "Nastavení Serial"
 
 #: ../clients/common/nm-meta-setting-desc.c:6731
 msgid "Team device"
-msgstr ""
+msgstr "Zařízení Team"
 
 #: ../clients/common/nm-meta-setting-desc.c:6732
 msgid "Team port"
-msgstr ""
+msgstr "Port Team"
 
 #: ../clients/common/nm-meta-setting-desc.c:6733
-#, fuzzy
 msgid "Tun device"
-msgstr "Zařízení"
+msgstr "Zařízení Tun"
 
 #: ../clients/common/nm-meta-setting-desc.c:6734
 msgid "User settings"
-msgstr ""
+msgstr "Uživatelské nastavení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6735
 #: ../src/devices/nm-device-vlan.c:433
@@ -4808,11 +4795,11 @@ msgstr "Wi-Fi připojení"
 
 #: ../clients/common/nm-meta-setting-desc.c:6741
 msgid "Wi-Fi security settings"
-msgstr ""
+msgstr "Nastavení zabezpe�ení Wi-Fi"
 
 #: ../clients/common/nm-meta-setting-desc.c:7013
 msgid "name"
-msgstr ""
+msgstr "název"
 
 #: ../clients/common/nm-polkit-listener.c:212
 msgid "An authentication session is already underway."
@@ -4832,20 +4819,20 @@ msgstr ""
 #: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:297
 #: ../clients/tui/nmt-page-wifi.c:330
 msgid "Password"
-msgstr ""
+msgstr "Heslo"
 
 #: ../clients/common/nm-secret-agent-simple.c:241
 msgid "Identity"
-msgstr ""
+msgstr "Identita"
 
 #: ../clients/common/nm-secret-agent-simple.c:248
 msgid "Private key password"
-msgstr ""
+msgstr "Heslo soukromého klí�e"
 
 #: ../clients/common/nm-secret-agent-simple.c:289
 #: ../clients/tui/nmt-page-wifi.c:278
 msgid "Key"
-msgstr ""
+msgstr "Klí�"
 
 #: ../clients/common/nm-secret-agent-simple.c:335
 #: ../clients/tui/nmt-page-dsl.c:78
@@ -4885,7 +4872,7 @@ msgstr "pro připojení „%s“ nebylo nalezeno žádné zařízení"
 
 #: ../clients/common/nm-secret-agent-simple.c:489
 msgid "PIN code required"
-msgstr ""
+msgstr "Požadován PIN kód"
 
 #: ../clients/common/nm-secret-agent-simple.c:490
 #, fuzzy
@@ -4893,9 +4880,8 @@ msgid "PIN code is needed for the mobile broadband device"
 msgstr "Povolit nebo zakázat mobilní širokopásmová zařízení"
 
 #: ../clients/common/nm-secret-agent-simple.c:492
-#, fuzzy
 msgid "PIN"
-msgstr "VPN"
+msgstr "PIN"
 
 #: ../clients/common/nm-secret-agent-simple.c:500
 #: ../clients/common/nm-secret-agent-simple.c:534
@@ -7009,9 +6995,8 @@ msgid ""
 msgstr ""
 
 #: ../clients/nm-online.c:91
-#, fuzzy
 msgid "Connecting"
-msgstr "připojuje se"
+msgstr "Připojuje se"
 
 #: ../clients/nm-online.c:189
 #, fuzzy, c-format
@@ -7058,7 +7043,7 @@ msgstr ""
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
 #: ../clients/tui/nmtui.c:136
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:325
 #: ../clients/tui/newt/nmt-newt-utils.c:357
@@ -7089,7 +7074,7 @@ msgstr "Nelze dekódovat soubor PKCS#8: %s"
 #: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
 #: ../libnm/nm-device.c:1517
 msgid "Ethernet"
-msgstr ""
+msgstr "Drátové připojení"
 
 #: ../clients/tui/nm-editor-utils.c:150
 #, c-format
@@ -7099,7 +7084,7 @@ msgstr "Drátové připojení %d"
 #: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
 #: ../libnm/nm-device.c:1519
 msgid "Wi-Fi"
-msgstr ""
+msgstr "Wi-Fi"
 
 #: ../clients/tui/nm-editor-utils.c:158
 #, c-format
@@ -7109,12 +7094,12 @@ msgstr "Wi-Fi připojení %d"
 #: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1939
 #: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1529
 msgid "InfiniBand"
-msgstr ""
+msgstr "InfiniBand"
 
 #: ../clients/tui/nm-editor-utils.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "InfiniBand connection %d"
-msgstr "Drátové připojení %d"
+msgstr "InfiniBand připojení %d"
 
 #: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
 #: ../libnm/nm-device.c:1527
@@ -7127,9 +7112,8 @@ msgid "Mobile broadband connection %d"
 msgstr "Mobilní širokopásmové připojení %d"
 
 #: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
-#, fuzzy
 msgid "DSL"
-msgstr "DNS"
+msgstr "DSL"
 
 #: ../clients/tui/nm-editor-utils.c:185
 #, c-format
@@ -7144,39 +7128,39 @@ msgid "Bond"
 msgstr "Svazek"
 
 #: ../clients/tui/nm-editor-utils.c:194
-#, fuzzy, c-format
+#, c-format
 msgid "Bond connection %d"
-msgstr "Drátové připojení %d"
+msgstr "Připojení Bond %d"
 
 #: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1935
 #: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
 #: ../libnm/nm-device.c:1535
 #: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4766
 msgid "Bridge"
-msgstr ""
+msgstr "Most"
 
 #: ../clients/tui/nm-editor-utils.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "Bridge connection %d"
-msgstr "Drátové připojení %d"
+msgstr "Připojení Most %d"
 
 #: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1933
 #: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
 #: ../libnm/nm-device.c:1533
 #: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4579
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #: ../clients/tui/nm-editor-utils.c:213
-#, fuzzy, c-format
+#, c-format
 msgid "Team connection %d"
-msgstr "Drátové připojení %d"
+msgstr "Team připojení %d"
 
 #: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
 #: ../libnm-core/nm-connection.c:1937 ../libnm-glib/nm-device.c:1841
 #: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1537
 msgid "VLAN"
-msgstr ""
+msgstr "VLAN"
 
 #: ../clients/tui/nm-editor-utils.c:221
 #, c-format
@@ -7184,14 +7168,13 @@ msgid "VLAN connection %d"
 msgstr "VLAN připojení %d"
 
 #: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
-#, fuzzy
 msgid "IP tunnel"
-msgstr "Aktivní připojení"
+msgstr "IP tunel"
 
 #: ../clients/tui/nm-editor-utils.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "IP tunnel connection %d"
-msgstr "Aktivní připojení"
+msgstr "IP tunel připojení %d"
 
 #: ../clients/tui/nm-editor-utils.c:244
 #, c-format
@@ -7200,30 +7183,30 @@ msgstr "VPN připojení %d"
 
 #: ../clients/tui/nmt-device-entry.c:370
 msgid "Select..."
-msgstr ""
+msgstr "Vybrat..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:110
 msgid "Add"
-msgstr ""
+msgstr "Přidat"
 
 #: ../clients/tui/nmt-edit-connection-list.c:113
 #: ../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 "Upravit..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
 #: ../clients/tui/nmtui-edit.c:531
 msgid "Delete"
-msgstr ""
+msgstr "Odstranit"
 
 #: ../clients/tui/nmt-editor-section.c:103
 msgid "Hide"
-msgstr ""
+msgstr "Skrýt"
 
 #: ../clients/tui/nmt-editor-section.c:103
 msgid "Show"
-msgstr ""
+msgstr "Zobrazit"
 
 #: ../clients/tui/nmt-editor.c:98
 #, c-format
@@ -7252,7 +7235,7 @@ msgstr "nelze se připojit ke skupině netlink: %s"
 
 #: ../clients/tui/nmt-editor.c:333
 msgid "Profile name"
-msgstr ""
+msgstr "Název profilu"
 
 #: ../clients/tui/nmt-editor.c:344
 msgid "Ethernet device"
@@ -7265,17 +7248,17 @@ msgstr "Zařízení"
 #. And finally the bottom widgets
 #: ../clients/tui/nmt-editor.c:406
 msgid "Automatically connect"
-msgstr ""
+msgstr "Automaticky připojit"
 
 #: ../clients/tui/nmt-editor.c:412
 msgid "Available to all users"
-msgstr ""
+msgstr "Dostupné pro všechny uživatele"
 
 #: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
 #: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
 #: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #: ../clients/tui/nmt-mtu-entry.c:86 ../clients/tui/nmt-mtu-entry.c:117
 msgid "bytes"
@@ -7291,7 +7274,7 @@ msgstr ""
 
 #: ../clients/tui/nmt-page-bond.c:87
 msgid "XOR"
-msgstr ""
+msgstr "XOR"
 
 #: ../clients/tui/nmt-page-bond.c:88
 msgid "Broadcast"
@@ -7314,9 +7297,8 @@ msgid "MII (recommended)"
 msgstr ""
 
 #: ../clients/tui/nmt-page-bond.c:98
-#, fuzzy
 msgid "ARP"
-msgstr "AP"
+msgstr "ARP"
 
 #: ../clients/tui/nmt-page-bond.c:359
 msgid "BOND"
@@ -7386,7 +7368,7 @@ msgstr ""
 
 #: ../clients/tui/nmt-page-bridge.c:81
 msgid "BRIDGE"
-msgstr ""
+msgstr "MOST"
 
 #: ../clients/tui/nmt-page-bridge.c:96 ../clients/tui/nmt-page-bridge.c:127
 #: ../clients/tui/nmt-page-bridge.c:137 ../clients/tui/nmt-page-bridge.c:147
@@ -7426,29 +7408,27 @@ msgstr ""
 #: ../clients/tui/nmt-page-ip-tunnel.c:186 ../clients/tui/nmt-page-vlan.c:116
 #: ../clients/tui/nmt-page-wifi.c:359
 msgid "MTU"
-msgstr ""
+msgstr "MTU"
 
 #: ../clients/tui/nmt-page-infiniband.c:47
 msgid "Datagram"
 msgstr ""
 
 #: ../clients/tui/nmt-page-infiniband.c:48
-#, fuzzy
 msgid "Connected"
-msgstr "připojeno"
+msgstr "je připojeno"
 
 #: ../clients/tui/nmt-page-infiniband.c:81
 msgid "INFINIBAND"
-msgstr ""
+msgstr "INFINIBAND"
 
 #: ../clients/tui/nmt-page-infiniband.c:88
 msgid "Transport mode"
 msgstr ""
 
 #: ../clients/tui/nmt-page-ip4.c:38
-#, fuzzy
 msgid "Disabled"
-msgstr "zakázáno"
+msgstr "je zakázáno"
 
 #: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:39
 msgid "Automatic"
@@ -7456,7 +7436,7 @@ msgstr ""
 
 #: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
 msgid "Link-Local"
-msgstr ""
+msgstr "Link-Local"
 
 #: ../clients/tui/nmt-page-ip4.c:41 ../clients/tui/nmt-page-ip6.c:42
 msgid "Manual"
@@ -7480,15 +7460,15 @@ msgstr[2] ""
 
 #: ../clients/tui/nmt-page-ip4.c:128
 msgid "IPv4 CONFIGURATION"
-msgstr ""
+msgstr "IPv4 KONFIGURACE"
 
 #: ../clients/tui/nmt-page-ip4.c:136 ../clients/tui/nmt-page-ip6.c:136
 msgid "Addresses"
-msgstr ""
+msgstr "Adresy"
 
 #: ../clients/tui/nmt-page-ip4.c:150 ../clients/tui/nmt-page-ip6.c:150
 msgid "DNS servers"
-msgstr ""
+msgstr "DNS servery"
 
 #: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:156
 msgid "Search domains"
@@ -7496,7 +7476,7 @@ msgstr ""
 
 #: ../clients/tui/nmt-page-ip4.c:171 ../clients/tui/nmt-page-ip6.c:169
 msgid "Routing"
-msgstr ""
+msgstr "Směrování"
 
 #: ../clients/tui/nmt-page-ip4.c:173 ../clients/tui/nmt-page-ip6.c:171
 msgid "Never use this network for default route"
@@ -7508,110 +7488,108 @@ msgstr ""
 
 #: ../clients/tui/nmt-page-ip4.c:187
 msgid "Require IPv4 addressing for this connection"
-msgstr ""
+msgstr "Požadovat adresování IPv4 pro toto připojení"
 
 #: ../clients/tui/nmt-page-ip6.c:38
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorovat"
 
 #: ../clients/tui/nmt-page-ip6.c:40
 msgid "Automatic (DHCP-only)"
-msgstr ""
+msgstr "Automatické (pouze DHCP)"
 
 #: ../clients/tui/nmt-page-ip6.c:128
 msgid "IPv6 CONFIGURATION"
-msgstr ""
+msgstr "IPv6 KONFIGURACE"
 
 #: ../clients/tui/nmt-page-ip6.c:185
 msgid "Require IPv6 addressing for this connection"
-msgstr ""
+msgstr "Požadovat adresování IPv6 pro toto připojení"
 
 #. The order must match the NM_IP_TUNNEL_MODE_* enum
 #: ../clients/tui/nmt-page-ip-tunnel.c:78
 msgid "IPIP"
-msgstr ""
+msgstr "IPIP"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:79
 msgid "GRE"
-msgstr ""
+msgstr "GRE"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:80
 msgid "SIT"
-msgstr ""
+msgstr "SIT"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:81
 msgid "ISATAP"
-msgstr ""
+msgstr "ISATAP"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:82
 msgid "VTI"
-msgstr ""
+msgstr "VTI"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:83
 msgid "IP6IP6"
-msgstr ""
+msgstr "IP6IP6"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:84
 msgid "IPIP6"
-msgstr ""
+msgstr "IPIP6"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:85
 msgid "IP6GRE"
-msgstr ""
+msgstr "IP6GRE"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:86
 msgid "VTI6"
-msgstr ""
+msgstr "VTI6"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:150 ../clients/tui/nmt-page-vlan.c:87
 msgid "Parent"
-msgstr ""
+msgstr "Rodi�"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:157
 msgid "Local IP"
-msgstr ""
+msgstr "Lokální IP"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:163
 msgid "Remote IP"
-msgstr ""
+msgstr "Vzdálená IP"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:169
 msgid "Input key"
-msgstr ""
+msgstr "Vstupní klí�"
 
 #: ../clients/tui/nmt-page-ip-tunnel.c:176
 msgid "Output key"
-msgstr ""
+msgstr "Výstupní klí�"
 
 #: ../clients/tui/nmt-page-ppp.c:131
 msgid "PPP CONFIGURATION"
-msgstr ""
+msgstr "PPP KONFIGURACE"
 
 #: ../clients/tui/nmt-page-ppp.c:140
 msgid "Allowed authentication methods:"
-msgstr ""
+msgstr "Povolené metody autentizace:"
 
 #: ../clients/tui/nmt-page-ppp.c:147
-#, fuzzy
 msgid "EAP"
-msgstr "AP"
+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)"
@@ -7643,120 +7621,116 @@ msgstr ""
 
 #: ../clients/tui/nmt-page-team-port.c:92
 msgid "TEAM PORT"
-msgstr ""
+msgstr "TEAM PORT"
 
 #: ../clients/tui/nmt-page-team-port.c:99 ../clients/tui/nmt-page-team.c:163
 msgid "JSON configuration"
-msgstr ""
+msgstr "JSON konfigurace"
 
 #: ../clients/tui/nmt-page-team.c:145
 msgid "TEAM"
-msgstr ""
+msgstr "TEAM"
 
 #: ../clients/tui/nmt-page-vlan.c:102
 msgid "VLAN id"
-msgstr ""
+msgstr "VLAN id"
 
 #: ../clients/tui/nmt-page-wifi.c:57
 msgctxt "Wi-Fi"
 msgid "Client"
-msgstr ""
+msgstr "Klient"
 
 #: ../clients/tui/nmt-page-wifi.c:58
 msgid "Access Point"
-msgstr ""
+msgstr "Přístupový bod"
 
 #: ../clients/tui/nmt-page-wifi.c:59
-#, fuzzy
 msgid "Ad-Hoc Network"
-msgstr "Ad-Hoc"
+msgstr "Ad-Hoc síť"
 
 #: ../clients/tui/nmt-page-wifi.c:64
 msgctxt "Wi-Fi"
 msgid "Automatic"
-msgstr ""
+msgstr "Automaticky"
 
 #. 802.11a Wi-Fi network
 #: ../clients/tui/nmt-page-wifi.c:66
 msgid "A (5 GHz)"
-msgstr ""
+msgstr "A (5 GHz)"
 
 #. 802.11b / 802.11g Wi-Fi network
 #: ../clients/tui/nmt-page-wifi.c:68
 msgid "B/G (2.4 GHz)"
-msgstr ""
+msgstr "B/G (2.4 GHz)"
 
 #: ../clients/tui/nmt-page-wifi.c:73
 msgctxt "Wi-Fi security"
 msgid "None"
-msgstr ""
+msgstr "Žádné"
 
 #: ../clients/tui/nmt-page-wifi.c:74
 msgid "WPA & WPA2 Personal"
-msgstr ""
+msgstr "WPA & WPA2 Personal"
 
 #: ../clients/tui/nmt-page-wifi.c:75
-#, fuzzy
 msgid "WPA & WPA2 Enterprise"
-msgstr "Podnikové "
+msgstr "WPA & WPA2 Enterprise"
 
 #: ../clients/tui/nmt-page-wifi.c:76
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr ""
+msgstr "WEP 40/128-bit klí� (Hex nebo ASCII)"
 
 #: ../clients/tui/nmt-page-wifi.c:77
-#, fuzzy
 msgid "WEP 128-bit Passphrase"
-msgstr "%d (104/128bitové heslo)"
+msgstr "WEP 128-bit heslo"
 
 #: ../clients/tui/nmt-page-wifi.c:78
 msgid "Dynamic WEP (802.1x)"
-msgstr ""
+msgstr "Dynamický WEP (802.1x)"
 
 #: ../clients/tui/nmt-page-wifi.c:79
 msgid "LEAP"
-msgstr ""
+msgstr "LEAP"
 
 #: ../clients/tui/nmt-page-wifi.c:84
 msgctxt "WEP key index"
 msgid "1 (Default)"
-msgstr ""
+msgstr "1 (Výchozí)"
 
 #: ../clients/tui/nmt-page-wifi.c:85
 msgctxt "WEP key index"
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #: ../clients/tui/nmt-page-wifi.c:86
 msgctxt "WEP key index"
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: ../clients/tui/nmt-page-wifi.c:87
 msgctxt "WEP key index"
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../clients/tui/nmt-page-wifi.c:92
-#, fuzzy
 msgid "Open System"
-msgstr "Systém"
+msgstr "Otevřený systém"
 
 #: ../clients/tui/nmt-page-wifi.c:93
 msgid "Shared Key"
-msgstr ""
+msgstr "Sdílený klí�"
 
 #: ../clients/tui/nmt-page-wifi.c:203
 msgid "WI-FI"
-msgstr ""
+msgstr "WI-FI"
 
 #: ../clients/tui/nmt-page-wifi.c:245
 msgid "Channel"
-msgstr ""
+msgstr "Kanál"
 
 #: ../clients/tui/nmt-page-wifi.c:250
 msgid "Security"
-msgstr ""
+msgstr "Zabezpe�ení"
 
 #. "wpa-enterprise"
 #. FIXME
@@ -7765,13 +7739,12 @@ msgid "(No support for wpa-enterprise yet...)"
 msgstr ""
 
 #: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
-#, fuzzy
 msgid "WEP index"
-msgstr "WEP "
+msgstr "WEP index"
 
 #: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
 msgid "Authentication"
-msgstr ""
+msgstr "Autentizace"
 
 #. "dynamic-wep"
 #. FIXME
@@ -7789,11 +7762,11 @@ msgstr ""
 
 #: ../clients/tui/nmt-password-fields.c:129
 msgid "Show password"
-msgstr ""
+msgstr "Zobrazit heslo"
 
 #: ../clients/tui/nmt-route-table.c:191
 msgid "Destination"
-msgstr ""
+msgstr "Cíl"
 
 #: ../clients/tui/nmt-route-table.c:191
 msgid "Prefix"
@@ -7801,11 +7774,11 @@ msgstr "Před�íslí"
 
 #: ../clients/tui/nmt-route-table.c:200
 msgid "Next Hop"
-msgstr ""
+msgstr "Další skok"
 
 #: ../clients/tui/nmt-route-table.c:208
 msgid "Metric"
-msgstr ""
+msgstr "Metrika"
 
 #: ../clients/tui/nmt-route-table.c:228
 msgid "No custom routes are defined."
@@ -7817,11 +7790,11 @@ msgstr ""
 
 #: ../clients/tui/nmt-widget-list.c:139
 msgid "Add..."
-msgstr ""
+msgstr "Přidat..."
 
 #: ../clients/tui/nmt-widget-list.c:202
 msgid "Remove"
-msgstr ""
+msgstr "Odstranit"
 
 #: ../clients/tui/nmtui-connect.c:54
 msgid ""
@@ -7845,48 +7818,43 @@ msgid "openconnect failed with signal %d"
 msgstr ""
 
 #: ../clients/tui/nmtui-connect.c:178
-#, fuzzy
 msgid "Activation failed"
-msgstr "připojení se nezdařilo"
+msgstr "Aktivace se nezdařila"
 
 #: ../clients/tui/nmtui-connect.c:233
-#, fuzzy
 msgid "Connecting..."
-msgstr "připojuje se"
+msgstr "připojuje se..."
 
 #: ../clients/tui/nmtui-connect.c:271 ../clients/tui/nmtui-connect.c:302
-#, fuzzy, c-format
+#, c-format
 msgid "Could not activate connection: %s"
-msgstr "žádné aktivní připojení nebo zařízení „%s“"
+msgstr "Nelze aktivovat připojení: %s"
 
 #: ../clients/tui/nmtui-connect.c:362 ../clients/tui/nmtui-connect.c:411
-#, fuzzy
 msgid "Activate"
-msgstr "aktivováno"
+msgstr "Aktivovat"
 
 #: ../clients/tui/nmtui-connect.c:364
-#, fuzzy
 msgid "Deactivate"
-msgstr "aktivováno"
+msgstr "Deaktivovat"
 
 #: ../clients/tui/nmtui-connect.c:416 ../clients/tui/nmtui-edit.c:120
 #: ../clients/tui/nmtui.c:130
 msgid "Quit"
-msgstr ""
+msgstr "Ukon�it"
 
 #: ../clients/tui/nmtui-connect.c:416 ../clients/tui/nmtui-edit.c:120
 msgid "Back"
-msgstr ""
+msgstr "Zpět"
 
 #: ../clients/tui/nmtui-connect.c:439
-#, fuzzy, c-format
+#, c-format
 msgid "No such connection '%s'"
-msgstr "Připojení PAN %d"
+msgstr "Připojení „%s“ neexistuje"
 
 #: ../clients/tui/nmtui-connect.c:441
-#, fuzzy
 msgid "Connection is already active"
-msgstr "Připojení aktivováno\n"
+msgstr "Připojení je již aktivní"
 
 #: ../clients/tui/nmtui-edit.c:230
 msgid "Create"
@@ -7903,9 +7871,8 @@ msgid ""
 msgstr ""
 
 #: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
-#, fuzzy
 msgid "New Connection"
-msgstr "VPN se připojuje"
+msgstr "Nové připojení"
 
 #: ../clients/tui/nmtui-edit.c:471
 #, fuzzy, c-format
@@ -7942,41 +7909,36 @@ msgid "Unable to set hostname: %s"
 msgstr ""
 
 #: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
-#, fuzzy
 msgid "connection"
-msgstr "připojuje se"
+msgstr "připojení"
 
 #: ../clients/tui/nmtui.c:54
-#, fuzzy
 msgid "Edit a connection"
-msgstr "odpojuje se"
+msgstr "Upravit připojení"
 
 #: ../clients/tui/nmtui.c:57
-#, fuzzy
 msgid "Activate a connection"
-msgstr "Aktivní připojení"
+msgstr "Aktivovat připojení"
 
 #: ../clients/tui/nmtui.c:59
 msgid "new hostname"
-msgstr ""
+msgstr "nový název po�íta�e"
 
 #: ../clients/tui/nmtui.c:60
-#, fuzzy
 msgid "Set system hostname"
-msgstr "Měnit trvalý systémový název po�íta�e"
+msgstr "Nastavit systémový název po�íta�e"
 
 #: ../clients/tui/nmtui.c:104
-#, fuzzy
 msgid "NetworkManager TUI"
-msgstr "Stav správce sítě NetworkManager"
+msgstr "NetworkManager TUI"
 
 #: ../clients/tui/nmtui.c:112
 msgid "Please select an option"
-msgstr ""
+msgstr "Prosím vyberte možnost"
 
 #: ../clients/tui/nmtui.c:160
 msgid "Usage"
-msgstr ""
+msgstr "Použití"
 
 #: ../clients/tui/nmtui.c:241
 msgid "Could not parse arguments"
@@ -7988,9 +7950,8 @@ msgid "Could not contact NetworkManager: %s.\n"
 msgstr ""
 
 #: ../clients/tui/nmtui.c:256
-#, fuzzy
 msgid "NetworkManager is not running."
-msgstr "Chyba: NetworkManager neběží."
+msgstr "NetworkManager neběží."
 
 #: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
 #, c-format
@@ -8350,9 +8311,8 @@ msgid "property is missing"
 msgstr "Chyba: schází argument %s."
 
 #: ../libnm-core/nm-connection.c:1942
-#, fuzzy
 msgid "IP Tunnel"
-msgstr "Aktivní připojení"
+msgstr "IP tunel"
 
 #: ../libnm-core/nm-dbus-utils.c:188
 #, c-format
@@ -9701,39 +9661,39 @@ msgstr ""
 
 #: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1521
 msgid "Bluetooth"
-msgstr ""
+msgstr "Bluetooth"
 
 #: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1523
 msgid "OLPC Mesh"
-msgstr ""
+msgstr "OLPC Mesh"
 
 #: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1525
 msgid "WiMAX"
-msgstr ""
+msgstr "WiMAX"
 
 #: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1539
 msgid "ADSL"
-msgstr ""
+msgstr "ADSL"
 
 #: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1541
 msgid "MACVLAN"
-msgstr ""
+msgstr "MACVLAN"
 
 #: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1543
 msgid "VXLAN"
-msgstr ""
+msgstr "VXLAN"
 
 #: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1545
 msgid "IPTunnel"
-msgstr ""
+msgstr "IPTunnel"
 
 #: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1547
 msgid "Tun"
-msgstr ""
+msgstr "Tun"
 
 #: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1549
 msgid "Veth"
-msgstr ""
+msgstr "Veth"
 
 #: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1585
 msgid "Wired"
@@ -9741,11 +9701,11 @@ msgstr "Drátové"
 
 #: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1616
 msgid "PCI"
-msgstr ""
+msgstr "PCI"
 
 #: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1618
 msgid "USB"
-msgstr ""
+msgstr "USB"
 
 #. TRANSLATORS: the first %s is a bus name (eg, "USB") or
 #. * product name, the second is a device type (eg,
@@ -10020,16 +9980,16 @@ msgstr ""
 
 #: ../libnm/nm-device.c:1551
 msgid "MACsec"
-msgstr ""
+msgstr "MACsec"
 
 #: ../libnm/nm-device.c:1553
 msgid "Dummy"
-msgstr ""
+msgstr "Prázdné"
 
 #: ../libnm/nm-device.c:2444
-#, fuzzy, c-format
+#, c-format
 msgid "The connection was not valid: %s"
-msgstr "připojení odstraněno"
+msgstr "Připojení nebylo platné: %s"
 
 #: ../libnm/nm-device.c:2453
 #, c-format
@@ -10045,9 +10005,8 @@ msgid "Connection removed before it was initialized"
 msgstr ""
 
 #: ../libnm/nm-vpn-plugin-old.c:957 ../libnm/nm-vpn-service-plugin.c:979
-#, fuzzy
 msgid "No service name specified"
-msgstr "Chyba: nebylo ur�eno rozhraní."
+msgstr "Nebyl ur�en název služby"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
@@ -10058,14 +10017,12 @@ msgid "System policy prevents enabling or disabling system networking"
 msgstr "Systémová zásada zamezuje povolit nebo zakázat systémovou síť"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
-#, fuzzy
 msgid "Reload NetworkManager configuration"
-msgstr "Stav správce sítě NetworkManager"
+msgstr "Znovu na�íst konfiguraci NetworkManageru"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
-#, fuzzy
 msgid "System policy prevents reloading NetworkManager"
-msgstr "Systémová zásada zamezuje povolit nebo zakázat systémovou síť"
+msgstr "Systémová zásada zamezuje opětovnému na�tení NetworkManageru"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
@@ -10178,14 +10135,12 @@ msgid "System policy prevents the creation of a checkpoint or its rollback"
 msgstr "Systémová zásada zabránila změně trvalého systémového názvu po�íta�e"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
-#, fuzzy
 msgid "Enable or disable device statistics"
-msgstr "Povolit nebo zakázat zařízení WiFi"
+msgstr "Povolit nebo zakázat statistiky zařízení"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
-#, fuzzy
 msgid "System policy prevents enabling or disabling device statistics"
-msgstr "Systémová zásada zamezuje povolit nebo zakázat zařízení WiFi"
+msgstr "Systémová zásada zamezuje povolení nebo zakázání statistik zařízení"
 
 #: ../shared/nm-utils/nm-shared-utils.c:345
 #, c-format
@@ -10231,15 +10186,14 @@ msgid "%s %d"
 msgstr ""
 
 #: ../src/main.c:179 ../src/main.c:318
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read configuration: %s\n"
-msgstr "Selhalo nastavení IV pro šifrování: %s / %s."
+msgstr "Selhalo �tení konfigurace: %s\n"
 
 #. Logging/debugging
 #: ../src/main.c:193 ../src/nm-iface-helper.c:309
-#, fuzzy
 msgid "Print NetworkManager version and exit"
-msgstr "Stav správce sítě NetworkManager"
+msgstr "Vypsat verzi NetworkManageru a skon�it"
 
 #: ../src/main.c:194 ../src/nm-iface-helper.c:310
 msgid "Don't become a daemon"
@@ -10286,9 +10240,9 @@ msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
 
 #: ../src/main.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "Error in configuration file: %s.\n"
-msgstr "Chyba: Selhala aktivace připojení: %s"
+msgstr "Chyba v konfigura�ním souboru: %s.\n"
 
 #: ../src/main.c:338
 #, c-format
@@ -10346,7 +10300,7 @@ msgstr ""
 #: ../src/devices/bluetooth/nm-bluez-device.c:210
 #, c-format
 msgid "%s Network"
-msgstr ""
+msgstr "Síť %s"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:264
 msgid "PAN requested, but Bluetooth device does not support NAP"
@@ -10357,9 +10311,8 @@ msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:287
-#, fuzzy
 msgid "PAN connection"
-msgstr "Připojení PAN %d"
+msgstr "Připojení PAN"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:294
 msgid "DUN requested, but Bluetooth device does not support DUN"
@@ -10371,9 +10324,8 @@ msgstr ""
 
 #: ../src/devices/bluetooth/nm-device-bt.c:314
 #: ../src/devices/wwan/nm-modem-broadband.c:706
-#, fuzzy
 msgid "GSM connection"
-msgstr "Připojení GSM %d"
+msgstr "GSM připojení"
 
 #: ../src/devices/bluetooth/nm-device-bt.c:318
 #: ../src/devices/wwan/nm-modem-broadband.c:730
@@ -10393,19 +10345,16 @@ msgid "connection does not match device"
 msgstr "žádné aktivní připojení nebo zařízení"
 
 #: ../src/devices/nm-device-bond.c:109
-#, fuzzy
 msgid "Bond connection"
-msgstr "připojuje se"
+msgstr "Připojení Bond"
 
 #: ../src/devices/nm-device-bridge.c:115
-#, fuzzy
 msgid "Bridge connection"
-msgstr "Aktivní připojení"
+msgstr "Připojení Most"
 
 #: ../src/devices/nm-device-dummy.c:70
-#, fuzzy
 msgid "Dummy connection"
-msgstr "Připojení GSM %d"
+msgstr "Prázdné připojení"
 
 #: ../src/devices/nm-device-ethernet.c:1435
 msgid "PPPoE connection"
@@ -10421,29 +10370,24 @@ msgid "Wired connection %d"
 msgstr "Drátové připojení %d"
 
 #: ../src/devices/nm-device-ip-tunnel.c:340
-#, fuzzy
 msgid "IP tunnel connection"
-msgstr "Aktivní připojení"
+msgstr "IP tunel připojení"
 
 #: ../src/devices/nm-device-macvlan.c:407
-#, fuzzy
 msgid "MACVLAN connection"
-msgstr "VPN se připojuje"
+msgstr "MACVLAN připojení"
 
 #: ../src/devices/nm-device-tun.c:146
-#, fuzzy
 msgid "TUN connection"
-msgstr "Připojení DUN %d"
+msgstr "TUN připojení"
 
 #: ../src/devices/team/nm-device-team.c:135
-#, fuzzy
 msgid "Team connection"
-msgstr "Aktivní připojení"
+msgstr "Team připojení"
 
 #: ../src/devices/wifi/nm-device-olpc-mesh.c:156
-#, fuzzy
 msgid "Mesh"
-msgstr "Mesh %d"
+msgstr "Mesh"
 
 #: ../src/devices/wifi/nm-device-wifi.c:905
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
@@ -10658,9 +10602,8 @@ msgid "The interface to manage"
 msgstr ""
 
 #: ../src/nm-iface-helper.c:292
-#, fuzzy
 msgid "Connection UUID"
-msgstr "Seznam připojení"
+msgstr "UUID připojení"
 
 #: ../src/nm-iface-helper.c:293
 #, fuzzy
@@ -10767,4 +10710,4 @@ msgstr "Neznámá úroveň evidence „%s“"
 #: ../src/nm-logging.c:369
 #, c-format
 msgid "Unknown log domain '%s'"
-msgstr "Neznámá doména evidence „%s“"
+msgstr "Neznámá doména evidence „%s“"
\ No newline at end of file
diff --git a/po/id.po b/po/id.po
index d10868ec..4b577d59 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8139,7 +8139,7 @@ msgid ""
 "hardware-address client ID and the 'type' field is set to 0. The special "
 "values \"mac\" and \"perm-mac\" are supported, which use the current or "
 "permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
 "type of links. The special value \"stable\" is supported to generate a type "
 "0 client identifier based on the stable-id (see connection.stable-id). If "
 "unset, a globally configure default is used. If still unset, the client-id "
diff --git a/po/ja.po b/po/ja.po
index f54f8a45..c0d60ade 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,20 +7,23 @@
 # Noriko Mizumoto <noriko@fedoraproject.org>, 2013 - 2014.
 # amoewaki <amoewaki@redhat.com>, 2017. #zanata
 # lrintel <lrintel@redhat.com>, 2017. #zanata
+# amoewaki <amoewaki@redhat.com>, 2018. #zanata
+# kemorigu <kemorigu@redhat.com>, 2018. #zanata
+# lrintel <lrintel@redhat.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 10:22+0100\n"
-"PO-Revision-Date: 2017-12-04 11:32+0000\n"
-"Last-Translator: amoewaki <amoewaki@redhat.com>\n"
+"POT-Creation-Date: 2018-08-19 12:54+0200\n"
+"PO-Revision-Date: 2018-08-16 01:39+0000\n"
+"Last-Translator: kemorigu <kemorigu@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.3.2\n"
+"X-Generator: Zanata 4.6.0\n"
 
 #: ../clients/cli/agent.c:40
 #, c-format
@@ -32,7 +35,7 @@ msgid ""
 msgstr ""
 "使�方: nmcli agent { COMMAND | help }\n"
 "\n"
-"COMMAND := { secret | polkit | all }\n"
+"コマンド := { secret | polkit | all }\n"
 "\n"
 "\n"
 
@@ -87,48 +90,49 @@ msgstr ""
 "�。\n"
 "\n"
 
-#: ../clients/cli/agent.c:158
+#: ../clients/cli/agent.c:157
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "nmcli � NetworkManager �シークレットエージェント����切�登録�れ��"
 "�。\n"
 
-#: ../clients/cli/agent.c:160
+#: ../clients/cli/agent.c:159
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "エラー: シークレットエージェント��期化�失敗����"
 
-#: ../clients/cli/agent.c:179
+#: ../clients/cli/agent.c:178
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "エラー: polkit エージェント��期化�失敗����: %s"
 
-#: ../clients/cli/agent.c:187
+#: ../clients/cli/agent.c:186
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli � polkit エージェント����切�登録�れ���。\n"
 
-#: ../clients/cli/common.c:262 ../clients/cli/common.c:277
+#: ../clients/cli/common.c:306 ../clients/cli/common.c:332
+#: ../clients/cli/connections.c:1297
 msgid "GROUP"
 msgstr "グループ"
 
-#: ../clients/cli/common.c:559
+#: ../clients/cli/common.c:606
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "エラー: openconnect �失敗����: %s\n"
 
-#: ../clients/cli/common.c:566
+#: ../clients/cli/common.c:613
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "エラー: openconnect �ステータス %d �失敗����\n"
 
-#: ../clients/cli/common.c:568
+#: ../clients/cli/common.c:615
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "エラー: openconnect �シグナル %d �失敗����\n"
 
-#: ../clients/cli/common.c:648
+#: ../clients/cli/common.c:695
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -137,25 +141,25 @@ msgstr ""
 "警告: '%s' �パスワード� 'passwd-file' ��供�れ����ん。nmcli � '--"
 "ask' オプション����尋�る�������ん。\n"
 
-#: ../clients/cli/common.c:1114
+#: ../clients/cli/common.c:1185
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "エラー: NMClient オブジェクトを作�����ん���: %s。"
 
-#: ../clients/cli/common.c:1134
+#: ../clients/cli/common.c:1205
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager �起動�����ん。"
 
-#: ../clients/cli/common.c:1231
+#: ../clients/cli/common.c:1301
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "エラー: 引数 '%s' ��識�れ��ん。代�り� --help を渡������。"
 
-#: ../clients/cli/common.c:1241
+#: ../clients/cli/common.c:1311
 msgid "Error: missing argument. Try passing --help."
 msgstr "エラー: 引数��り��ん。--help を渡������。"
 
-#: ../clients/cli/common.c:1294
+#: ../clients/cli/common.c:1364
 msgid "access denied"
 msgstr "アクセス�拒��れ���"
 
@@ -166,7 +170,7 @@ msgstr "設定��? "
 
 #: ../clients/cli/connections.c:65
 msgid "Property name? "
-msgstr "プロパティ��? "
+msgstr "プロパティー��? "
 
 #: ../clients/cli/connections.c:66
 msgid "Enter connection type: "
@@ -189,7 +193,70 @@ msgstr "接続 (���UUID ���パス)"
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr "接続 (���UUID�パス ��� apath)"
 
-#: ../clients/cli/connections.c:195
+#: ../clients/cli/connections.c:80 ../clients/cli/connections.c:89
+#: ../clients/cli/devices.c:1201 ../clients/cli/devices.c:1245
+#: ../clients/cli/devices.c:1247 ../clients/cli/general.c:41
+#: ../clients/cli/general.c:82 ../clients/cli/general.c:150
+#: ../clients/cli/general.c:155 ../clients/common/nm-client-utils.c:288
+#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-meta-setting-desc.c:1482
+#: ../clients/common/nm-meta-setting-desc.c:1532
+#: ../clients/common/nm-meta-setting-desc.c:2681
+#: ../clients/common/nm-meta-setting-desc.c:2736
+msgid "unknown"
+msgstr "�明"
+
+#: ../clients/cli/connections.c:81
+msgid "activating"
+msgstr "アクティベート中"
+
+#: ../clients/cli/connections.c:82
+msgid "activated"
+msgstr "アクティベート済�"
+
+#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:284
+msgid "deactivating"
+msgstr "�止中"
+
+#: ../clients/cli/connections.c:84
+msgid "deactivated"
+msgstr "�止����"
+
+#: ../clients/cli/connections.c:90
+msgid "VPN connecting (prepare)"
+msgstr "VPN 接続（準備）"
+
+#: ../clients/cli/connections.c:91
+msgid "VPN connecting (need authentication)"
+msgstr "VPN 接続（�証�必�）"
+
+#: ../clients/cli/connections.c:92
+msgid "VPN connecting"
+msgstr "VPN 接続"
+
+#: ../clients/cli/connections.c:93
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN 接続（IP 設定を�得）"
+
+#: ../clients/cli/connections.c:94
+msgid "VPN connected"
+msgstr "VPN 接続済�"
+
+#: ../clients/cli/connections.c:95
+msgid "VPN connection failed"
+msgstr "VPN 接続失敗"
+
+#: ../clients/cli/connections.c:96
+msgid "VPN disconnected"
+msgstr "VPN 切断済�"
+
+#: ../clients/cli/connections.c:452
+msgid "never"
+msgstr "���"
+
+#: ../clients/cli/connections.c:713
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -266,7 +333,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:735
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -315,7 +382,7 @@ msgstr ""
 "関連�るシークレットも表示�る場���グロー�ル� --show-secrets オプション"
 "を使用���。\n"
 
-#: ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:756
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -359,7 +426,7 @@ msgstr ""
 "passwd-file - 接続をアクティブ��る��必��パスワードを�むファイル\n"
 "\n"
 
-#: ../clients/cli/connections.c:259
+#: ../clients/cli/connections.c:777
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -381,7 +448,7 @@ msgstr ""
 "�識別���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:271
+#: ../clients/cli/connections.c:789
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -680,7 +747,7 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:389
+#: ../clients/cli/connections.c:907
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -726,7 +793,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:412
+#: ../clients/cli/connections.c:930
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -749,7 +816,7 @@ msgstr ""
 "を除��<ID> �完全�コピー��り��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:424
+#: ../clients/cli/connections.c:942
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -768,7 +835,7 @@ msgstr ""
 "\n"
 "引数 := [id | uuid | path] <ID>\n"
 "\n"
-"インテラクティブ�エディタ�既存�接続プロファイルを編集���。\n"
+"インテラクティブ�エディター�既存�接続プロファイルを編集���。\n"
 "プロファイル����UUID�D-Bus パス���識別���。\n"
 "\n"
 "引数 := [type <新��接続タイプ>] [con-name <新��接続�>]\n"
@@ -776,7 +843,7 @@ msgstr ""
 "インテラクティブ�エディター�新��接続プロファイルを追加���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:439
+#: ../clients/cli/connections.c:957
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -795,7 +862,7 @@ msgstr ""
 "プロファイル����UUID�D-Bus パス�識別���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:450
+#: ../clients/cli/connections.c:968
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -816,7 +883,7 @@ msgstr ""
 "何も指定�れ��場�������接続プロファイルを監視���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:462
+#: ../clients/cli/connections.c:980
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -828,7 +895,7 @@ msgstr ""
 "\n"
 "ディスク�ら����接続ファイルを�読�込����。\n"
 
-#: ../clients/cli/connections.c:470
+#: ../clients/cli/connections.c:988
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -850,7 +917,7 @@ msgstr ""
 "NetworkManager �最新�状態を�識�������。\n"
 "\n"
 
-#: ../clients/cli/connections.c:482
+#: ../clients/cli/connections.c:1000
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -874,7 +941,7 @@ msgstr ""
 "NetworkManager VPN プラグイン�よりイン�ート�れ��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:495
+#: ../clients/cli/connections.c:1013
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -893,441 +960,337 @@ msgstr ""
 "データ�標準出力���ファイル (���指定�れ�場�) ��信�れ��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:525
-msgid "activating"
-msgstr "アクティベート中"
-
-#: ../clients/cli/connections.c:527
-msgid "activated"
-msgstr "アクティベート済�"
-
-#: ../clients/cli/connections.c:529 ../clients/common/nm-client-utils.c:243
-msgid "deactivating"
-msgstr "�止中"
-
-#: ../clients/cli/connections.c:531
-msgid "deactivated"
-msgstr "�止����"
-
-#: ../clients/cli/connections.c:534 ../clients/cli/connections.c:557
-#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1251
-#: ../clients/cli/devices.c:1253 ../clients/cli/general.c:41
-#: ../clients/cli/general.c:79 ../clients/cli/general.c:146
-#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247
-#: ../clients/common/nm-client-utils.c:250
-#: ../clients/common/nm-client-utils.c:266
-#: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:1479
-#: ../clients/common/nm-meta-setting-desc.c:1547
-#: ../clients/common/nm-meta-setting-desc.c:2692
-#: ../clients/common/nm-meta-setting-desc.c:2746
-msgid "unknown"
-msgstr "�明"
-
-#: ../clients/cli/connections.c:543
-msgid "VPN connecting (prepare)"
-msgstr "VPN 接続（準備）"
-
-#: ../clients/cli/connections.c:545
-msgid "VPN connecting (need authentication)"
-msgstr "VPN 接続（�証�必�）"
-
-#: ../clients/cli/connections.c:547
-msgid "VPN connecting"
-msgstr "VPN 接続"
-
-#: ../clients/cli/connections.c:549
-msgid "VPN connecting (getting IP configuration)"
-msgstr "VPN 接続（IP 設定を�得）"
-
-#: ../clients/cli/connections.c:551
-msgid "VPN connected"
-msgstr "VPN 接続済�"
-
-#: ../clients/cli/connections.c:553
-msgid "VPN connection failed"
-msgstr "VPN 接続失敗"
-
-#: ../clients/cli/connections.c:555
-msgid "VPN disconnected"
-msgstr "VPN 切断済�"
-
-#: ../clients/cli/connections.c:625
+#: ../clients/cli/connections.c:1095
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "%s �シークレット�更新中�エラー�発生����: %s\n"
 
-#: ../clients/cli/connections.c:645
+#: ../clients/cli/connections.c:1138
 msgid "Connection profile details"
 msgstr "接続プロファイル�詳細"
 
-#: ../clients/cli/connections.c:658 ../clients/cli/connections.c:1108
+#: ../clients/cli/connections.c:1151 ../clients/cli/connections.c:1249
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:876
-msgid "never"
-msgstr "���"
-
-#. "CAPABILITIES"
-#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
-#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:914
-#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:982
-#: ../clients/cli/connections.c:984 ../clients/cli/connections.c:4427
-#: ../clients/cli/connections.c:6365 ../clients/cli/connections.c:6366
-#: ../clients/cli/devices.c:881 ../clients/cli/devices.c:1170
-#: ../clients/cli/devices.c:1171 ../clients/cli/devices.c:1172
-#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174
-#: ../clients/cli/devices.c:1211 ../clients/cli/devices.c:1213
-#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1244
-#: ../clients/cli/devices.c:1245 ../clients/cli/devices.c:1246
-#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248
-#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250
-#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1254
-#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258
-#: ../clients/common/nm-meta-setting-desc.c:719
-#: ../clients/common/nm-meta-setting-desc.c:2685
-msgid "yes"
-msgstr "��"
-
-#: ../clients/cli/connections.c:877 ../clients/cli/connections.c:879
-#: ../clients/cli/connections.c:881 ../clients/cli/connections.c:981
-#: ../clients/cli/connections.c:982 ../clients/cli/connections.c:984
-#: ../clients/cli/connections.c:4426 ../clients/cli/connections.c:6365
-#: ../clients/cli/connections.c:6366 ../clients/cli/devices.c:881
-#: ../clients/cli/devices.c:1170 ../clients/cli/devices.c:1171
-#: ../clients/cli/devices.c:1172 ../clients/cli/devices.c:1173
-#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1211
-#: ../clients/cli/devices.c:1213 ../clients/cli/devices.c:1214
-#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1245
-#: ../clients/cli/devices.c:1246 ../clients/cli/devices.c:1247
-#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249
-#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1252
-#: ../clients/cli/devices.c:1254 ../clients/cli/general.c:153
-#: ../clients/common/nm-client-utils.c:260
-#: ../clients/common/nm-meta-setting-desc.c:719
-#: ../clients/common/nm-meta-setting-desc.c:2688
-msgid "no"
-msgstr "���"
-
-#: ../clients/cli/connections.c:1098
+#: ../clients/cli/connections.c:1239
 msgid "Activate connection details"
 msgstr "アクティブ�接続�詳細"
 
-#: ../clients/cli/connections.c:1345
+#: ../clients/cli/connections.c:1485
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr ""
 "無効�フィールド '%s'; 使用��るフィールド: %s �よ� %s���� %s�%s"
 
-#: ../clients/cli/connections.c:1360 ../clients/cli/connections.c:1368
+#: ../clients/cli/connections.c:1500 ../clients/cli/connections.c:1508
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "'%s' �孤立��る必���り��"
 
-#: ../clients/cli/connections.c:1568
+#: ../clients/cli/connections.c:1773
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "'--order' オプション�正����文字列 '%s'"
 
-#: ../clients/cli/connections.c:1594
+#: ../clients/cli/connections.c:1798
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "'--order' オプション�正����アイテム '%s'"
 
-#: ../clients/cli/connections.c:1624
+#: ../clients/cli/connections.c:1836
 msgid "No connection specified"
 msgstr "接続�指定�れ����ん。"
 
-#: ../clients/cli/connections.c:1639
+#: ../clients/cli/connections.c:1847
 #, c-format
 msgid "%s argument is missing"
 msgstr "%s 引数��り��ん。"
 
-#: ../clients/cli/connections.c:1649
+#: ../clients/cli/connections.c:1865
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "�明�接続 '%s'"
 
-#: ../clients/cli/connections.c:1682
+#: ../clients/cli/connections.c:1894
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数��り��ん"
 
-#: ../clients/cli/connections.c:1737
+#: ../clients/cli/connections.c:1955
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager �アクティブ�プロファイル"
 
-#: ../clients/cli/connections.c:1738
+#: ../clients/cli/connections.c:1956
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 接続プロファイル"
 
-#: ../clients/cli/connections.c:1791 ../clients/cli/connections.c:2466
-#: ../clients/cli/connections.c:2478 ../clients/cli/connections.c:2490
-#: ../clients/cli/connections.c:2666 ../clients/cli/connections.c:8428
-#: ../clients/cli/connections.c:8445 ../clients/cli/devices.c:2678
-#: ../clients/cli/devices.c:2689 ../clients/cli/devices.c:2931
-#: ../clients/cli/devices.c:2942 ../clients/cli/devices.c:2960
-#: ../clients/cli/devices.c:2969 ../clients/cli/devices.c:2990
-#: ../clients/cli/devices.c:3001 ../clients/cli/devices.c:3019
-#: ../clients/cli/devices.c:3397 ../clients/cli/devices.c:3407
-#: ../clients/cli/devices.c:3415 ../clients/cli/devices.c:3427
-#: ../clients/cli/devices.c:3442 ../clients/cli/devices.c:3450
-#: ../clients/cli/devices.c:3624 ../clients/cli/devices.c:3635
-#: ../clients/cli/devices.c:3807
+#: ../clients/cli/connections.c:2008 ../clients/cli/connections.c:2707
+#: ../clients/cli/connections.c:2719 ../clients/cli/connections.c:2731
+#: ../clients/cli/connections.c:2957 ../clients/cli/connections.c:8644
+#: ../clients/cli/connections.c:8660 ../clients/cli/devices.c:2849
+#: ../clients/cli/devices.c:2861 ../clients/cli/devices.c:2874
+#: ../clients/cli/devices.c:3025 ../clients/cli/devices.c:3036
+#: ../clients/cli/devices.c:3054 ../clients/cli/devices.c:3063
+#: ../clients/cli/devices.c:3084 ../clients/cli/devices.c:3095
+#: ../clients/cli/devices.c:3113 ../clients/cli/devices.c:3493
+#: ../clients/cli/devices.c:3503 ../clients/cli/devices.c:3511
+#: ../clients/cli/devices.c:3523 ../clients/cli/devices.c:3538
+#: ../clients/cli/devices.c:3546 ../clients/cli/devices.c:3720
+#: ../clients/cli/devices.c:3731 ../clients/cli/devices.c:3902
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数��り��ん。"
 
-#: ../clients/cli/connections.c:1810
+#: ../clients/cli/connections.c:2036
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - ��よ��接続プロファイル��り��ん。"
 
-#: ../clients/cli/connections.c:1874 ../clients/cli/connections.c:2453
-#: ../clients/cli/connections.c:2517 ../clients/cli/connections.c:7938
-#: ../clients/cli/connections.c:8049 ../clients/cli/connections.c:8559
-#: ../clients/cli/devices.c:1579 ../clients/cli/devices.c:1865
-#: ../clients/cli/devices.c:2034 ../clients/cli/devices.c:2142
-#: ../clients/cli/devices.c:2331 ../clients/cli/devices.c:3587
-#: ../clients/cli/devices.c:3813 ../clients/cli/general.c:928
+#: ../clients/cli/connections.c:2127 ../clients/cli/connections.c:2694
+#: ../clients/cli/connections.c:2758 ../clients/cli/connections.c:8168
+#: ../clients/cli/connections.c:8274 ../clients/cli/connections.c:8760
+#: ../clients/cli/devices.c:1570 ../clients/cli/devices.c:1856
+#: ../clients/cli/devices.c:2025 ../clients/cli/devices.c:2133
+#: ../clients/cli/devices.c:2322 ../clients/cli/devices.c:3683
+#: ../clients/cli/devices.c:3908 ../clients/cli/general.c:914
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:1972
+#: ../clients/cli/connections.c:2220
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デ�イス '%s' 上�アクティブ�接続��り��ん"
 
-#: ../clients/cli/connections.c:1980
+#: ../clients/cli/connections.c:2228
 msgid "no active connection or device"
 msgstr "アクティブ�接続���デ�イス��り��ん"
 
-#: ../clients/cli/connections.c:2000
+#: ../clients/cli/connections.c:2248
 #, c-format
 msgid "device '%s' not compatible with connection '%s':"
 msgstr "デ�イス '%s' �接続 '%s' �互�性��り��ん:"
 
-#: ../clients/cli/connections.c:2036
+#: ../clients/cli/connections.c:2281
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デ�イス '%s' �接続 '%s' �互�性��り��ん"
 
-#: ../clients/cli/connections.c:2039
+#: ../clients/cli/connections.c:2284
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用�デ�イス�見��り��ん"
 
-#: ../clients/cli/connections.c:2067
+#: ../clients/cli/connections.c:2316
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "接続�正常�アクティベート�れ��� (%s) (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2071 ../clients/cli/connections.c:2219
-#: ../clients/cli/connections.c:6244
+#: ../clients/cli/connections.c:2320 ../clients/cli/connections.c:2468
+#: ../clients/cli/connections.c:6534
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続�正常�アクティベート�れ��� (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2078 ../clients/cli/connections.c:2199
+#: ../clients/cli/connections.c:2327 ../clients/cli/connections.c:2448
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続�アクティベーション�失敗: %s"
 
-#: ../clients/cli/connections.c:2114
+#: ../clients/cli/connections.c:2363
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "エラー: タイムアウト (%d 秒) ��り���"
 
-#: ../clients/cli/connections.c:2280
+#: ../clients/cli/connections.c:2530
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'�読�込��失敗: %s"
 
-#: ../clients/cli/connections.c:2292
+#: ../clients/cli/connections.c:2543
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' �コロン��り��ん"
 
-#: ../clients/cli/connections.c:2300
+#: ../clients/cli/connections.c:2551
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' �ドット��り��ん"
 
-#: ../clients/cli/connections.c:2313
+#: ../clients/cli/connections.c:2564
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' �設定��無効��"
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2610
 #, c-format
 msgid "unknown device '%s'."
 msgstr "�明�デ�イス '%s' ��。"
 
-#: ../clients/cli/connections.c:2374
+#: ../clients/cli/connections.c:2615
 msgid "neither a valid connection nor device given"
 msgstr "有効�接続�デ�イス��れも指定�れ����ん"
 
-#: ../clients/cli/connections.c:2500 ../clients/cli/devices.c:1530
-#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:3032
-#: ../clients/cli/devices.c:3641
+#: ../clients/cli/connections.c:2741 ../clients/cli/devices.c:1521
+#: ../clients/cli/devices.c:2906 ../clients/cli/devices.c:3126
+#: ../clients/cli/devices.c:3737
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "�明�パラメーター: %s\n"
 
-#: ../clients/cli/connections.c:2525
+#: ../clients/cli/connections.c:2766
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:2545
+#: ../clients/cli/connections.c:2874
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) �正常�削除�れ���。\n"
 
-#: ../clients/cli/connections.c:2561
+#: ../clients/cli/connections.c:2890
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "接続 '%s' �正常��アクティブ化�れ��� (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2642 ../clients/cli/connections.c:8164
-#: ../clients/cli/connections.c:8196 ../clients/cli/connections.c:8353
+#: ../clients/cli/connections.c:2939 ../clients/cli/connections.c:8381
+#: ../clients/cli/connections.c:8412 ../clients/cli/connections.c:8570
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続�指定�れ����ん。"
 
-#: ../clients/cli/connections.c:2683
+#: ../clients/cli/connections.c:2969
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' �アクティブ�接続���り��ん。\n"
 
-#: ../clients/cli/connections.c:2684
+#: ../clients/cli/connections.c:2970
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: アクティブ�一部�接続�見��り��ん。"
 
-#: ../clients/cli/connections.c:2693
+#: ../clients/cli/connections.c:2978
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブ�接続��り��ん。"
 
-#: ../clients/cli/connections.c:2727
+#: ../clients/cli/connections.c:3009
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "接続 '%s' ��アクティブ化�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:2983 ../clients/cli/connections.c:3040
-#: ../clients/common/nm-client-utils.c:169
+#: ../clients/cli/connections.c:3260 ../clients/cli/connections.c:3317
+#: ../clients/common/nm-client-utils.c:221
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' � [%s] ���り��ん"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3003 ../clients/cli/connections.c:3063
-#: ../clients/common/nm-client-utils.c:279
+#: ../clients/cli/connections.c:3280 ../clients/cli/connections.c:3340
+#: ../clients/common/nm-client-utils.c:320
 #, c-format
 msgid "Unknown error"
 msgstr "�明�エラー"
 
-#: ../clients/cli/connections.c:3197
+#: ../clients/cli/connections.c:3474
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告: master='%s' �既存�プロファイルを�照���ん。\n"
 
-#: ../clients/cli/connections.c:3534
+#: ../clients/cli/connections.c:3811
 #, c-format
 msgid "Error: invalid property '%s': %s."
-msgstr "エラー: 無効�プロパティ '%s': %s。"
+msgstr "エラー: 無効�プロパティー '%s': %s。"
 
-#: ../clients/cli/connections.c:3551
+#: ../clients/cli/connections.c:3828
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "エラー: %s.%s �変更�失敗����: %s。"
 
-#: ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3848
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "エラー: '%s' �値�削除�失敗�����%s: %s。"
 
-#: ../clients/cli/connections.c:3604
+#: ../clients/cli/connections.c:3882
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "エラー: '%s' �必須��。"
 
-#: ../clients/cli/connections.c:3631
+#: ../clients/cli/connections.c:3909
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "エラー: 無効�スレーブタイプ; %s。"
 
-#: ../clients/cli/connections.c:3639
+#: ../clients/cli/connections.c:3917
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "エラー: 無効�接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:3716
+#: ../clients/cli/connections.c:3994
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "エラー: �題��る接続タイプ: %s"
 
-#: ../clients/cli/connections.c:3762
+#: ../clients/cli/connections.c:4040
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "エラー: '%s': %s"
 
-#: ../clients/cli/connections.c:3783
+#: ../clients/cli/connections.c:4061
 msgid "Error: master is required"
 msgstr "エラー: マスター�必���"
 
-#: ../clients/cli/connections.c:3842
+#: ../clients/cli/connections.c:4120
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "エラー: ボンドオプション '%s=%s' �追加中�エラー。"
 
-#: ../clients/cli/connections.c:3873
+#: ../clients/cli/connections.c:4151
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "エラー: '%s' �無効�モニタリングモード��; '%s' ��� '%s' を使用����"
 "��。\n"
 
-#: ../clients/cli/connections.c:3904
+#: ../clients/cli/connections.c:4182
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr ""
 "エラー: 'bt-type': '%s' �無効��。[%s, %s, %s (%s), %s] を使用�����"
 "�。"
 
-#: ../clients/cli/connections.c:4153
+#: ../clients/cli/connections.c:4431
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "エラー: '%s' �値��明��。"
 
-#: ../clients/cli/connections.c:4199
+#: ../clients/cli/connections.c:4477
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "エラー: <setting>.<property> 引数��り��ん。"
 
-#: ../clients/cli/connections.c:4222
+#: ../clients/cli/connections.c:4500
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効���許��れ����設定 '%s' ��: %s。"
 
-#: ../clients/cli/connections.c:4268 ../clients/cli/connections.c:4284
+#: ../clients/cli/connections.c:4546 ../clients/cli/connections.c:4562
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "エラー:'%s' ������� (%s.%s ��� %s.%s)。"
 
-#: ../clients/cli/connections.c:4302
+#: ../clients/cli/connections.c:4580
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "エラー: 無効� <setting>.<property> '%s' ��。"
 
-#: ../clients/cli/connections.c:4346 ../clients/cli/connections.c:7989
+#: ../clients/cli/connections.c:4624 ../clients/cli/connections.c:8214
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "エラー: '%s' 接続�追加�失敗����: %s"
 
-#: ../clients/cli/connections.c:4364
+#: ../clients/cli/connections.c:4642
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1339,12 +1302,47 @@ msgstr[0] ""
 "警告: ��� '%1$s' �接続�他� %3$u 個�り��。uuid � '%2$s' �接続を�照"
 "������。\n"
 
-#: ../clients/cli/connections.c:4373
+#: ../clients/cli/connections.c:4651
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "接続 '%s' (%s) �正常�追加�れ���。\n"
 
-#: ../clients/cli/connections.c:4511
+#: ../clients/cli/connections.c:4704 ../clients/cli/connections.c:6651
+#: ../clients/cli/connections.c:6652 ../clients/cli/devices.c:876
+#: ../clients/cli/devices.c:1164 ../clients/cli/devices.c:1165
+#: ../clients/cli/devices.c:1166 ../clients/cli/devices.c:1167
+#: ../clients/cli/devices.c:1168 ../clients/cli/devices.c:1205
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1208
+#: ../clients/cli/devices.c:1238 ../clients/cli/devices.c:1239
+#: ../clients/cli/devices.c:1240 ../clients/cli/devices.c:1241
+#: ../clients/cli/devices.c:1242 ../clients/cli/devices.c:1243
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1248 ../clients/cli/general.c:157
+#: ../clients/cli/utils.h:220 ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-meta-setting-desc.c:754
+#: ../clients/common/nm-meta-setting-desc.c:2676
+msgid "no"
+msgstr "���"
+
+#. "CAPABILITIES"
+#: ../clients/cli/connections.c:4705 ../clients/cli/connections.c:6651
+#: ../clients/cli/connections.c:6652 ../clients/cli/devices.c:876
+#: ../clients/cli/devices.c:1164 ../clients/cli/devices.c:1165
+#: ../clients/cli/devices.c:1166 ../clients/cli/devices.c:1167
+#: ../clients/cli/devices.c:1168 ../clients/cli/devices.c:1205
+#: ../clients/cli/devices.c:1207 ../clients/cli/devices.c:1208
+#: ../clients/cli/devices.c:1238 ../clients/cli/devices.c:1239
+#: ../clients/cli/devices.c:1240 ../clients/cli/devices.c:1241
+#: ../clients/cli/devices.c:1242 ../clients/cli/devices.c:1243
+#: ../clients/cli/devices.c:1244 ../clients/cli/devices.c:1246
+#: ../clients/cli/devices.c:1248 ../clients/cli/general.c:156
+#: ../clients/cli/utils.h:220 ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-meta-setting-desc.c:754
+#: ../clients/common/nm-meta-setting-desc.c:2673
+msgid "yes"
+msgstr "��"
+
+#: ../clients/cli/connections.c:4789
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
@@ -1353,34 +1351,34 @@ msgstr ""
 "��。\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:4610
+#: ../clients/cli/connections.c:4888
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
 msgstr[0] "%2$s ���任��設定� %1$d 個�り��。\n"
 
-#: ../clients/cli/connections.c:4613
+#: ../clients/cli/connections.c:4891
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] "指定����? %s"
 
-#: ../clients/cli/connections.c:4749 ../clients/cli/utils.c:303
+#: ../clients/cli/connections.c:5024 ../clients/cli/utils.c:292
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "エラー: '%s' 引数�値�必���。"
 
-#: ../clients/cli/connections.c:4755
+#: ../clients/cli/connections.c:5031
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー: 'save': %s。"
 
-#: ../clients/cli/connections.c:4843 ../clients/cli/connections.c:4854
+#: ../clients/cli/connections.c:5117 ../clients/cli/connections.c:5128
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "エラー: '%s' 引数�必���。"
 
-#: ../clients/cli/connections.c:5832
+#: ../clients/cli/connections.c:6093
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
@@ -1388,7 +1386,7 @@ msgstr "['%s' 設定値]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:5911
+#: ../clients/cli/connections.c:6202
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1421,7 +1419,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了�る\n"
 
-#: ../clients/cli/connections.c:5938
+#: ../clients/cli/connections.c:6229
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1440,7 +1438,7 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:5945
+#: ../clients/cli/connections.c:6236
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1461,7 +1459,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:5952
+#: ../clients/cli/connections.c:6243
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1476,7 +1474,7 @@ msgstr ""
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:5957
+#: ../clients/cli/connections.c:6248
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1489,7 +1487,7 @@ msgstr ""
 "プロパティー詳細を表示���。NM �設定�よ�プロパティー�全詳細������"
 "nm-settings(5) � man ページを�照������。\n"
 
-#: ../clients/cli/connections.c:5962
+#: ../clients/cli/connections.c:6253
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1504,7 +1502,7 @@ msgstr ""
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:5967
+#: ../clients/cli/connections.c:6258
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1529,7 +1527,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:5976
+#: ../clients/cli/connections.c:6267
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1550,12 +1548,12 @@ msgstr ""
 "メモリー��������。引数��� 'save' � 'save persistent' を\n"
 "�味���。\n"
 "プロファイルを永続的��存�る���れら�設定���起動��も\n"
-"���れ��。以��変更も一時的���永続的�行�����\n"
+"���れ��。以��変更も一時的���永続的�行����\n"
 "一時的�変更��起動後����れ��ん。\n"
 "永続的�接続を完全�削除�る場���接続プロファイルを削除�る\n"
 "必���り��。\n"
 
-#: ../clients/cli/connections.c:5987
+#: ../clients/cli/connections.c:6278
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1576,7 +1574,7 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) ��� NSP (WiMAX) (<ifname> �指定�れ����場�"
 "� / を先頭�付�る)\n"
 
-#: ../clients/cli/connections.c:5994 ../clients/cli/connections.c:6153
+#: ../clients/cli/connections.c:6285 ../clients/cli/connections.c:6443
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1585,7 +1583,7 @@ msgstr ""
 "back  :: 一�上�メニューレベル�移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:5997
+#: ../clients/cli/connections.c:6288
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1594,7 +1592,7 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンド�ヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6000
+#: ../clients/cli/connections.c:6291
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1621,7 +1619,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6022 ../clients/cli/connections.c:6159
+#: ../clients/cli/connections.c:6313 ../clients/cli/connections.c:6449
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1634,8 +1632,8 @@ msgstr ""
 "nmcli を終了���。変更��接続��存を行������場����動作�確��"
 "求�られ��。\n"
 
-#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164
-#: ../clients/cli/connections.c:6600 ../clients/cli/connections.c:7557
+#: ../clients/cli/connections.c:6318 ../clients/cli/connections.c:6454
+#: ../clients/cli/connections.c:6873 ../clients/cli/connections.c:7800
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "�明�コマンド: '%s'\n"
@@ -1643,7 +1641,7 @@ msgstr "�明�コマンド: '%s'\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6093
+#: ../clients/cli/connections.c:6383
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1669,7 +1667,7 @@ msgstr ""
 "help/?   [<command>]             :: ��ヘルプ���コマンド�詳細を表示\n"
 "quit                             :: nmcli �終了\n"
 
-#: ../clients/cli/connections.c:6118
+#: ../clients/cli/connections.c:6408
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1680,7 +1678,7 @@ msgstr ""
 "\n"
 "��プロパティー�指定�� <value> を設定���。\n"
 
-#: ../clients/cli/connections.c:6122
+#: ../clients/cli/connections.c:6412
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1695,7 +1693,7 @@ msgstr ""
 "<value> ���プロパティー�追加�れ��。�一値�プロパティー�場�����"
 "プロパティー値�置��れ�� ('set' �場����)。\n"
 
-#: ../clients/cli/connections.c:6128
+#: ../clients/cli/connections.c:6418
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1706,7 +1704,7 @@ msgstr ""
 "\n"
 "�在�値を表示����値を変更�る�������。\n"
 
-#: ../clients/cli/connections.c:6132
+#: ../clients/cli/connections.c:6422
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1741,7 +1739,7 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6143
+#: ../clients/cli/connections.c:6433
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1754,7 +1752,7 @@ msgstr ""
 "プロパティー�詳細を表示���。NM 設定�プロパティー�詳細��nm-"
 "settings(5) man ページを�照������。\n"
 
-#: ../clients/cli/connections.c:6148
+#: ../clients/cli/connections.c:6438
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1768,7 +1766,7 @@ msgstr ""
 "プロパティー値を表示���。引数を指定�る��設定���接続全体�値を表示�"
 "�る��も����。\n"
 
-#: ../clients/cli/connections.c:6156
+#: ../clients/cli/connections.c:6446
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1777,96 +1775,96 @@ msgstr ""
 "help/? [<command>]  :: nmcli コマンド�ヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6250
+#: ../clients/cli/connections.c:6540
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "エラー: 接続�アクティベート�失敗����。\n"
 
-#: ../clients/cli/connections.c:6345
+#: ../clients/cli/connections.c:6631
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "エラー: 設定 '%s' �必須���削除����ん。\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6363
+#: ../clients/cli/connections.c:6649
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ タイプ: %s | ��: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6399
+#: ../clients/cli/connections.c:6685
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "��接続��存�れ��ん。本当�終了����? %s"
 
-#: ../clients/cli/connections.c:6448
+#: ../clients/cli/connections.c:6731
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
 msgstr ""
 "��接続プロファイル�別�クライアント�ら�削除�れ����。メインメニュー"
-"�「save��入力�る�元�戻��������。\n"
+"� 'save' �入力�る�元�戻��������。\n"
 
-#: ../clients/cli/connections.c:6478 ../clients/cli/connections.c:6892
-#: ../clients/cli/connections.c:6950
+#: ../clients/cli/connections.c:6762 ../clients/cli/connections.c:7154
+#: ../clients/cli/connections.c:7212
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティー�使用��る値: %s\n"
 
-#: ../clients/cli/connections.c:6481 ../clients/cli/connections.c:6895
-#: ../clients/cli/connections.c:6953
+#: ../clients/cli/connections.c:6765 ../clients/cli/connections.c:7157
+#: ../clients/cli/connections.c:7215
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力������: "
 
-#: ../clients/cli/connections.c:6496 ../clients/cli/connections.c:6518
-#: ../clients/cli/connections.c:6899 ../clients/cli/connections.c:6958
+#: ../clients/cli/connections.c:6779 ../clients/cli/connections.c:6799
+#: ../clients/cli/connections.c:7161 ../clients/cli/connections.c:7220
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティー�設定�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:6512
+#: ../clients/cli/connections.c:6793
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値�編集: "
 
-#: ../clients/cli/connections.c:6541 ../clients/cli/settings.c:392
+#: ../clients/cli/connections.c:6819 ../clients/cli/settings.c:394
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:6547 ../clients/cli/connections.c:7053
-#: ../clients/cli/connections.c:7104
+#: ../clients/cli/connections.c:6825 ../clients/cli/connections.c:7315
+#: ../clients/cli/connections.c:7366
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' �値�削除�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:6568
+#: ../clients/cli/connections.c:6846
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "�明�コマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:6671
+#: ../clients/cli/connections.c:6936
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用�能�設定: %s\n"
 
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:6948
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効�設定�; %s\n"
 
-#: ../clients/cli/connections.c:6700
+#: ../clients/cli/connections.c:6965
 #, c-format
 msgid "Available properties: %s\n"
-msgstr "使用�能�プロパティ: %s\n"
+msgstr "利用�能�プロパティー: %s\n"
 
-#: ../clients/cli/connections.c:6708
+#: ../clients/cli/connections.c:6973
 #, c-format
 msgid "Error: property %s\n"
-msgstr "エラー: プロパティ %s\n"
+msgstr "エラー: プロパティー %s\n"
 
-#: ../clients/cli/connections.c:6749
+#: ../clients/cli/connections.c:7014
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1877,424 +1875,422 @@ msgstr ""
 "ベート�れる�能性��り��。\n"
 "本当��存����? %s"
 
-#: ../clients/cli/connections.c:6832
+#: ../clients/cli/connections.c:7093
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次�設定を変更�る�������: %s\n"
 
-#: ../clients/cli/connections.c:6862
+#: ../clients/cli/connections.c:7122
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr ""
-"��接続プロファイル�別�クライアント�ら�削除�れ����。「save��入力"
-"�る�元�戻��������。\n"
+"��接続プロファイル�別�クライアント�ら�削除�れ����。'save' �入力�"
+"る�元�戻��������。\n"
 
-#: ../clients/cli/connections.c:6903 ../clients/cli/connections.c:7148
-#: ../clients/cli/connections.c:7180
+#: ../clients/cli/connections.c:7165 ../clients/cli/connections.c:7410
+#: ../clients/cli/connections.c:7442
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定��択�れ����ん。有効�設定� [%s] ��り��\n"
 
-#: ../clients/cli/connections.c:6904
+#: ../clients/cli/connections.c:7166
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr ""
 "��先� 'goto <setting>' を使用�る��'set <setting>.<property>' を使用��"
 "����。\n"
 
-#: ../clients/cli/connections.c:6919 ../clients/cli/connections.c:7080
-#: ../clients/cli/connections.c:7170
+#: ../clients/cli/connections.c:7181 ../clients/cli/connections.c:7342
+#: ../clients/cli/connections.c:7432
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効�設定引数 %s ��。[%s] �有効�引数��り��\n"
 
-#: ../clients/cli/connections.c:6928
+#: ../clients/cli/connections.c:7190
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティー用�設定��り��ん\n"
 
-#: ../clients/cli/connections.c:6935
+#: ../clients/cli/connections.c:7197
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効�プロパティー: %s\n"
 
-#: ../clients/cli/connections.c:6989
+#: ../clients/cli/connections.c:7251
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: �明�設定 '%s'\n"
 
-#: ../clients/cli/connections.c:7014
+#: ../clients/cli/connections.c:7276
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更��る��次�プロパティー��り��: %s\n"
 
-#: ../clients/cli/connections.c:7058
+#: ../clients/cli/connections.c:7320
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数�指定�れ����ん。[%s] �有効�引数��り��\n"
 
-#: ../clients/cli/connections.c:7077
+#: ../clients/cli/connections.c:7339
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "��接続���設定 '%s' ��り��ん。\n"
 
-#: ../clients/cli/connections.c:7125
+#: ../clients/cli/connections.c:7387
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティー�設定��も�り��ん。\n"
 
-#: ../clients/cli/connections.c:7149 ../clients/cli/connections.c:7181
+#: ../clients/cli/connections.c:7411 ../clients/cli/connections.c:7443
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr ""
 "��先� 'goto <setting>' を使用�る��'describe <setting>.<property>' を使"
 "用������\n"
 
-#: ../clients/cli/connections.c:7204
+#: ../clients/cli/connections.c:7466
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効�プロパティー: %s�有効�設定��も�り��ん。\n"
 
-#: ../clients/cli/connections.c:7234
+#: ../clients/cli/connections.c:7496
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: �明�設定: '%s'\n"
 
-#: ../clients/cli/connections.c:7239
+#: ../clients/cli/connections.c:7501
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "エラー: ��接続���設定 '%s' ��り��ん。\n"
 
-#: ../clients/cli/connections.c:7270
+#: ../clients/cli/connections.c:7532
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効�プロパティー: %s%s\n"
 
-#: ../clients/cli/connections.c:7272
+#: ../clients/cli/connections.c:7534
 msgid ", neither a valid setting name"
 msgstr "有効�設定��も�り��ん。"
 
-#: ../clients/cli/connections.c:7288
+#: ../clients/cli/connections.c:7550
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効�検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:7296
+#: ../clients/cli/connections.c:7558
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' �確�: %s\n"
 
-#: ../clients/cli/connections.c:7311
+#: ../clients/cli/connections.c:7573
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続�確�: %s\n"
 
-#: ../clients/cli/connections.c:7314
+#: ../clients/cli/connections.c:7576
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "エラーを自動的�修正����ん。\n"
 
-#: ../clients/cli/connections.c:7331
+#: ../clients/cli/connections.c:7593
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効�引数 '%s'\n"
 
-#: ../clients/cli/connections.c:7363
+#: ../clients/cli/connections.c:7625
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続��存�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7370
+#: ../clients/cli/connections.c:7632
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) �正常��存�れ���。\n"
 
-#: ../clients/cli/connections.c:7371
+#: ../clients/cli/connections.c:7633
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) �正常�更新�れ���。\n"
 
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7665
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続�確��失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7404
+#: ../clients/cli/connections.c:7666
 msgid "(unknown error)"
 msgstr "(�明�エラー)"
 
-#: ../clients/cli/connections.c:7405
+#: ../clients/cli/connections.c:7667
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "エラーを修正�る��� 'verify fix' �実行を試行����。\n"
 
-#: ../clients/cli/connections.c:7427
+#: ../clients/cli/connections.c:7689
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続��存�れ����ん。�� 'save' �入力���。\n"
 
-#: ../clients/cli/connections.c:7431
+#: ../clients/cli/connections.c:7693
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続�無効��: %s\n"
 
-#: ../clients/cli/connections.c:7441
+#: ../clients/cli/connections.c:7703
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベート����ん: %s。\n"
 
-#: ../clients/cli/connections.c:7450
+#: ../clients/cli/connections.c:7712
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続�アクティベート�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7456
+#: ../clients/cli/connections.c:7718
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続�アクティベート (��れ��キーを押��続行�る)\n"
 
-#: ../clients/cli/connections.c:7492
+#: ../clients/cli/connections.c:7754
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:7500
+#: ../clients/cli/connections.c:7762
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:7508
+#: ../clients/cli/connections.c:7770
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:7517
-#, c-format
-msgid "Error: bad color: %s\n"
-msgstr "エラー: �正�色: %s\n"
-
-#: ../clients/cli/connections.c:7532
+#: ../clients/cli/connections.c:7777
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "�在� nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:7542
+#: ../clients/cli/connections.c:7785
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効�設定オプション '%s'; [%s] �指定����\n"
 
-#: ../clients/cli/connections.c:7762
+#: ../clients/cli/connections.c:8003
 #, c-format
-msgid "Error: only one of 'id', uuid, or 'path' can be provided."
-msgstr "エラー: 指定��る�� 'id'�uuid�'path' ���れ�一���り��。"
+msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
+msgstr ""
+"エラー: 指定��る���'id'�'filename'�uuid���� 'path' ���れ� 1 �"
+"��り��。"
 
-#: ../clients/cli/connections.c:7777 ../clients/cli/connections.c:7946
+#: ../clients/cli/connections.c:8017 ../clients/cli/connections.c:8175
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: �明�接続 '%s' ��。"
 
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:8033
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
-msgstr "警告: 既存�接続 '%s' を編集�����。'タイプ' 引数�無視�れ��\n"
+msgstr "警告: 既存�接続 '%s' を編集�����。'type' 引数�無視�れ��\n"
 
-#: ../clients/cli/connections.c:7798
+#: ../clients/cli/connections.c:8036
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-msgstr "警告: 既存�接続 '%s' を編集�����。'con �' 引数�無視�れ��\n"
+msgstr ""
+"警告: 既存�接続 '%s' を編集�����。'con-name' 引数�無視�れ��\n"
 
-#: ../clients/cli/connections.c:7820
+#: ../clients/cli/connections.c:8063
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効�接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:7822
+#: ../clients/cli/connections.c:8065
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効�接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:7862
+#: ../clients/cli/connections.c:8100
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:7865
+#: ../clients/cli/connections.c:8103
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存� '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:7867
+#: ../clients/cli/connections.c:8105
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新�� '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:7869
+#: ../clients/cli/connections.c:8107
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用��るコマンドを表示�る�� 'help' ��� '?' を入力���。"
 
-#: ../clients/cli/connections.c:7871
+#: ../clients/cli/connections.c:8109
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "プロパティー詳細を表示�る���'describe [<setting>.<prop>]' を入力���。"
 
-#: ../clients/cli/connections.c:7906
+#: ../clients/cli/connections.c:8137
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' �変更�失敗����: %s"
 
-#: ../clients/cli/connections.c:7913
+#: ../clients/cli/connections.c:8143
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) �正常�変更�れ���。\n"
 
-#: ../clients/cli/connections.c:7994
+#: ../clients/cli/connections.c:8219
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) � %s (%s) ���クローン�れ���。\n"
 
-#: ../clients/cli/connections.c:8060
+#: ../clients/cli/connections.c:8284
 msgid "New connection name: "
 msgstr "新��接続�:"
 
-#: ../clients/cli/connections.c:8062
+#: ../clients/cli/connections.c:8286
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数��り��ん。"
 
-#: ../clients/cli/connections.c:8068 ../clients/cli/connections.c:8570
+#: ../clients/cli/connections.c:8291 ../clients/cli/connections.c:8771
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "エラー: �明�追加�引数: '%s'。"
 
-#: ../clients/cli/connections.c:8119
+#: ../clients/cli/connections.c:8336
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 一部�接続�削除�れ����ん。"
 
-#: ../clients/cli/connections.c:8120
+#: ../clients/cli/connections.c:8337
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "エラー: 接続�削除�失敗����: %s"
 
-#: ../clients/cli/connections.c:8181 ../clients/cli/connections.c:8306
+#: ../clients/cli/connections.c:8393 ../clients/cli/connections.c:8514
 #, c-format
 msgid "Error: %s.\n"
 msgstr "エラー: %s。\n"
 
-#: ../clients/cli/connections.c:8182 ../clients/cli/connections.c:8307
+#: ../clients/cli/connections.c:8394 ../clients/cli/connections.c:8515
 #, c-format
 msgid "Error: not all connections found."
 msgstr "エラー: 一部�接続�見��り��ん。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8225
+#: ../clients/cli/connections.c:8445
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: �明�接続を削除����ん: %s。"
 
-#: ../clients/cli/connections.c:8237
+#: ../clients/cli/connections.c:8455
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: 接続プロファイル�変更�れ���\n"
 
-#: ../clients/cli/connections.c:8263
+#: ../clients/cli/connections.c:8481
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: 接続プロファイル�作��れ���\n"
 
-#: ../clients/cli/connections.c:8272
+#: ../clients/cli/connections.c:8490
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: 接続プロファイル�削除�れ���\n"
 
-#: ../clients/cli/connections.c:8335
+#: ../clients/cli/connections.c:8552
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "エラー: 接続�リロード�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8368
+#: ../clients/cli/connections.c:8585
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: 接続�ロード�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8376
+#: ../clients/cli/connections.c:8593
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読�込���ん���。\n"
 
-#: ../clients/cli/connections.c:8383
+#: ../clients/cli/connections.c:8600
 msgid "File to import: "
 msgstr "イン�ート�るファイル:"
 
-#: ../clients/cli/connections.c:8414
+#: ../clients/cli/connections.c:8631
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数��り��ん。"
 
-#: ../clients/cli/connections.c:8439
+#: ../clients/cli/connections.c:8654
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告: 'type' ����指定�れ����。追加�も��無視�れ��。\n"
 
-#: ../clients/cli/connections.c:8454
+#: ../clients/cli/connections.c:8668
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告: 'file' ����指定�れ����。追加�も��無視�れ��。\n"
 
-#: ../clients/cli/connections.c:8456
+#: ../clients/cli/connections.c:8670
 #, c-format
 msgid "Unknown parameter: %s"
 msgstr "�明�パラメーター: %s"
 
-#: ../clients/cli/connections.c:8468
+#: ../clients/cli/connections.c:8681
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "エラー: 'type' 引数�必���。"
 
-#: ../clients/cli/connections.c:8473
+#: ../clients/cli/connections.c:8685
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 'file' 引数�必���。"
 
-#: ../clients/cli/connections.c:8480
+#: ../clients/cli/connections.c:8691
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "エラー: %s 用� VPN プラグイン�見��り��ん。"
 
-#: ../clients/cli/connections.c:8488 ../clients/cli/connections.c:8589
+#: ../clients/cli/connections.c:8698 ../clients/cli/connections.c:8790
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: VPN プラグイン�ロード�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8496
+#: ../clients/cli/connections.c:8705
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: '%s' �イン�ート�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8576
+#: ../clients/cli/connections.c:8777
 msgid "Output file name: "
 msgstr "出力ファイル�:"
 
-#: ../clients/cli/connections.c:8580
+#: ../clients/cli/connections.c:8781
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続� VPN ���り��ん。"
 
-#: ../clients/cli/connections.c:8601
+#: ../clients/cli/connections.c:8803
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "エラー: 一時ファイル %s �作��失敗����。"
 
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8811
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' �エクス�ート�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8621
+#: ../clients/cli/connections.c:8823
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: 一時ファイル '%s' �読��り�失敗����: %s。"
@@ -2308,7 +2304,7 @@ msgstr "インターフェース: "
 msgid "Interface(s): "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:254
+#: ../clients/cli/devices.c:253
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2387,7 +2383,7 @@ msgstr ""
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:277
+#: ../clients/cli/devices.c:276
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2418,7 +2414,7 @@ msgstr ""
 "status' を実行������り��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:292
+#: ../clients/cli/devices.c:291
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2437,7 +2433,7 @@ msgstr ""
 "��コマンド�����デ�イス���指定デ�イス�詳細を表示����。\n"
 "\n"
 
-#: ../clients/cli/devices.c:303
+#: ../clients/cli/devices.c:302
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2459,7 +2455,7 @@ msgstr ""
 "auto-connect �設定�れ����接続����も考慮�れ��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:315
+#: ../clients/cli/devices.c:314
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2478,7 +2474,7 @@ msgstr ""
 "行��変更��デ�イス�更新を試行���。\n"
 "\n"
 
-#: ../clients/cli/devices.c:326
+#: ../clients/cli/devices.c:325
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2518,7 +2514,7 @@ msgstr ""
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:346
+#: ../clients/cli/devices.c:345
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2539,7 +2535,7 @@ msgstr ""
 "�れ以��接続�自動アクティベート�れる������り��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:358
+#: ../clients/cli/devices.c:357
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2562,7 +2558,7 @@ msgstr ""
 "コマンド�削除����ん。\n"
 "\n"
 
-#: ../clients/cli/devices.c:371
+#: ../clients/cli/devices.c:370
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2585,7 +2581,7 @@ msgstr ""
 "デ�イスプロパティーを変更���。\n"
 "\n"
 
-#: ../clients/cli/devices.c:384
+#: ../clients/cli/devices.c:383
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2607,7 +2603,7 @@ msgstr ""
 "インターフェース�指定�れ��場�������デ�イスを監視���。\n"
 "\n"
 
-#: ../clients/cli/devices.c:396
+#: ../clients/cli/devices.c:395
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
@@ -2719,7 +2715,7 @@ msgstr ""
 "表示�る���コマンド� 'nmcli device wifi list' ��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:443
+#: ../clients/cli/devices.c:442
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2740,293 +2736,299 @@ msgstr ""
 "特定�インターフェース�近接デ�イスを一覧表示����。\n"
 "\n"
 
-#: ../clients/cli/devices.c:597
+#: ../clients/cli/devices.c:596
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェース�指定�れ����ん。"
 
-#: ../clients/cli/devices.c:620
+#: ../clients/cli/devices.c:619
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告: 引数 '%s' ��複�����。\n"
 
-#: ../clients/cli/devices.c:623
+#: ../clients/cli/devices.c:622
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デ�イス'%s' �見��り��ん。\n"
 
-#: ../clients/cli/devices.c:624
+#: ../clients/cli/devices.c:623
 #, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: 一部�デ�イス�見��り��ん。"
 
-#: ../clients/cli/devices.c:653
+#: ../clients/cli/devices.c:652
 msgid "No interface specified"
 msgstr "インターフェース�指定�れ����ん"
 
-#: ../clients/cli/devices.c:672
+#: ../clients/cli/devices.c:671
 #, c-format
 msgid "Device '%s' not found"
 msgstr "デ�イス'%s' �見��り��ん"
 
-#: ../clients/cli/devices.c:758 ../clients/cli/devices.c:910
+#: ../clients/cli/devices.c:754 ../clients/cli/devices.c:904
 msgid "(none)"
 msgstr "（��）"
 
-#: ../clients/cli/devices.c:829
+#: ../clients/cli/devices.c:824
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:830
+#: ../clients/cli/devices.c:825
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:841
+#: ../clients/cli/devices.c:836
 msgid "WEP"
 msgstr "WEP"
 
-#: ../clients/cli/devices.c:845
+#: ../clients/cli/devices.c:840
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../clients/cli/devices.c:849
+#: ../clients/cli/devices.c:844
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../clients/cli/devices.c:854
+#: ../clients/cli/devices.c:849
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:869
+#: ../clients/cli/devices.c:864
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:870
+#: ../clients/cli/devices.c:865
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:871
+#: ../clients/cli/devices.c:866
 msgid "N/A"
 msgstr "��"
 
-#: ../clients/cli/devices.c:1085
+#: ../clients/cli/devices.c:1079
 msgid "Device details"
 msgstr "デ�イス�詳細"
 
-#: ../clients/cli/devices.c:1096
+#: ../clients/cli/devices.c:1090
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:1161 ../clients/cli/devices.c:1164
+#: ../clients/cli/devices.c:1155 ../clients/cli/devices.c:1158
 msgid "(unknown)"
 msgstr "(�明)"
 
-#: ../clients/cli/devices.c:1207
+#: ../clients/cli/devices.c:1201
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1310
+#: ../clients/cli/devices.c:1304
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/devices.c:1310
+#: ../clients/cli/devices.c:1304
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/devices.c:1544
+#: ../clients/cli/devices.c:1535
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
-#: ../clients/cli/devices.c:1558
+#: ../clients/cli/devices.c:1549
 msgid "Status of devices"
 msgstr "デ�イス�状態"
 
-#: ../clients/cli/devices.c:1584 ../clients/cli/devices.c:2039
-#: ../clients/cli/devices.c:3817
+#: ../clients/cli/devices.c:1575 ../clients/cli/devices.c:2030
+#: ../clients/cli/devices.c:3912
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "エラー:  '%s' �無効�追加引数��。"
 
-#: ../clients/cli/devices.c:1620 ../clients/cli/general.c:555
+#: ../clients/cli/devices.c:1611 ../clients/cli/general.c:538
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制�時間� %d 秒�経�"
 
-#: ../clients/cli/devices.c:1669
+#: ../clients/cli/devices.c:1660
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "デ�イス '%s' � '%s' �正常�アクティベート�れ���。\n"
 
-#: ../clients/cli/devices.c:1675
+#: ../clients/cli/devices.c:1666
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続�アクティベーション�失敗����: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1711
+#: ../clients/cli/devices.c:1702
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot �設定�失敗����: %s"
 
-#: ../clients/cli/devices.c:1714
+#: ../clients/cli/devices.c:1705
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "エラー: 新�接続�追加���アクティベート�失敗����: %s"
 
-#: ../clients/cli/devices.c:1724
+#: ../clients/cli/devices.c:1715
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
 msgstr "エラー: Wi-Fi hotspot �設定�失敗����"
 
-#: ../clients/cli/devices.c:1726
+#: ../clients/cli/devices.c:1717
 #, c-format
 msgid "Error: Failed to add/activate new connection: Unknown error"
 msgstr "エラー: 新�接続�追加�アクティベート�失敗����: �明�エラー"
 
-#: ../clients/cli/devices.c:1738
+#: ../clients/cli/devices.c:1729
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
 msgstr ""
 "UUID '%s' �接続��'%s' デ�イス上�作��れアクティベート�れ���。\n"
 
-#: ../clients/cli/devices.c:1741
+#: ../clients/cli/devices.c:1732
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
 msgstr "ホットス�ット '%s' ��デ�イス '%s' �アクティベート�れ���\n"
 
-#: ../clients/cli/devices.c:1805
+#: ../clients/cli/devices.c:1796
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デ�イス�アクティベート�失敗����: %s"
 
-#: ../clients/cli/devices.c:1814
+#: ../clients/cli/devices.c:1805
 #, c-format
 msgid "Error: Device activation failed: device was disconnected"
 msgstr ""
 "エラー: デ�イス�アクティベート�失敗����: デ�イス�切断�れ���"
 
-#: ../clients/cli/devices.c:1829
+#: ../clients/cli/devices.c:1820
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "デ�イス '%s'  �接続�れ����。\n"
 
-#: ../clients/cli/devices.c:1870
+#: ../clients/cli/devices.c:1861
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加�引数�許��れ����ん: '%s'。"
 
-#: ../clients/cli/devices.c:1942 ../clients/cli/devices.c:1957
-#: ../clients/cli/devices.c:2187
+#: ../clients/cli/devices.c:1933 ../clients/cli/devices.c:1948
+#: ../clients/cli/devices.c:2178
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デ�イス '%s' �正常�切断�れ���。\n"
 
-#: ../clients/cli/devices.c:1945
+#: ../clients/cli/devices.c:1936
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デ�イス '%s' �正常�削除�れ���。\n"
 
-#: ../clients/cli/devices.c:2004 ../clients/cli/devices.c:2074
+#: ../clients/cli/devices.c:1995 ../clients/cli/devices.c:2065
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デ�イス '%s' (%s) ��接続���用�失敗����: %s"
 
-#: ../clients/cli/devices.c:2014 ../clients/cli/devices.c:2083
+#: ../clients/cli/devices.c:2005 ../clients/cli/devices.c:2074
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続�デ�イス '%s' �正常���用�れ���。\n"
 
-#: ../clients/cli/devices.c:2108
+#: ../clients/cli/devices.c:2099
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr ""
 "エラー: デ�イス '%s' (%s) �ら��用済�接続�読��り�失敗����: %s"
 
-#: ../clients/cli/devices.c:2172
+#: ../clients/cli/devices.c:2163
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: 一部�デ�イス�切断�れ��ん���。"
 
-#: ../clients/cli/devices.c:2173
+#: ../clients/cli/devices.c:2164
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デ�イス '%s' (%s) �切断�失敗����: %s\n"
 
-#: ../clients/cli/devices.c:2251
+#: ../clients/cli/devices.c:2242
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: 一部�デ�イス�削除�れ��ん���。"
 
-#: ../clients/cli/devices.c:2252
+#: ../clients/cli/devices.c:2243
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デ�イス '%s' (%s) �削除�失敗����: %s\n"
 
-#: ../clients/cli/devices.c:2336
+#: ../clients/cli/devices.c:2327
 #, c-format
 msgid "Error: No property specified."
 msgstr "エラー: プロパティー�指定�れ����ん。"
 
-#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2368
-#: ../clients/cli/general.c:724 ../clients/cli/general.c:736
+#: ../clients/cli/devices.c:2342 ../clients/cli/devices.c:2359
+#: ../clients/cli/general.c:710 ../clients/cli/general.c:722
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数��り��ん。"
 
-#: ../clients/cli/devices.c:2357
+#: ../clients/cli/devices.c:2348
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:2365
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "エラー: '自動接続': %s。"
 
-#: ../clients/cli/devices.c:2382 ../clients/cli/general.c:750
+#: ../clients/cli/devices.c:2373 ../clients/cli/general.c:736
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: プロパティー '%s' ��明��。"
 
-#: ../clients/cli/devices.c:2432
+#: ../clients/cli/devices.c:2422
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2458
+#: ../clients/cli/devices.c:2448
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: デ�イス�作��れ���\n"
 
-#: ../clients/cli/devices.c:2465
+#: ../clients/cli/devices.c:2455
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: デ�イス�削除�れ���\n"
 
-#: ../clients/cli/devices.c:2663
+#: ../clients/cli/devices.c:2630
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2712
+#: ../clients/cli/devices.c:2707
+#, c-format
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "エラー: bssid '%s' �アクセス�イント�見��り��ん。"
+
+#: ../clients/cli/devices.c:2897
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:2724
+#: ../clients/cli/devices.c:2915
 #, c-format
-msgid "Error: Device '%s' not found."
-msgstr "エラー: デ�イス'%s' �見��り��ん"
+msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
+msgstr ""
+"エラー: 無効��スキャン引数��: '%s' � [auto�no�yes] ���り��ん"
 
-#: ../clients/cli/devices.c:2745 ../clients/cli/devices.c:2831
+#: ../clients/cli/devices.c:2922
 #, c-format
-msgid "Error: Access point with bssid '%s' not found."
-msgstr "エラー: bssid '%s' �アクセス�イント�見��り��ん。"
+msgid "Error: Device '%s' not found."
+msgstr "エラー: デ�イス'%s' �見��り��ん"
 
-#: ../clients/cli/devices.c:2773
+#: ../clients/cli/devices.c:2932
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
@@ -3035,27 +3037,27 @@ msgstr ""
 "エラー: デ�イス '%s' � Wi-Fi デ�イス����識�れ��ん���。"
 "NetworkManager Wi-Fi プラグインを確�������。"
 
-#: ../clients/cli/devices.c:2777 ../clients/cli/devices.c:3060
-#: ../clients/cli/devices.c:3495 ../clients/cli/devices.c:3654
+#: ../clients/cli/devices.c:2936 ../clients/cli/devices.c:3154
+#: ../clients/cli/devices.c:3591 ../clients/cli/devices.c:3750
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デ�イス '%s' � Wi-Fi デ�イス���り��ん。"
 
-#: ../clients/cli/devices.c:2909
+#: ../clients/cli/devices.c:3003
 msgid "SSID or BSSID: "
 msgstr "SSID ��� BSSID: "
 
-#: ../clients/cli/devices.c:2914
+#: ../clients/cli/devices.c:3008
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID ��� BSSID ��り��ん。"
 
-#: ../clients/cli/devices.c:2951
+#: ../clients/cli/devices.c:3045
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid �引数値 '%s' ��有効� BSSID ���り��ん。"
 
-#: ../clients/cli/devices.c:2981
+#: ../clients/cli/devices.c:3075
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
@@ -3063,120 +3065,120 @@ msgstr ""
 "エラー: wep-key-type �引数値 '%s' �無効��。'key' ��� 'phrase' を使用�"
 "�����。"
 
-#: ../clients/cli/devices.c:3008 ../clients/cli/devices.c:3026
+#: ../clients/cli/devices.c:3102 ../clients/cli/devices.c:3120
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:3043
+#: ../clients/cli/devices.c:3137
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr ""
 "エラー: (%s) �接続先��る BSSID ��bssid 引数 (%s) �より異�り��。"
 
-#: ../clients/cli/devices.c:3049
+#: ../clients/cli/devices.c:3143
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' ��SSID�BSSID ���れ�も�り��ん。"
 
-#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3497
-#: ../clients/cli/devices.c:3656
+#: ../clients/cli/devices.c:3156 ../clients/cli/devices.c:3593
+#: ../clients/cli/devices.c:3752
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デ�イス�見��り��ん���。"
 
-#: ../clients/cli/devices.c:3082
+#: ../clients/cli/devices.c:3176
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: �表示� SSID �スキャン�失敗����: %s。"
 
-#: ../clients/cli/devices.c:3109
+#: ../clients/cli/devices.c:3203
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID � '%s' ��ットワーク�見��り��ん���。"
 
-#: ../clients/cli/devices.c:3111
+#: ../clients/cli/devices.c:3205
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID � '%s' �アクセス�イント�見��り��ん���。"
 
-#: ../clients/cli/devices.c:3153
+#: ../clients/cli/devices.c:3247
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr ""
 "警告: '%s' ���表示 AP � SSID ��る必���り����BSSID �よ���。\n"
 
-#: ../clients/cli/devices.c:3167
+#: ../clients/cli/devices.c:3263
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3316
+#: ../clients/cli/devices.c:3412
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' �有効� WPA PSK ���り��ん"
 
-#: ../clients/cli/devices.c:3333
+#: ../clients/cli/devices.c:3429
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr ""
 "'%s' �有効� WEP キー���り��ん (5 ��� 13 文字� ASCII 文字��る必�"
 "��り��)"
 
-#: ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:3445
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "ホットス�ット�パスワード: %s\n"
 
-#: ../clients/cli/devices.c:3420
+#: ../clients/cli/devices.c:3516
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: ssid �長����。"
 
-#: ../clients/cli/devices.c:3434
+#: ../clients/cli/devices.c:3530
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr ""
 "エラー: �ンド引数値 '%s' �無効��。'a' ��� 'bg' を使用������。"
 
-#: ../clients/cli/devices.c:3459
+#: ../clients/cli/devices.c:3555
 #, c-format
 msgid "Error: Unknown parameter %s."
 msgstr "エラー: �明�パラメータ %s ��。"
 
-#: ../clients/cli/devices.c:3479
+#: ../clients/cli/devices.c:3575
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: �ャ�ル���ンドも必���。"
 
-#: ../clients/cli/devices.c:3484
+#: ../clients/cli/devices.c:3580
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: �ャン�ル '%s' ���ンド '%s' �対��有効���り��ん。"
 
-#: ../clients/cli/devices.c:3508
+#: ../clients/cli/devices.c:3604
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr ""
 "エラー: デ�イス '%s' ��AP ���アドホックモード���れもサ�ート���"
 "ん。"
 
-#: ../clients/cli/devices.c:3542
+#: ../clients/cli/devices.c:3638
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効�パスワード: %s。"
 
-#: ../clients/cli/devices.c:3617
+#: ../clients/cli/devices.c:3713
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' を繰り返��������ん。"
 
 #. Main header name
-#: ../clients/cli/devices.c:3723
+#: ../clients/cli/devices.c:3818
 msgid "Device LLDP neighbors"
 msgstr "LLDP 近接デ�イス"
 
-#: ../clients/cli/devices.c:3833
+#: ../clients/cli/devices.c:3928
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device lldp list': %s"
@@ -3197,7 +3199,7 @@ msgstr "接続完了 (ローカル��)"
 msgid "connected (site only)"
 msgstr "接続完了 (サイト��)"
 
-#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:241
+#: ../clients/cli/general.c:46 ../clients/common/nm-client-utils.c:282
 msgid "connected"
 msgstr "接続済�"
 
@@ -3205,51 +3207,51 @@ msgstr "接続済�"
 msgid "disconnecting"
 msgstr "切断中"
 
-#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:227
+#: ../clients/cli/general.c:48 ../clients/common/nm-client-utils.c:268
 msgid "disconnected"
 msgstr "切断済�"
 
-#: ../clients/cli/general.c:80
+#: ../clients/cli/general.c:83
 msgid "none"
 msgstr "��"
 
-#: ../clients/cli/general.c:81
+#: ../clients/cli/general.c:84
 msgid "portal"
 msgstr "�ータル"
 
-#: ../clients/cli/general.c:82
+#: ../clients/cli/general.c:85
 msgid "limited"
 msgstr "制�付�"
 
-#: ../clients/cli/general.c:83
+#: ../clients/cli/general.c:86
 msgid "full"
 msgstr "完全"
 
-#: ../clients/cli/general.c:154
+#: ../clients/cli/general.c:158
 msgid "auth"
 msgstr "�証"
 
-#: ../clients/cli/general.c:189
+#: ../clients/cli/general.c:186
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:203
+#: ../clients/cli/general.c:200
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:203
+#: ../clients/cli/general.c:200
 msgid "started"
 msgstr "起動����"
 
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:234
 msgid "enabled"
 msgstr "有効"
 
-#: ../clients/cli/general.c:237
+#: ../clients/cli/general.c:234
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:369
+#: ../clients/cli/general.c:352
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3278,7 +3280,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:380
+#: ../clients/cli/general.c:363
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3295,7 +3297,7 @@ msgstr ""
 "status' を実行������り��。\n"
 "\n"
 
-#: ../clients/cli/general.c:389
+#: ../clients/cli/general.c:372
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3318,7 +3320,7 @@ msgstr ""
 "渡�����ホスト�をシステム�永続的�ホスト����新��設定���。\n"
 "\n"
 
-#: ../clients/cli/general.c:401
+#: ../clients/cli/general.c:384
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3331,7 +3333,7 @@ msgstr ""
 "�証�れ��る�作�対�る呼�出���パーミッションを表示���。\n"
 "\n"
 
-#: ../clients/cli/general.c:409
+#: ../clients/cli/general.c:392
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3357,7 +3359,7 @@ msgstr ""
 "使用��るログ記録�ドメイン一覧����� man ページを�照������。\n"
 "\n"
 
-#: ../clients/cli/general.c:422
+#: ../clients/cli/general.c:405
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3382,7 +3384,7 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:432
+#: ../clients/cli/general.c:415
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3395,7 +3397,7 @@ msgstr ""
 "�ットワークをオン�切り替���。\n"
 "\n"
 
-#: ../clients/cli/general.c:440
+#: ../clients/cli/general.c:423
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3408,7 +3410,7 @@ msgstr ""
 "�ットワークをオフ�切り替���。\n"
 "\n"
 
-#: ../clients/cli/general.c:448
+#: ../clients/cli/general.c:431
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3427,7 +3429,7 @@ msgstr ""
 "�ットワーク�接続状態を�得���。\n"
 "オプション� 'check' 引数を付�る�接続を��ェック���。\n"
 
-#: ../clients/cli/general.c:460
+#: ../clients/cli/general.c:443
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3444,7 +3446,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:469
+#: ../clients/cli/general.c:452
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3461,7 +3463,7 @@ msgstr ""
 "����ラジオスイッ��状態を�得����オン�オフ����。\n"
 "\n"
 
-#: ../clients/cli/general.c:479
+#: ../clients/cli/general.c:462
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3478,7 +3480,7 @@ msgstr ""
 "Wi-Fi ラジオスイッ��状態を�得����オン�オフ����。\n"
 "\n"
 
-#: ../clients/cli/general.c:489
+#: ../clients/cli/general.c:472
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3496,7 +3498,7 @@ msgstr ""
 "�。\n"
 "\n"
 
-#: ../clients/cli/general.c:499
+#: ../clients/cli/general.c:482
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3511,180 +3513,180 @@ msgstr ""
 "NetworkManager �変更�行�れる���行を出力���。\n"
 "\n"
 
-#: ../clients/cli/general.c:528
+#: ../clients/cli/general.c:511
 msgid "NetworkManager status"
 msgstr "NetworkManager �ステータス"
 
-#: ../clients/cli/general.c:532
+#: ../clients/cli/general.c:515
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 使用��る��次�フィールド����: %s"
 
-#: ../clients/cli/general.c:582
+#: ../clients/cli/general.c:568
 msgid "NetworkManager permissions"
 msgstr "NetworkManager �パーミッション"
 
-#: ../clients/cli/general.c:586
+#: ../clients/cli/general.c:572
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:674
+#: ../clients/cli/general.c:660
 msgid "NetworkManager logging"
 msgstr "NetworkManager �ロギング"
 
-#: ../clients/cli/general.c:678
+#: ../clients/cli/general.c:664
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:760
+#: ../clients/cli/general.c:746
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギング�設定�失敗����: %s"
 
-#: ../clients/cli/general.c:777
+#: ../clients/cli/general.c:763
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト��設定�失敗����: %s"
 
-#: ../clients/cli/general.c:846
+#: ../clients/cli/general.c:832
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr ""
 "エラー: '--fields' �値 '%s' �����無効�� (使用��るフィールド: %s)"
 
-#: ../clients/cli/general.c:871
+#: ../clients/cli/general.c:857
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "エラー: 無効� '%s' 引数��: '%s' (on � off を使用������)。"
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:919 ../clients/cli/general.c:931
+#: ../clients/cli/general.c:905 ../clients/cli/general.c:917
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:934
+#: ../clients/cli/general.c:920
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr ""
 "エラー: 'networking' �コマンド '%s' ��有効�コマンド���り��ん。"
 
-#: ../clients/cli/general.c:948
+#: ../clients/cli/general.c:934
 msgid "Networking"
 msgstr "�ットワーキング"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:983
+#: ../clients/cli/general.c:969
 msgid "Radio switches"
 msgstr "ラジオスイッ�"
 
 #. no argument, show current WiFi state
-#: ../clients/cli/general.c:1013
+#: ../clients/cli/general.c:999
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッ�"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1040
+#: ../clients/cli/general.c:1026
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッ�"
 
-#: ../clients/cli/general.c:1089
+#: ../clients/cli/general.c:1074
 msgid "NetworkManager has started"
 msgstr "NetworkManager  �起動�れ���"
 
-#: ../clients/cli/general.c:1089
+#: ../clients/cli/general.c:1074
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager ��止����"
 
-#: ../clients/cli/general.c:1100
+#: ../clients/cli/general.c:1085
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト�� '%s' �設定�れ���\n"
 
-#: ../clients/cli/general.c:1115
+#: ../clients/cli/general.c:1100
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "'%s' �プライマリー接続��\n"
 
-#: ../clients/cli/general.c:1117
+#: ../clients/cli/general.c:1102
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "プライマリー接続��り��ん\n"
 
-#: ../clients/cli/general.c:1129
+#: ../clients/cli/general.c:1114
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性� '%s' ��\n"
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1127
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager �状態� '%s' ��\n"
 
-#: ../clients/cli/general.c:1163
+#: ../clients/cli/general.c:1147
 msgid "connection available"
 msgstr "接続�利用�能"
 
-#: ../clients/cli/general.c:1165
+#: ../clients/cli/general.c:1149
 msgid "connections available"
 msgstr "接続�利用�能"
 
-#: ../clients/cli/general.c:1183
+#: ../clients/cli/general.c:1167
 msgid "autoconnect"
 msgstr "自動接続"
 
-#: ../clients/cli/general.c:1185
+#: ../clients/cli/general.c:1169
 msgid "fw missing"
 msgstr "fw ��り��ん"
 
-#: ../clients/cli/general.c:1190
+#: ../clients/cli/general.c:1174
 msgid "plugin missing"
 msgstr "プラグイン��り��ん"
 
-#: ../clients/cli/general.c:1195
+#: ../clients/cli/general.c:1179
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1197
+#: ../clients/cli/general.c:1181
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1202
+#: ../clients/cli/general.c:1186
 msgid "iface"
 msgstr "iface"
 
-#: ../clients/cli/general.c:1205
+#: ../clients/cli/general.c:1189
 msgid "port"
 msgstr "�ート"
 
-#: ../clients/cli/general.c:1208
+#: ../clients/cli/general.c:1192
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1225
+#: ../clients/cli/general.c:1209
 msgid "master"
 msgstr "マスター"
 
-#: ../clients/cli/general.c:1229 ../clients/tui/nm-editor-utils.c:241
-#: ../clients/tui/nmt-connect-connection-list.c:408
+#: ../clients/cli/general.c:1213 ../clients/tui/nm-editor-utils.c:239
+#: ../clients/tui/nmt-connect-connection-list.c:407
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1231
+#: ../clients/cli/general.c:1215
 msgid "ip4 default"
 msgstr "ip4 デフォルト"
 
-#: ../clients/cli/general.c:1233
+#: ../clients/cli/general.c:1217
 msgid "ip6 default"
 msgstr "ip6 デフォルト"
 
-#: ../clients/cli/general.c:1316
+#: ../clients/cli/general.c:1300
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN 接続"
 
-#: ../clients/cli/general.c:1386
+#: ../clients/cli/general.c:1368
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3702,21 +3704,23 @@ msgstr ""
 "使用方法�詳細情報������nmcli(1) � nmcli-examples(5) � man ページを�"
 "照������。\n"
 
-#: ../clients/cli/general.c:1407
+#: ../clients/cli/general.c:1389
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'monitor' コマンド '%s' �有効���り��ん。"
 
-#: ../clients/cli/general.c:1419
+#: ../clients/cli/general.c:1401
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager �実行�れ����ん (待機中)\n"
 
-#: ../clients/cli/nmcli.c:184
+#: ../clients/cli/nmcli.c:242
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
+"  -o[verview]                                    overview mode (hide default "
+"values)\n"
 "  -t[erse]                                       terse output\n"
 "  -p[retty]                                      pretty output\n"
 "  -m[ode] tabular|multiline                      output mode\n"
@@ -3747,6 +3751,8 @@ msgstr ""
 "使�方: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
+"  -o[verview]                                    overview mode (hide default "
+"values)\n"
 "  -t[erse]                                       terse output\n"
 "  -p[retty]                                      pretty output\n"
 "  -m[ode] tabular|multiline                      output mode\n"
@@ -3774,62 +3780,82 @@ msgstr ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:263
+#: ../clients/cli/nmcli.c:322
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用�引数��り��ん。"
 
-#: ../clients/cli/nmcli.c:311
+#: ../clients/cli/nmcli.c:532
+#, c-format
+msgid "Unexpected end of file following '%s'\n"
+msgstr "'%s' �続��予期��ファイル�終了\n"
+
+#: ../clients/cli/nmcli.c:540
+#, c-format
+msgid "Expected whitespace following '%s'\n"
+msgstr "'%s' �続��必��ホワイトスペース\n"
+
+#: ../clients/cli/nmcli.c:552
+#, c-format
+msgid "Expected a value for '%s'\n"
+msgstr "'%s' ��値�必���\n"
+
+#: ../clients/cli/nmcli.c:566
+#, c-format
+msgid "Expected a line break following '%s'\n"
+msgstr "'%s' �続�改行�必���\n"
+
+#: ../clients/cli/nmcli.c:663
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' �二度指定�れ����。"
 
-#: ../clients/cli/nmcli.c:316
+#: ../clients/cli/nmcli.c:668
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' � '--pretty' �相互�排他的��。"
 
-#: ../clients/cli/nmcli.c:324
+#: ../clients/cli/nmcli.c:676
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' �二度指定�れ����。"
 
-#: ../clients/cli/nmcli.c:329
+#: ../clients/cli/nmcli.c:681
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' � '--terse' �相互�排他的��。"
 
-#: ../clients/cli/nmcli.c:344
+#: ../clients/cli/nmcli.c:696
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "エラー: '%s' ��'%s' オプション�有効�引数���り��ん。"
 
-#: ../clients/cli/nmcli.c:358 ../clients/cli/nmcli.c:370
+#: ../clients/cli/nmcli.c:710 ../clients/cli/nmcli.c:722
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' ��'%s' オプション用�有効�引数���り��ん。"
 
-#: ../clients/cli/nmcli.c:394
+#: ../clients/cli/nmcli.c:746
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "エラー: '%s' �有効�タイムアウト���り��ん。"
 
-#: ../clients/cli/nmcli.c:401
+#: ../clients/cli/nmcli.c:753
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール��ージョン %s\n"
 
-#: ../clients/cli/nmcli.c:409
+#: ../clients/cli/nmcli.c:761
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' ��明��。'nmcli -help' �確�������。"
 
-#: ../clients/cli/nmcli.c:455 ../clients/cli/nmcli.c:462
+#: ../clients/cli/nmcli.c:814 ../clients/cli/nmcli.c:821
 #, c-format
-msgid "Error: nmcli terminated by signal %s (%d)\n"
-msgstr "Error: nmcli �シグナル %s (%d) �終了����\n"
+msgid "Error: nmcli terminated by signal %s (%d)"
+msgstr "エラー: nmcli �シグナル %s (%d) �終了����"
 
-#: ../clients/cli/nmcli.c:560
+#: ../clients/cli/nmcli.c:963
 msgid "Success"
 msgstr "�功"
 
@@ -3838,12 +3864,12 @@ msgstr "�功"
 msgid "Authentication message: %s\n"
 msgstr "�証メッセージ: %s\n"
 
-#: ../clients/cli/polkit-agent.c:74
+#: ../clients/cli/polkit-agent.c:76
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "�証エラー: %s\n"
 
-#: ../clients/cli/polkit-agent.c:120
+#: ../clients/cli/polkit-agent.c:136
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告: polkit エージェント��期化�失敗����: %s\n"
@@ -3876,513 +3902,522 @@ msgstr ""
 msgid "Do you want to remove them? [yes] "
 msgstr "削除����? [yes] "
 
-#: ../clients/cli/settings.c:330
+#: ../clients/cli/settings.c:332
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "警告: %s �既存�接続プロファイル� UUID ���り��ん\n"
 
-#: ../clients/cli/settings.c:335 ../clients/cli/settings.c:348
+#: ../clients/cli/settings.c:337 ../clients/cli/settings.c:350
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "'%s' � VPN 接続プロファイル���り��ん"
 
-#: ../clients/cli/settings.c:342
+#: ../clients/cli/settings.c:344
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' �既存�プロファイル������り��ん"
 
-#: ../clients/cli/settings.c:386
+#: ../clients/cli/settings.c:388
 #, c-format
 msgid "Warning: %s\n"
 msgstr "警告: %s\n"
 
-#: ../clients/cli/settings.c:389
+#: ../clients/cli/settings.c:391
 #, c-format
 msgid "Info: %s\n"
 msgstr "情報: %s\n"
 
-#: ../clients/cli/settings.c:481
+#: ../clients/cli/settings.c:484
 msgid "don't know how to get the property value"
-msgstr "プロパティ値��得方法���り��ん"
+msgstr "プロパティー値��得方法���り��ん"
 
-#: ../clients/cli/settings.c:571 ../clients/cli/settings.c:613
+#: ../clients/cli/settings.c:574 ../clients/cli/settings.c:616
 msgid "the property can't be changed"
-msgstr "��プロパティ�変更����ん"
+msgstr "��プロパティー�変更����ん"
 
-#: ../clients/cli/settings.c:733
+#: ../clients/cli/settings.c:736
 msgid "[NM property description]"
-msgstr "[NM プロパティ�詳細]"
+msgstr "[NM プロパティー�詳細]"
 
-#: ../clients/cli/settings.c:743
+#: ../clients/cli/settings.c:746
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有�詳細]"
 
-#: ../clients/cli/utils.c:328
+#: ../clients/cli/utils.c:317
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "エラー: 引数 '%s' �必�����'%s' �指定�れ���。"
 
-#: ../clients/cli/utils.c:331
+#: ../clients/cli/utils.c:320
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期���引数 '%s' ��"
 
-#: ../clients/cli/utils.c:804
+#: ../clients/cli/utils.c:699
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "無効�フィールド '%s%s%s'。��よ��フィールド��り��ん"
 
-#: ../clients/cli/utils.c:808
+#: ../clients/cli/utils.c:703
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "無効�フィールド '%s%s%s'。使用��るフィールド: [%s]"
 
-#: ../clients/cli/utils.c:881
+#: ../clients/cli/utils.c:776
 #, c-format
 msgid "failure to select field"
 msgstr "フィールド��択�失敗����"
 
-#: ../clients/cli/utils.c:1469
+#: ../clients/cli/utils.c:1369
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "nmcli 出力�読�込�中�エラー�発生����: %s\n"
 
-#: ../clients/cli/utils.c:1474
+#: ../clients/cli/utils.c:1374
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "nmcli 出力�書�込�中�エラー�発生����: %s\n"
 
-#: ../clients/cli/utils.c:1498
+#: ../clients/cli/utils.c:1398
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "ページャーパイプ�作��失敗����: %s\n"
 
-#: ../clients/cli/utils.c:1506
+#: ../clients/cli/utils.c:1406
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "ページャー�フォーク�失敗����: %s\n"
 
-#: ../clients/cli/utils.c:1552 ../clients/cli/utils.c:1554
+#: ../clients/cli/utils.c:1452 ../clients/cli/utils.c:1454
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "ページャーパイプ�複製�失敗����: %s\n"
 
+#: ../clients/cli/utils.h:239
+#, c-format
+msgid "%lld (%s)"
+msgstr "%lld (%s)"
+
 #. TRANSLATORS: the first %s is the partial value entered by
 #. * the user, the second %s a list of compatible values.
 #.
-#: ../clients/common/nm-client-utils.c:75
-#: ../clients/common/nm-client-utils.c:106
+#: ../clients/common/nm-client-utils.c:117
+#: ../clients/common/nm-client-utils.c:148
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "'%s' ��明瞭�� (%s)"
 
-#: ../clients/common/nm-client-utils.c:85
+#: ../clients/common/nm-client-utils.c:127
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' �無効��。[%s] � [%s] を使用������"
 
-#: ../clients/common/nm-client-utils.c:118
+#: ../clients/common/nm-client-utils.c:160
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "'%s' �無効��。[%s]�[%s]���� [%s] を使用������"
 
-#: ../clients/common/nm-client-utils.c:155
+#: ../clients/common/nm-client-utils.c:209
 #, c-format
-msgid "'%s' is ambiguous (%s x %s)"
-msgstr "'%s' ��明瞭�� (%s x %s)"
+msgid "'%s' is ambiguous: %s"
+msgstr "'%s' ��明瞭��: %s"
 
-#: ../clients/common/nm-client-utils.c:167
+#: ../clients/common/nm-client-utils.c:219
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "����り��ん�[%s] ������れ��試��������"
 
-#: ../clients/common/nm-client-utils.c:223
+#: ../clients/common/nm-client-utils.c:264
 msgid "unmanaged"
 msgstr "管�無�"
 
-#: ../clients/common/nm-client-utils.c:225
+#: ../clients/common/nm-client-utils.c:266
 msgid "unavailable"
 msgstr "利用��"
 
-#: ../clients/common/nm-client-utils.c:229
+#: ../clients/common/nm-client-utils.c:270
 msgid "connecting (prepare)"
 msgstr "接続中 (準備)"
 
-#: ../clients/common/nm-client-utils.c:231
+#: ../clients/common/nm-client-utils.c:272
 msgid "connecting (configuring)"
 msgstr "接続中 (設定中)"
 
-#: ../clients/common/nm-client-utils.c:233
+#: ../clients/common/nm-client-utils.c:274
 msgid "connecting (need authentication)"
 msgstr "接続中 (�証�必�)"
 
-#: ../clients/common/nm-client-utils.c:235
+#: ../clients/common/nm-client-utils.c:276
 msgid "connecting (getting IP configuration)"
 msgstr "接続中 (IP 設定を�得中)"
 
-#: ../clients/common/nm-client-utils.c:237
+#: ../clients/common/nm-client-utils.c:278
 msgid "connecting (checking IP connectivity)"
 msgstr "接続中 (IP �接続性�ェック)"
 
-#: ../clients/common/nm-client-utils.c:239
+#: ../clients/common/nm-client-utils.c:280
 msgid "connecting (starting secondary connections)"
 msgstr "接続中 (セカンダリー接続を開始)"
 
-#: ../clients/common/nm-client-utils.c:245
+#: ../clients/common/nm-client-utils.c:286
 msgid "connection failed"
 msgstr "接続�失敗"
 
-#: ../clients/common/nm-client-utils.c:262
+#: ../clients/common/nm-client-utils.c:303
 msgid "yes (guessed)"
 msgstr "�� (推測)"
 
-#: ../clients/common/nm-client-utils.c:264
+#: ../clients/common/nm-client-utils.c:305
 msgid "no (guessed)"
 msgstr "��� (推測)"
 
-#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:318
 msgid "No reason given"
 msgstr "原因�明"
 
-#: ../clients/common/nm-client-utils.c:281
+#: ../clients/common/nm-client-utils.c:322
 msgid "Device is now managed"
 msgstr "デ�イス�管�下�置�れ���"
 
-#: ../clients/common/nm-client-utils.c:283
+#: ../clients/common/nm-client-utils.c:324
 msgid "Device is now unmanaged"
 msgstr "デ�イス�管�下�ら外れ���"
 
-#: ../clients/common/nm-client-utils.c:285
+#: ../clients/common/nm-client-utils.c:326
 msgid "The device could not be readied for configuration"
 msgstr "デ�イス�設定準備�����ん���"
 
-#: ../clients/common/nm-client-utils.c:287
+#: ../clients/common/nm-client-utils.c:328
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "IP 設定を確�����ん��� (利用�能�アドレス����タイムアウト��)"
 
-#: ../clients/common/nm-client-utils.c:289
+#: ../clients/common/nm-client-utils.c:330
 msgid "The IP configuration is no longer valid"
 msgstr "�� IP 設定�無効��り���"
 
-#: ../clients/common/nm-client-utils.c:291
+#: ../clients/common/nm-client-utils.c:332
 msgid "Secrets were required, but not provided"
 msgstr "シークレット�必�����入力�れ��ん���"
 
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/common/nm-client-utils.c:334
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X サプリカント�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:336
 msgid "802.1X supplicant configuration failed"
 msgstr "802.1X サプリカント�設定�失敗����"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:338
 msgid "802.1X supplicant failed"
 msgstr "802.1X サプリカント�失敗����"
 
-#: ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-client-utils.c:340
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X サプリカント��証�時間���り�����"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:342
 msgid "PPP service failed to start"
 msgstr "PPP サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:344
 msgid "PPP service disconnected"
 msgstr "PPP サービス�接続�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:346
 msgid "PPP failed"
 msgstr "PPP �失敗"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:348
 msgid "DHCP client failed to start"
 msgstr "DHCP クライアント�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:350
 msgid "DHCP client error"
 msgstr "DHCP クライアントエラー"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:352
 msgid "DHCP client failed"
 msgstr "DHCP クライアント�失敗"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:354
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:356
 msgid "Shared connection service failed"
 msgstr "共有接続サービス�失敗"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:358
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:360
 msgid "AutoIP service error"
 msgstr "AutoIP サービスエラー"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:362
 msgid "AutoIP service failed"
 msgstr "AutoIP サービス�失敗"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:364
 msgid "The line is busy"
 msgstr "回線�使用中��"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:366
 msgid "No dial tone"
 msgstr "ダイアル音��り��ん"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:368
 msgid "No carrier could be established"
 msgstr "確立��るキャリア��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:370
 msgid "The dialing request timed out"
 msgstr "ダイアル�求�タイムアウト����"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:372
 msgid "The dialing attempt failed"
 msgstr "ダイアル�試行�失敗����"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:374
 msgid "Modem initialization failed"
 msgstr "モデム��期化�失敗����"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:376
 msgid "Failed to select the specified APN"
 msgstr "指定�れ� APN ��択�失敗����"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:378
 msgid "Not searching for networks"
 msgstr "�ットワーク検索を�����ん"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:380
 msgid "Network registration denied"
 msgstr "�ットワーク�登録�拒��れ���"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:382
 msgid "Network registration timed out"
 msgstr "�ットワーク�登録�タイムアウト��り���"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:384
 msgid "Failed to register with the requested network"
 msgstr "�求�れ��ットワーク��登録�失敗����"
 
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:386
 msgid "PIN check failed"
 msgstr "PIN 確��失敗����"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:388
 msgid "Necessary firmware for the device may be missing"
 msgstr "��デ�イス�必��ファームウェア����能性��り��"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:390
 msgid "The device was removed"
 msgstr "��デ�イス�削除�れ���"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:392
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager �スリープ状態�入り���"
 
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:394
 msgid "The device's active connection disappeared"
 msgstr "��デ�イス�アクティブ�接続�消滅����"
 
-#: ../clients/common/nm-client-utils.c:355
+#: ../clients/common/nm-client-utils.c:396
 msgid "Device disconnected by user or client"
 msgstr "ユーザー���クライアント�よりデ�イス�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:357
+#: ../clients/common/nm-client-utils.c:398
 msgid "Carrier/link changed"
 msgstr "キャリア/リンク�変更�れ���"
 
-#: ../clients/common/nm-client-utils.c:359
+#: ../clients/common/nm-client-utils.c:400
 msgid "The device's existing connection was assumed"
 msgstr "デ�イス�既存�接続����れ���"
 
-#: ../clients/common/nm-client-utils.c:361
+#: ../clients/common/nm-client-utils.c:402
 msgid "The supplicant is now available"
 msgstr "サプリカント�使用��るよ���り���"
 
-#: ../clients/common/nm-client-utils.c:363
+#: ../clients/common/nm-client-utils.c:404
 msgid "The modem could not be found"
 msgstr "モデム�見��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:406
 msgid "The Bluetooth connection failed or timed out"
 msgstr "Bluetooth 接続�失敗���タイムアウト����"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:408
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM モデム� SIM カード�挿入�れ����ん"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:410
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM モデム� SIM PIN �必���"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:412
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM モデム� SIM PUK �必���"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:414
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM モデム� SIM �間������"
 
-#: ../clients/common/nm-client-utils.c:375
+#: ../clients/common/nm-client-utils.c:416
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand デ�イス��接続モード�対応�����ん"
 
-#: ../clients/common/nm-client-utils.c:377
+#: ../clients/common/nm-client-utils.c:418
 msgid "A dependency of the connection failed"
 msgstr "接続�存性�失敗"
 
-#: ../clients/common/nm-client-utils.c:379
+#: ../clients/common/nm-client-utils.c:420
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "ADSL ブリッジ経由� RFC 2684 Ethernet ��題�発生����"
 
-#: ../clients/common/nm-client-utils.c:381
+#: ../clients/common/nm-client-utils.c:422
 msgid "ModemManager is unavailable"
 msgstr "ModemManager �使用����ん"
 
-#: ../clients/common/nm-client-utils.c:383
+#: ../clients/common/nm-client-utils.c:424
 msgid "The Wi-Fi network could not be found"
 msgstr "Wi-Fi �ットワーク�見��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:385
+#: ../clients/common/nm-client-utils.c:426
 msgid "A secondary connection of the base connection failed"
 msgstr "ベース接続�セカンダリー接続�失敗����"
 
-#: ../clients/common/nm-client-utils.c:387
+#: ../clients/common/nm-client-utils.c:428
 msgid "DCB or FCoE setup failed"
 msgstr "DCB ��� FCoE �セットアップ�失敗����"
 
-#: ../clients/common/nm-client-utils.c:389
+#: ../clients/common/nm-client-utils.c:430
 msgid "teamd control failed"
 msgstr "teamd �制御�失敗����"
 
-#: ../clients/common/nm-client-utils.c:391
+#: ../clients/common/nm-client-utils.c:432
 msgid "Modem failed or no longer available"
 msgstr "モデム�障害�発生����モデム�利用�����り���"
 
-#: ../clients/common/nm-client-utils.c:393
+#: ../clients/common/nm-client-utils.c:434
 msgid "Modem now ready and available"
 msgstr "モデム�準備�れ�����利用�能��"
 
-#: ../clients/common/nm-client-utils.c:395
+#: ../clients/common/nm-client-utils.c:436
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN �間������"
 
-#: ../clients/common/nm-client-utils.c:397
+#: ../clients/common/nm-client-utils.c:438
 msgid "New connection activation was enqueued"
 msgstr "新�接続アクティベーション�キュー�格��れ���"
 
-#: ../clients/common/nm-client-utils.c:399
+#: ../clients/common/nm-client-utils.c:440
 msgid "The device's parent changed"
 msgstr "デ�イス�親�変更�れ���"
 
-#: ../clients/common/nm-client-utils.c:401
+#: ../clients/common/nm-client-utils.c:442
 msgid "The device parent's management changed"
 msgstr "デ�イス�親�管��変更�れ���"
 
-#: ../clients/common/nm-client-utils.c:403
+#: ../clients/common/nm-client-utils.c:444
 msgid "OpenVSwitch database connection failed"
 msgstr "OpenVSwitch データベース�接続�失敗����"
 
-#: ../clients/common/nm-client-utils.c:405
+#: ../clients/common/nm-client-utils.c:446
 msgid "A duplicate IP address was detected"
-msgstr ""
+msgstr "複製�れ� IP アドレス�検出�れ���"
+
+#: ../clients/common/nm-client-utils.c:448
+msgid "The selected IP method is not supported"
+msgstr "�択�れ� IP メソッド��対応�����ん"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:410
-#: ../clients/common/nm-client-utils.c:449 ../libnm-glib/nm-device.c:1860
-#: ../libnm/nm-device.c:1572
+#: ../clients/common/nm-client-utils.c:452
+#: ../clients/common/nm-client-utils.c:491 ../libnm-glib/nm-device.c:1859
+#: ../libnm/nm-device.c:1354
 msgid "Unknown"
 msgstr "�明"
 
-#: ../clients/common/nm-client-utils.c:418
+#: ../clients/common/nm-client-utils.c:460
 msgid "Unknown reason"
 msgstr "�明��由"
 
-#: ../clients/common/nm-client-utils.c:420
+#: ../clients/common/nm-client-utils.c:462
 msgid "The connection was disconnected"
 msgstr "接続�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:422
+#: ../clients/common/nm-client-utils.c:464
 msgid "Disconnected by user"
 msgstr "ユーザー�より切断"
 
-#: ../clients/common/nm-client-utils.c:424
+#: ../clients/common/nm-client-utils.c:466
 msgid "The base network connection was interrupted"
 msgstr "基本�ットワーク接続�中断�れ���。"
 
-#: ../clients/common/nm-client-utils.c:426
+#: ../clients/common/nm-client-utils.c:468
 msgid "The VPN service stopped unexpectedly"
 msgstr "VPN サービス�予期���止����"
 
-#: ../clients/common/nm-client-utils.c:428
+#: ../clients/common/nm-client-utils.c:470
 msgid "The VPN service returned invalid configuration"
 msgstr "VPN サービス�無効�設定を返����"
 
-#: ../clients/common/nm-client-utils.c:430
+#: ../clients/common/nm-client-utils.c:472
 msgid "The connection attempt timed out"
 msgstr "接続試行�タイムアウト����"
 
-#: ../clients/common/nm-client-utils.c:432
+#: ../clients/common/nm-client-utils.c:474
 msgid "The VPN service did not start in time"
 msgstr "VPN サービス�時間内�開始���ん���"
 
-#: ../clients/common/nm-client-utils.c:434
+#: ../clients/common/nm-client-utils.c:476
 msgid "The VPN service failed to start"
 msgstr "VPN サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:436
+#: ../clients/common/nm-client-utils.c:478
 msgid "No valid secrets"
 msgstr "有効�シークレット��り��ん"
 
-#: ../clients/common/nm-client-utils.c:438
+#: ../clients/common/nm-client-utils.c:480
 msgid "Invalid secrets"
 msgstr "無効�シークレット"
 
-#: ../clients/common/nm-client-utils.c:440
+#: ../clients/common/nm-client-utils.c:482
 msgid "The connection was removed"
 msgstr "接続�削除�れ���"
 
-#: ../clients/common/nm-client-utils.c:442
+#: ../clients/common/nm-client-utils.c:484
 msgid "Master connection failed"
 msgstr "マスター接続�失敗����"
 
-#: ../clients/common/nm-client-utils.c:444
+#: ../clients/common/nm-client-utils.c:486
 msgid "Could not create a software link"
 msgstr "ソフトウェアリンクを作�����ん���"
 
-#: ../clients/common/nm-client-utils.c:446
+#: ../clients/common/nm-client-utils.c:488
 msgid "The device disappeared"
 msgstr "デ�イス�消滅����"
 
-#: ../clients/common/nm-meta-setting-access.c:501
+#: ../clients/common/nm-meta-setting-access.c:504
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' �孤立�る必���り��"
 
-#: ../clients/common/nm-meta-setting-access.c:516
+#: ../clients/common/nm-meta-setting-access.c:519
 #, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "無効�フィールド '%s%s%s%s%s'; %s%s%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:100
-#: ../clients/common/nm-meta-setting-desc.c:156
+#: ../clients/common/nm-meta-setting-desc.c:99
+#: ../clients/common/nm-meta-setting-desc.c:161
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "無効�プレフィックス '%s'; <1-%d> 許�"
 
-#: ../clients/common/nm-meta-setting-desc.c:108
+#: ../clients/common/nm-meta-setting-desc.c:107
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "無効� IP アドレス: %s"
@@ -4395,267 +4430,238 @@ msgstr ""
 "有効�構文�以下�よ���り��: 'ip[/prefix] [next-hop] [metric] "
 "[attribute=val]... [,ip[/prefix] ...]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:167
+#: ../clients/common/nm-meta-setting-desc.c:172
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "次�ホップ ('%s') ��回��る必���り��"
 
-#: ../clients/common/nm-meta-setting-desc.c:173
+#: ../clients/common/nm-meta-setting-desc.c:178
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "メトリック ('%s') �属性����る必���り��"
 
-#: ../clients/common/nm-meta-setting-desc.c:213
+#: ../clients/common/nm-meta-setting-desc.c:218
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "無効�ルート: %s. %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:225
+#: ../clients/common/nm-meta-setting-desc.c:230
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr "デフォルト�ルート�追加����ん (NetworkManager 自体�処����)"
 
-#: ../clients/common/nm-meta-setting-desc.c:424
+#: ../clients/common/nm-meta-setting-desc.c:429
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "無効�優先度マップ '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:431
-#: ../clients/common/nm-meta-setting-desc.c:437
+#: ../clients/common/nm-meta-setting-desc.c:436
+#: ../clients/common/nm-meta-setting-desc.c:442
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "'%s' �有効�優先度���り��ん (<0-%ld>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:489
+#: ../clients/common/nm-meta-setting-desc.c:494
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "ファイル '%s' �ら pac-script を読�込���ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:496
+#: ../clients/common/nm-meta-setting-desc.c:501
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "ファイル '%s' ��無効� utf-8 ���れ����"
 
-#: ../clients/common/nm-meta-setting-desc.c:509
+#: ../clients/common/nm-meta-setting-desc.c:514
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "'%s' ��有効� PAC スクリプト���れ����ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:512
+#: ../clients/common/nm-meta-setting-desc.c:517
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "有効� PAC スクリプト���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:566
+#: ../clients/common/nm-meta-setting-desc.c:571
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "ファイル '%s' �ら�ーム設定を読�込���ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:573
+#: ../clients/common/nm-meta-setting-desc.c:578
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "�ーム設定ファイル '%s' ��無効� utf-8 ���れ����"
 
-#: ../clients/common/nm-meta-setting-desc.c:585
+#: ../clients/common/nm-meta-setting-desc.c:590
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr "'%s' ��有効��ーム設定���れ����ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:588
+#: ../clients/common/nm-meta-setting-desc.c:593
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr "�ーム設定� JSON オブジェクト��る必���り��"
 
-#: ../clients/common/nm-meta-setting-desc.c:682
+#: ../clients/common/nm-meta-setting-desc.c:714
 #: ../clients/tui/nmt-mtu-entry.c:84
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: ../clients/common/nm-meta-setting-desc.c:797
+#: ../clients/common/nm-meta-setting-desc.c:834
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/common/nm-meta-setting-desc.c:945
+#: ../clients/common/nm-meta-setting-desc.c:986
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1069
+#: ../clients/common/nm-meta-setting-desc.c:1110
 #, c-format
 msgid "'%s' is out of range [%lli, %lli]"
 msgstr "'%s' ��[%lli, %lli] �範囲外��"
 
-#: ../clients/common/nm-meta-setting-desc.c:1075
+#: ../clients/common/nm-meta-setting-desc.c:1116
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "'%s' �有効�数値���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:1125
+#: ../clients/common/nm-meta-setting-desc.c:1166
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "'%s' ��[0, %u] �範囲外��"
 
-#: ../clients/common/nm-meta-setting-desc.c:1162
+#: ../clients/common/nm-meta-setting-desc.c:1202
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' �有効� Ethernet MAC ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:1181
-#, c-format
-msgid "'%s' is not a valid flag number; use <0-%d>"
-msgstr "'%s' �有効�フラグ番����り��ん。<0-%d> を使用������"
-
-#: ../clients/common/nm-meta-setting-desc.c:1195
-#, c-format
-msgid "'%s' sum is higher than all flags => all flags set"
-msgstr ""
-"�計 '%s' �����フラグよりも大���� => ����フラグ�設定�れ���"
-"�"
-
-#: ../clients/common/nm-meta-setting-desc.c:1299
+#: ../clients/common/nm-meta-setting-desc.c:1306
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "無効�オプション '%s' ��。[%s] �組����を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1304
-#: ../libnm-core/nm-keyfile-reader.c:623
+#: ../clients/common/nm-meta-setting-desc.c:1311 ../libnm-core/nm-keyfile.c:727
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "無効�オプション '%s' ��。[%s] ���れ�を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1427
+#: ../clients/common/nm-meta-setting-desc.c:1430
 #, c-format
 msgid "%d (key)"
 msgstr "%d (key)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1429
+#: ../clients/common/nm-meta-setting-desc.c:1432
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1432
-#: ../clients/common/nm-meta-setting-desc.c:1521
+#: ../clients/common/nm-meta-setting-desc.c:1435
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (�明)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1464
+#: ../clients/common/nm-meta-setting-desc.c:1467
 msgid "0 (NONE)"
 msgstr "0 (��)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1470
+#: ../clients/common/nm-meta-setting-desc.c:1473
 msgid "REORDER_HEADERS, "
 msgstr "ヘッダー�順�変更�"
 
-#: ../clients/common/nm-meta-setting-desc.c:1472
+#: ../clients/common/nm-meta-setting-desc.c:1475
 msgid "GVRP, "
 msgstr "GVRP�"
 
-#: ../clients/common/nm-meta-setting-desc.c:1474
+#: ../clients/common/nm-meta-setting-desc.c:1477
 msgid "LOOSE_BINDING, "
 msgstr "ルース�インディング�"
 
-#: ../clients/common/nm-meta-setting-desc.c:1476
+#: ../clients/common/nm-meta-setting-desc.c:1479
 msgid "MVRP, "
 msgstr "MVRP�"
 
-#: ../clients/common/nm-meta-setting-desc.c:1515
-#, c-format
-msgid "%d (disabled)"
-msgstr "%d (無効)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1517
-#, c-format
-msgid "%d (enabled, prefer public IP)"
-msgstr "%d (有効�パブリック IP 優先)"
-
 #: ../clients/common/nm-meta-setting-desc.c:1519
-#, c-format
-msgid "%d (enabled, prefer temporary IP)"
-msgstr "%d (有効�一時 IP を優先)"
-
-#: ../clients/common/nm-meta-setting-desc.c:1534
 msgid "0 (none)"
 msgstr "0 (��)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1540
+#: ../clients/common/nm-meta-setting-desc.c:1525
 msgid "agent-owned, "
 msgstr "エージェント所有� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1542
+#: ../clients/common/nm-meta-setting-desc.c:1527
 msgid "not saved, "
 msgstr "未�存� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1544
+#: ../clients/common/nm-meta-setting-desc.c:1529
 msgid "not required, "
 msgstr "�必�� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1606
+#: ../clients/common/nm-meta-setting-desc.c:1594
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' �無効��; <option>=<value> を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1648
+#: ../clients/common/nm-meta-setting-desc.c:1633
 msgid "no item to remove"
 msgstr "削除�るアイテム��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:1652
+#: ../clients/common/nm-meta-setting-desc.c:1637
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "インデックス '%d' �範囲内��り��ん <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1667
+#: ../clients/common/nm-meta-setting-desc.c:1652
 #, c-format
 msgid "invalid option '%s'"
 msgstr "無効�オプション '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:1669
+#: ../clients/common/nm-meta-setting-desc.c:1654
 msgid "missing option"
 msgstr "足り��オプション"
 
-#: ../clients/common/nm-meta-setting-desc.c:1693
+#: ../clients/common/nm-meta-setting-desc.c:1678
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' �有効� MAC ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:1723
-#: ../clients/common/nm-meta-setting-desc.c:1819
-#: ../clients/common/nm-meta-setting-desc.c:4667
+#: ../clients/common/nm-meta-setting-desc.c:1705
+#: ../clients/common/nm-meta-setting-desc.c:1802
+#: ../clients/common/nm-meta-setting-desc.c:4636
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' �無効��"
 
-#: ../clients/common/nm-meta-setting-desc.c:1763
+#: ../clients/common/nm-meta-setting-desc.c:1746
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "'%u' フラグ�有効���り��ん。%s �組����を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1799
+#: ../clients/common/nm-meta-setting-desc.c:1782
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' �有効�数字���り��ん (���範囲外��り��)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1919
+#: ../clients/common/nm-meta-setting-desc.c:1901
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' �有効� 16 進文字���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2199
+#: ../clients/common/nm-meta-setting-desc.c:2190
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
 msgstr "プロパティー�� EAP メソッド '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2222
+#: ../clients/common/nm-meta-setting-desc.c:2213
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
 msgstr "プロパティー��代替�サブジェクトマッ� '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2248
+#: ../clients/common/nm-meta-setting-desc.c:2239
 #, c-format
 msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
 msgstr ""
 "プロパティー��代替�  \"phase2\" サブジェクトマッ� '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2369
+#: ../clients/common/nm-meta-setting-desc.c:2361
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4693,241 +4699,230 @@ msgstr ""
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2429
+#: ../clients/common/nm-meta-setting-desc.c:2424
 #, c-format
 msgid "Can not change the connection type"
 msgstr "接続タイプを変更����ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2539
+#: ../clients/common/nm-meta-setting-desc.c:2529
 #, c-format
 msgid "the property doesn't contain permission '%s'"
 msgstr "プロパティー��パーミッション '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2560
+#: ../clients/common/nm-meta-setting-desc.c:2550
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr ""
 "'%s' � 有効�マスター���り��ん: ifname ��接続 UUID を使用�����"
 "�。"
 
-#: ../clients/common/nm-meta-setting-desc.c:2659
+#: ../clients/common/nm-meta-setting-desc.c:2647
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "値 '%s' �有効� UUID ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2666
+#: ../clients/common/nm-meta-setting-desc.c:2654
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
 msgstr "プロパティー�� UUID '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2733
+#: ../clients/common/nm-meta-setting-desc.c:2723
 msgid "0 (disabled)"
 msgstr "0 (無効)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2739
+#: ../clients/common/nm-meta-setting-desc.c:2729
 msgid "enabled, "
 msgstr "有効�"
 
-#: ../clients/common/nm-meta-setting-desc.c:2741
+#: ../clients/common/nm-meta-setting-desc.c:2731
 msgid "advertise, "
 msgstr "公表�"
 
-#: ../clients/common/nm-meta-setting-desc.c:2743
+#: ../clients/common/nm-meta-setting-desc.c:2733
 msgid "willing, "
 msgstr "用���る�"
 
-#: ../clients/common/nm-meta-setting-desc.c:2863
+#: ../clients/common/nm-meta-setting-desc.c:2855
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' �有効� DCB フラグ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2893
+#: ../clients/common/nm-meta-setting-desc.c:2884
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマ�区切�� 8 ��番�を��������"
 
-#: ../clients/common/nm-meta-setting-desc.c:2909
+#: ../clients/common/nm-meta-setting-desc.c:2900
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' � 0 � %u (�む) ��� %u �間�数���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2912
+#: ../clients/common/nm-meta-setting-desc.c:2903
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' � 0 � %u (�む) �間�数���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2933
+#: ../clients/common/nm-meta-setting-desc.c:2924
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "変更��'%s' � 1 (有効) ���れる��効果��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2988
+#: ../clients/common/nm-meta-setting-desc.c:2979
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅�パーセンテージ��計� 100%% ��ら��れ��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3061
-#: ../clients/common/nm-meta-setting-desc.c:3067
+#: ../clients/common/nm-meta-setting-desc.c:3052
+#: ../clients/common/nm-meta-setting-desc.c:3058
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr ""
 "SIM オペレーター ID��5 ���� 6 ��数字� MCCMNC コード��る必���り"
 "��"
 
-#: ../clients/common/nm-meta-setting-desc.c:3091
+#: ../clients/common/nm-meta-setting-desc.c:3082
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' �有効� IBoIP P_Key ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3114
+#: ../clients/common/nm-meta-setting-desc.c:3105
 msgid "default"
 msgstr "デフォルト"
 
-#: ../clients/common/nm-meta-setting-desc.c:3248
-#: ../clients/common/nm-meta-setting-desc.c:3267
+#: ../clients/common/nm-meta-setting-desc.c:3244
+#: ../clients/common/nm-meta-setting-desc.c:3261
 #, c-format
 msgid "invalid IPv4 address '%s'"
 msgstr "無効� IPv4 アドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3273
-#: ../clients/common/nm-meta-setting-desc.c:3527
+#: ../clients/common/nm-meta-setting-desc.c:3267
+#: ../clients/common/nm-meta-setting-desc.c:3511
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
 msgstr "プロパティー�� DNS サー�ー '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3313
-#: ../clients/common/nm-meta-setting-desc.c:3567
+#: ../clients/common/nm-meta-setting-desc.c:3305
+#: ../clients/common/nm-meta-setting-desc.c:3549
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
 msgstr "プロパティー�� DNS 検索ドメイン '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3350
-#: ../clients/common/nm-meta-setting-desc.c:3604
+#: ../clients/common/nm-meta-setting-desc.c:3342
+#: ../clients/common/nm-meta-setting-desc.c:3586
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
 msgstr "プロパティー�� DNS オプション '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3393
-#: ../clients/common/nm-meta-setting-desc.c:3653
+#: ../clients/common/nm-meta-setting-desc.c:3385
+#: ../clients/common/nm-meta-setting-desc.c:3635
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
 msgstr "プロパティー�� IP アドレス '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3413
-#: ../clients/common/nm-meta-setting-desc.c:3672
+#: ../clients/common/nm-meta-setting-desc.c:3405
+#: ../clients/common/nm-meta-setting-desc.c:3654
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効�ゲートウェイアドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3452
-#: ../clients/common/nm-meta-setting-desc.c:3713
+#: ../clients/common/nm-meta-setting-desc.c:3444
+#: ../clients/common/nm-meta-setting-desc.c:3695
 #, c-format
 msgid "the property doesn't contain route '%s'"
 msgstr "プロパティー��ルート '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3502
-#: ../clients/common/nm-meta-setting-desc.c:3521
+#: ../clients/common/nm-meta-setting-desc.c:3488
+#: ../clients/common/nm-meta-setting-desc.c:3505
 #, c-format
 msgid "invalid IPv6 address '%s'"
 msgstr "無効� IPv6 アドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3731
-#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:364
-#, c-format
-msgid "'%s' is not a number"
-msgstr "'%s' �数字���り��ん"
-
-#: ../clients/common/nm-meta-setting-desc.c:3738
-#, c-format
-msgid "'%s' is not valid; use 0, 1, or 2"
-msgstr "'%s' �無効��。0�1�2 ���れ�を使用������。"
-
-#: ../clients/common/nm-meta-setting-desc.c:3772
+#: ../clients/common/nm-meta-setting-desc.c:3732
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' �有効��ャン�ル���り��ん。<1-13> を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:3832
+#: ../clients/common/nm-meta-setting-desc.c:3793
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
-msgstr ""
+msgstr "有効�構文: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3855
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3816
+#, c-format
 msgid "the property doesn't contain qdisc '%s'"
-msgstr "プロパティー�� UUID '%s' ���れ��ん"
+msgstr "プロパティー�� qdisc '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3908
+#: ../clients/common/nm-meta-setting-desc.c:3870
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
-msgstr ""
+msgstr "有効�構文: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3931
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3893
+#, c-format
 msgid "the property doesn't contain tfilter '%s'"
-msgstr "プロパティー��ルート '%s' ���れ��ん"
+msgstr "プロパティー�� tfilter '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3992
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:3960
+#, c-format
 msgid "the property doesn't contain string '%s'"
-msgstr "プロパティー��マッピング '%s' ���れ��ん"
+msgstr "プロパティー��文字列 '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4065
-#: ../clients/common/nm-meta-setting-desc.c:4137
-#, fuzzy, c-format
+#: ../clients/common/nm-meta-setting-desc.c:4035
+#: ../clients/common/nm-meta-setting-desc.c:4109
+#, c-format
 msgid "the property doesn't contain link watcher '%s'"
-msgstr "プロパティー��ルート '%s' ���れ��ん"
+msgstr "プロパティー��リンクウォッ�ャー '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4228
+#: ../clients/common/nm-meta-setting-desc.c:4215
 #, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
 msgstr ""
 "マッピング�一度� 1 ���行���。最��マッピング (%s) を行���。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4236
+#: ../clients/common/nm-meta-setting-desc.c:4223
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
 msgstr "プロパティー��マッピング '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4244
+#: ../clients/common/nm-meta-setting-desc.c:4231
 msgid "no priority to remove"
 msgstr "削除�る優先度��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4248
+#: ../clients/common/nm-meta-setting-desc.c:4235
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "インデックス '%d' � <0-%d> �範囲内��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4317
+#: ../clients/common/nm-meta-setting-desc.c:4304
 #, c-format
 msgid "'%s' cannot be empty"
 msgstr "'%s' を空白��る�������ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4356
-#: ../clients/common/nm-meta-setting-desc.c:4489
-#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:857
-#: ../libnm-core/nm-setting-wireless.c:869 ../libnm-util/nm-setting-wired.c:646
-#: ../libnm-util/nm-setting-wireless.c:859
-#: ../libnm-util/nm-setting-wireless.c:873
+#: ../clients/common/nm-meta-setting-desc.c:4343
+#: ../clients/common/nm-meta-setting-desc.c:4474
+#: ../libnm-core/nm-setting-wired.c:664 ../libnm-core/nm-setting-wireless.c:859
+#: ../libnm-core/nm-setting-wireless.c:871 ../libnm-util/nm-setting-wired.c:645
+#: ../libnm-util/nm-setting-wireless.c:858
+#: ../libnm-util/nm-setting-wireless.c:872
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' �有効� MAC アドレス���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4362
-#: ../clients/common/nm-meta-setting-desc.c:4495
+#: ../clients/common/nm-meta-setting-desc.c:4349
+#: ../clients/common/nm-meta-setting-desc.c:4480
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
 msgstr "プロパティー�� MAC アドレス '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4380
+#: ../clients/common/nm-meta-setting-desc.c:4367
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "'%s' �無効��。2  文字��� 3 文字�文字列を入力������"
 
-#: ../clients/common/nm-meta-setting-desc.c:4396
+#: ../clients/common/nm-meta-setting-desc.c:4381
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
 msgstr "'%s' 文字列値� 1 - 199 �文字�構��れる必���り��"
 
-#: ../clients/common/nm-meta-setting-desc.c:4428
+#: ../clients/common/nm-meta-setting-desc.c:4413
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4938,24 +4933,24 @@ msgstr ""
 "  option = <value>, option = <value>,...\n"
 "次�有効�オプション��り��: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4462
+#: ../clients/common/nm-meta-setting-desc.c:4447
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' �有効��ャン�ル���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4468
+#: ../clients/common/nm-meta-setting-desc.c:4453
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' �有効��ャン�ル���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4567
-#: ../clients/common/nm-meta-setting-desc.c:4603
-#: ../clients/common/nm-meta-setting-desc.c:4639
+#: ../clients/common/nm-meta-setting-desc.c:4536
+#: ../clients/common/nm-meta-setting-desc.c:4572
+#: ../clients/common/nm-meta-setting-desc.c:4608
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
 msgstr "プロパティー��プロトコル '%s' ���れ��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4676
+#: ../clients/common/nm-meta-setting-desc.c:4645
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
@@ -4964,57 +4959,57 @@ msgstr ""
 "'%s' � %s '%s' �互�性��り��ん。キーを変更�る���切� %s を最��設"
 "定������。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4686
+#: ../clients/common/nm-meta-setting-desc.c:4655
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "WEP キー� '%s' ��る�仮定�����"
 
-#: ../clients/common/nm-meta-setting-desc.c:4691
+#: ../clients/common/nm-meta-setting-desc.c:4660
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "WEP キーインデックス� '%d' �設定�れ��"
 
-#: ../clients/common/nm-meta-setting-desc.c:4730
+#: ../clients/common/nm-meta-setting-desc.c:4699
 #, c-format
 msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr ""
 "'%s' � '%s' タイプ�互�性��り��ん。キーを変更�る��削除������。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4740
+#: ../clients/common/nm-meta-setting-desc.c:4709
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' �有効� PSK ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4772
+#: ../clients/common/nm-meta-setting-desc.c:4741
 msgid "Bonding primary interface [none]"
 msgstr "ボンド�プライマリインターフェース [none]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4779
+#: ../clients/common/nm-meta-setting-desc.c:4748
 msgid "Bonding monitoring mode"
 msgstr "ボンディングモニタリングモード"
 
-#: ../clients/common/nm-meta-setting-desc.c:4788
+#: ../clients/common/nm-meta-setting-desc.c:4757
 msgid "Bonding miimon [100]"
 msgstr "ボンド� miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4796
+#: ../clients/common/nm-meta-setting-desc.c:4765
 msgid "Bonding downdelay [0]"
 msgstr "ボンド� downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4804
+#: ../clients/common/nm-meta-setting-desc.c:4773
 msgid "Bonding updelay [0]"
 msgstr "ボンド� updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4812
+#: ../clients/common/nm-meta-setting-desc.c:4781
 msgid "Bonding arp-interval [0]"
 msgstr "ボンド� arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4820
+#: ../clients/common/nm-meta-setting-desc.c:4789
 msgid "Bonding arp-ip-target [none]"
 msgstr "ボンド� arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4828
+#: ../clients/common/nm-meta-setting-desc.c:4797
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP レート ('slow' ��� 'fast') [slow]"
 
@@ -5022,7 +5017,7 @@ msgstr "LACP レート ('slow' ��� 'fast') [slow]"
 #. * that the actual type is (gboolean(*)(type *)).
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4940
+#: ../clients/common/nm-meta-setting-desc.c:4910
 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 "
@@ -5034,13 +5029,13 @@ msgid ""
 msgstr ""
 "nmcli ���JSON 設定データ��も���設定を�むファイル����両方を���"
 "る�������。設定を�むファイル���を指定��場�����ファイル�読"
-"�込�れ�コンテンツ���プロパティ�置�れ��。\n"
+"�込�れ�コンテンツ���プロパティー�置�れ��。\n"
 "\n"
 "例: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4948
+#: ../clients/common/nm-meta-setting-desc.c:4918
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -5057,16 +5052,39 @@ msgid ""
 "\n"
 "Properties available for the 'arp_ping' include all the ones for 'nsna_ping' "
 "and:\n"
-"  'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n"
+"  'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
 "\n"
 "Properties flagged with a '*' are mandatory.\n"
 "\n"
 "Example:\n"
-"   name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; "
-"name=ethtool,delay-up=3\n"
-msgstr ""
+"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
+msgstr ""
+"キー� teamd �プロパティー�����るディクショナリー�形���リンクウォッ"
+"�ャー�一覧を入力���。ディクショナリー�ペア�書�� key=value ��り�区"
+"切る時��角スペースを使用���。ディクショナリーを区切る時�コンマ ',' を使"
+"用���。ディクショナリー�利用��るキー���必��キー��リンクウォッ"
+"�ャー�タイプ�よ��異�り��。����リンクウォッ�ャー�共通��\"�る"
+"唯一�プロパティー� 'name'* ���れ�指定�るリンクウォッ�ャーを定義��"
+"�。\n"
+"\n"
+"'ethtool' リンクウォッ�ャー�利用��るプロパティー:\n"
+"  'delay-up'�'delay-down'\n"
+"\n"
+"'nsna_ping' リンクウォッ�ャー�利用��るプロパティー:\n"
+"  'init-wait'�'interval'�'missed-max'�'target-host'*\n"
+"\n"
+"'arp_ping' ���'nsna_ping' �全プロパティー�下記プロパティー�利用���"
+"�:\n"
+"  'source-host'*�'validate-active'�'validate-inactive'�'send-always'\n"
+"\n"
+"'*' ����プロパティー�必須��。\n"
+"\n"
+"例:\n"
+"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4999
+#: ../clients/common/nm-meta-setting-desc.c:4968
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5080,7 +5098,7 @@ msgstr ""
 "�。\n"
 "例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5033
+#: ../clients/common/nm-meta-setting-desc.c:5002
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -5094,7 +5112,7 @@ msgstr ""
 "�。\n"
 "例: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5090
+#: ../clients/common/nm-meta-setting-desc.c:5059
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5111,7 +5129,7 @@ msgstr ""
 "�。\n"
 "例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5125
+#: ../clients/common/nm-meta-setting-desc.c:5094
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5128,7 +5146,7 @@ msgstr ""
 "�。\n"
 "例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5152
+#: ../clients/common/nm-meta-setting-desc.c:5121
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -5149,8 +5167,8 @@ msgstr ""
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5169
-#: ../clients/common/nm-meta-setting-desc.c:5187
+#: ../clients/common/nm-meta-setting-desc.c:5138
+#: ../clients/common/nm-meta-setting-desc.c:5156
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -5164,83 +5182,83 @@ msgstr ""
 "������。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5226
-#: ../clients/common/nm-secret-agent-simple.c:234
-#: ../clients/common/nm-secret-agent-simple.c:332
+#: ../clients/common/nm-meta-setting-desc.c:5195
+#: ../clients/common/nm-secret-agent-simple.c:249
+#: ../clients/common/nm-secret-agent-simple.c:347
 #: ../clients/tui/nmt-page-dsl.c:66 ../clients/tui/nmt-page-wifi.c:332
 msgid "Username"
 msgstr "ユーザー�"
 
-#: ../clients/common/nm-meta-setting-desc.c:5232
-#: ../clients/common/nm-meta-setting-desc.c:5416
-#: ../clients/common/nm-meta-setting-desc.c:5699
+#: ../clients/common/nm-meta-setting-desc.c:5201
+#: ../clients/common/nm-meta-setting-desc.c:5385
+#: ../clients/common/nm-meta-setting-desc.c:5676
 #: ../clients/common/nm-meta-setting-desc.c:6323
 msgid "Password [none]"
 msgstr "パスワード [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5278
+#: ../clients/common/nm-meta-setting-desc.c:5247
 msgid "Bluetooth device address"
 msgstr "Bluetooth デ�イスアドレス"
 
-#: ../clients/common/nm-meta-setting-desc.c:5323
-#: ../clients/common/nm-meta-setting-desc.c:5753
-#: ../clients/common/nm-meta-setting-desc.c:7030
-#: ../clients/common/nm-meta-setting-desc.c:7068
-#: ../clients/common/nm-meta-setting-desc.c:7205
+#: ../clients/common/nm-meta-setting-desc.c:5292
+#: ../clients/common/nm-meta-setting-desc.c:5730
+#: ../clients/common/nm-meta-setting-desc.c:7031
+#: ../clients/common/nm-meta-setting-desc.c:7069
+#: ../clients/common/nm-meta-setting-desc.c:7206
 msgid "MAC [none]"
 msgstr "MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5329
+#: ../clients/common/nm-meta-setting-desc.c:5298
 msgid "Enable STP [no]"
 msgstr "STP �有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5335
+#: ../clients/common/nm-meta-setting-desc.c:5304
 msgid "STP priority [32768]"
 msgstr "STP �優先度 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5341
+#: ../clients/common/nm-meta-setting-desc.c:5310
 msgid "Forward delay [15]"
 msgstr "フォワード�延 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5347
+#: ../clients/common/nm-meta-setting-desc.c:5316
 msgid "Hello time [2]"
 msgstr "Hello タイム [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5353
+#: ../clients/common/nm-meta-setting-desc.c:5322
 msgid "Max age [20]"
 msgstr "最大エイジ [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5359
+#: ../clients/common/nm-meta-setting-desc.c:5328
 msgid "MAC address ageing time [300]"
 msgstr "MAC アドレス�エージングタイム [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5365
+#: ../clients/common/nm-meta-setting-desc.c:5334
 msgid "Group forward mask [0]"
 msgstr "グループ��方マスク [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5371
+#: ../clients/common/nm-meta-setting-desc.c:5340
 msgid "Enable IGMP snooping [no]"
 msgstr "IGMP スヌーピング�有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5383
+#: ../clients/common/nm-meta-setting-desc.c:5352
 msgid "Bridge port priority [32]"
 msgstr "ブリッジ�ート�優先度 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5389
+#: ../clients/common/nm-meta-setting-desc.c:5358
 msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジ�ート� STP パスコスト [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5395
+#: ../clients/common/nm-meta-setting-desc.c:5364
 msgid "Hairpin [no]"
 msgstr "ヘアピン [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5410
-#: ../clients/common/nm-meta-setting-desc.c:5693
-#: ../clients/common/nm-meta-setting-desc.c:6920
+#: ../clients/common/nm-meta-setting-desc.c:5379
+#: ../clients/common/nm-meta-setting-desc.c:5670
+#: ../clients/common/nm-meta-setting-desc.c:6921
 msgid "Username [none]"
 msgstr "ユーザー� [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5505
+#: ../clients/common/nm-meta-setting-desc.c:5474
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -5255,7 +5273,7 @@ msgstr ""
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5547
+#: ../clients/common/nm-meta-setting-desc.c:5516
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -5277,7 +5295,7 @@ msgstr ""
 "\n"
 "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5564
+#: ../clients/common/nm-meta-setting-desc.c:5533
 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"
@@ -5292,25 +5310,25 @@ msgstr ""
 "NetworkManager �ヒューリスティックを使用��値を�択��るよ���る場�� "
 "'unknown'\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5710
+#: ../clients/common/nm-meta-setting-desc.c:5687
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5762
-#: ../clients/common/nm-meta-setting-desc.c:7093
-#: ../clients/common/nm-meta-setting-desc.c:7239
+#: ../clients/common/nm-meta-setting-desc.c:5739
+#: ../clients/common/nm-meta-setting-desc.c:7094
+#: ../clients/common/nm-meta-setting-desc.c:7240
 msgid "MTU [auto]"
 msgstr "MTU [auto]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5781
+#: ../clients/common/nm-meta-setting-desc.c:5758
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5790
+#: ../clients/common/nm-meta-setting-desc.c:5767
 msgid "Parent interface [none]"
 msgstr "親インターフェース [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5813
+#: ../clients/common/nm-meta-setting-desc.c:5790
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5320,11 +5338,11 @@ msgstr ""
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5845
+#: ../clients/common/nm-meta-setting-desc.c:5822
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5847
+#: ../clients/common/nm-meta-setting-desc.c:5824
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5338,11 +5356,11 @@ msgstr ""
 "\n"
 "例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5860
+#: ../clients/common/nm-meta-setting-desc.c:5837
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5868
+#: ../clients/common/nm-meta-setting-desc.c:5845
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5365,7 +5383,7 @@ msgstr ""
 "例: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5970
+#: ../clients/common/nm-meta-setting-desc.c:5947
 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 "
@@ -5384,11 +5402,11 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6008
+#: ../clients/common/nm-meta-setting-desc.c:5985
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6010
+#: ../clients/common/nm-meta-setting-desc.c:5987
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5402,11 +5420,11 @@ msgstr ""
 "\n"
 "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6023
+#: ../clients/common/nm-meta-setting-desc.c:6000
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6031
+#: ../clients/common/nm-meta-setting-desc.c:6008
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5431,38 +5449,38 @@ msgstr ""
 "beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:6124
-#: ../clients/common/nm-meta-setting-desc.c:6953
+#: ../clients/common/nm-meta-setting-desc.c:6113
+#: ../clients/common/nm-meta-setting-desc.c:6954
 msgid "Parent device [none]"
 msgstr "親デ�イス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6130
+#: ../clients/common/nm-meta-setting-desc.c:6119
 msgid "Local endpoint [none]"
 msgstr "ローカルエンド�イント [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6137
-#: ../clients/common/nm-meta-setting-desc.c:6973
+#: ../clients/common/nm-meta-setting-desc.c:6126
+#: ../clients/common/nm-meta-setting-desc.c:6974
 msgid "Remote"
 msgstr "リモート"
 
-#: ../clients/common/nm-meta-setting-desc.c:6174
+#: ../clients/common/nm-meta-setting-desc.c:6171
 msgid "MACsec parent device or connection UUID"
 msgstr "MACsec 親デ�イス���接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6195
+#: ../clients/common/nm-meta-setting-desc.c:6192
 msgid "Enable encryption [yes]"
 msgstr "暗�化�有効化 [yes]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6201
-#: ../clients/common/nm-secret-agent-simple.c:523
+#: ../clients/common/nm-meta-setting-desc.c:6198
+#: ../clients/common/nm-secret-agent-simple.c:534
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6211
+#: ../clients/common/nm-meta-setting-desc.c:6208
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6217
+#: ../clients/common/nm-meta-setting-desc.c:6214
 msgid "SCI port [1]"
 msgstr "SCI �ート [1]"
 
@@ -5475,7 +5493,7 @@ msgid "Tap [no]"
 msgstr "Tap [no]"
 
 #: ../clients/common/nm-meta-setting-desc.c:6274
-#: ../clients/common/nm-meta-setting-desc.c:7160
+#: ../clients/common/nm-meta-setting-desc.c:7161
 #: ../clients/tui/nmt-page-wifi.c:224
 msgid "SSID"
 msgstr "SSID"
@@ -5513,80 +5531,80 @@ msgid "PAC script"
 msgstr "PAC スクリプト"
 
 #: ../clients/common/nm-meta-setting-desc.c:6538
-#: ../clients/common/nm-meta-setting-desc.c:6686
+#: ../clients/common/nm-meta-setting-desc.c:6687
 msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6823
+#: ../clients/common/nm-meta-setting-desc.c:6824
 msgid "User ID [none]"
 msgstr "ユーザー ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6829
+#: ../clients/common/nm-meta-setting-desc.c:6830
 msgid "Group ID [none]"
 msgstr "グループ ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6835
+#: ../clients/common/nm-meta-setting-desc.c:6836
 msgid "Enable PI [no]"
 msgstr "PI �有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6841
+#: ../clients/common/nm-meta-setting-desc.c:6842
 msgid "Enable VNET header [no]"
 msgstr "VNET ヘッダー �有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6847
+#: ../clients/common/nm-meta-setting-desc.c:6848
 msgid "Enable multi queue [no]"
 msgstr "複数�キュー�有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6860
+#: ../clients/common/nm-meta-setting-desc.c:6861
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 親デ�イス���接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6867
+#: ../clients/common/nm-meta-setting-desc.c:6868
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6873
+#: ../clients/common/nm-meta-setting-desc.c:6874
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:6883
 msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6892
+#: ../clients/common/nm-meta-setting-desc.c:6893
 msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6960
+#: ../clients/common/nm-meta-setting-desc.c:6961
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6966
+#: ../clients/common/nm-meta-setting-desc.c:6967
 msgid "Local address [none]"
 msgstr "ローカルアドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6979
+#: ../clients/common/nm-meta-setting-desc.c:6980
 msgid "Minimum source port [0]"
 msgstr "最�ソース�ート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6985
+#: ../clients/common/nm-meta-setting-desc.c:6986
 msgid "Maximum source port [0]"
 msgstr "最大ソース�ート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6991
+#: ../clients/common/nm-meta-setting-desc.c:6992
 msgid "Destination port [8472]"
 msgstr "接続先�ート [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7037
+#: ../clients/common/nm-meta-setting-desc.c:7038
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP �"
 
-#: ../clients/common/nm-meta-setting-desc.c:7074
-#: ../clients/common/nm-meta-setting-desc.c:7210
+#: ../clients/common/nm-meta-setting-desc.c:7075
+#: ../clients/common/nm-meta-setting-desc.c:7211
 msgid "Cloned MAC [none]"
-msgstr "クローン��MAC [none]"
+msgstr "クローン�� MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7101
+#: ../clients/common/nm-meta-setting-desc.c:7102
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5596,7 +5614,7 @@ msgstr ""
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7355
+#: ../clients/common/nm-meta-setting-desc.c:7370
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
@@ -5605,181 +5623,181 @@ msgstr ""
 "key�2 ��� passphrase ��。\n"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7515
+#: ../clients/common/nm-meta-setting-desc.c:7538
 msgid "802-1x settings"
 msgstr "802-1x 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7516
-#: ../src/devices/adsl/nm-device-adsl.c:137
+#: ../clients/common/nm-meta-setting-desc.c:7539
+#: ../src/devices/adsl/nm-device-adsl.c:135
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7517
+#: ../clients/common/nm-meta-setting-desc.c:7540
 msgid "bluetooth connection"
 msgstr "bluetooth 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7518
+#: ../clients/common/nm-meta-setting-desc.c:7541
 msgid "Bond device"
 msgstr "Bond デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7519
+#: ../clients/common/nm-meta-setting-desc.c:7542
 msgid "Bridge device"
 msgstr "ブリッジデ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7520
+#: ../clients/common/nm-meta-setting-desc.c:7543
 msgid "Bridge port"
 msgstr "ブリッジ�ート"
 
-#: ../clients/common/nm-meta-setting-desc.c:7521
+#: ../clients/common/nm-meta-setting-desc.c:7544
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA モ�イルブロード�ンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7522
+#: ../clients/common/nm-meta-setting-desc.c:7545
 msgid "General settings"
 msgstr "一般設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7523
+#: ../clients/common/nm-meta-setting-desc.c:7546
 msgid "DCB settings"
 msgstr "DCB 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7524
+#: ../clients/common/nm-meta-setting-desc.c:7547
 msgid "Dummy settings"
 msgstr "ダミー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7525
+#: ../clients/common/nm-meta-setting-desc.c:7548
 msgid "Generic settings"
 msgstr "汎用設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7526
+#: ../clients/common/nm-meta-setting-desc.c:7549
 msgid "GSM mobile broadband connection"
 msgstr "GSM モ�イルブロード�ンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7527
-#: ../src/devices/nm-device-infiniband.c:192
+#: ../clients/common/nm-meta-setting-desc.c:7550
+#: ../src/devices/nm-device-infiniband.c:172
 msgid "InfiniBand connection"
 msgstr "InfiniBand 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7528
+#: ../clients/common/nm-meta-setting-desc.c:7551
 msgid "IPv4 protocol"
 msgstr "IPv4 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:7529
+#: ../clients/common/nm-meta-setting-desc.c:7552
 msgid "IPv6 protocol"
 msgstr "IPv6 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:7530
+#: ../clients/common/nm-meta-setting-desc.c:7553
 msgid "IP-tunnel settings"
 msgstr "IP トン�ル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7531
+#: ../clients/common/nm-meta-setting-desc.c:7554
 msgid "MACsec connection"
 msgstr "MACsec 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7532
+#: ../clients/common/nm-meta-setting-desc.c:7555
 msgid "macvlan connection"
 msgstr "macvlan 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7533
+#: ../clients/common/nm-meta-setting-desc.c:7556
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7534
+#: ../clients/common/nm-meta-setting-desc.c:7557
 msgid "OpenVSwitch bridge settings"
 msgstr "OpenVSwitch ブリッジ設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7535
+#: ../clients/common/nm-meta-setting-desc.c:7558
 msgid "OpenVSwitch interface settings"
 msgstr "OpenVSwitch インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7536
+#: ../clients/common/nm-meta-setting-desc.c:7559
 msgid "OpenVSwitch patch interface settings"
 msgstr "OpenVSwitch パッ�インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7537
+#: ../clients/common/nm-meta-setting-desc.c:7560
 msgid "OpenVSwitch port settings"
 msgstr "OpenVSwitch �ート設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7538
+#: ../clients/common/nm-meta-setting-desc.c:7561
 msgid "PPP settings"
 msgstr "PPP 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7539
+#: ../clients/common/nm-meta-setting-desc.c:7562
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7540
+#: ../clients/common/nm-meta-setting-desc.c:7563
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../clients/common/nm-meta-setting-desc.c:7541
+#: ../clients/common/nm-meta-setting-desc.c:7564
 msgid "Serial settings"
 msgstr "シリアル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7542
+#: ../clients/common/nm-meta-setting-desc.c:7565
 msgid "Traffic controls"
-msgstr ""
+msgstr "トラフィックコントロール"
 
-#: ../clients/common/nm-meta-setting-desc.c:7543
+#: ../clients/common/nm-meta-setting-desc.c:7566
 msgid "Team device"
 msgstr "Team デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7544
+#: ../clients/common/nm-meta-setting-desc.c:7567
 msgid "Team port"
 msgstr "Team �ート"
 
-#: ../clients/common/nm-meta-setting-desc.c:7545
+#: ../clients/common/nm-meta-setting-desc.c:7568
 msgid "Tun device"
 msgstr "TUN デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7546
+#: ../clients/common/nm-meta-setting-desc.c:7569
 msgid "User settings"
 msgstr "ユーザー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7547
-#: ../src/devices/nm-device-vlan.c:394
+#: ../clients/common/nm-meta-setting-desc.c:7570
+#: ../src/devices/nm-device-vlan.c:393
 msgid "VLAN connection"
 msgstr "VLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7548 ../src/nm-manager.c:4277
+#: ../clients/common/nm-meta-setting-desc.c:7571 ../src/nm-manager.c:4929
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7549
-#: ../src/devices/nm-device-vxlan.c:331
+#: ../clients/common/nm-meta-setting-desc.c:7572
+#: ../src/devices/nm-device-vxlan.c:327
 msgid "VXLAN connection"
 msgstr "VXLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7550
+#: ../clients/common/nm-meta-setting-desc.c:7573
 msgid "WiMAX connection"
 msgstr "WiMAX 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7551
+#: ../clients/common/nm-meta-setting-desc.c:7574
 msgid "Wired Ethernet"
 msgstr "有線 Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7552
+#: ../clients/common/nm-meta-setting-desc.c:7575
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7553
+#: ../clients/common/nm-meta-setting-desc.c:7576
 msgid "Wi-Fi security settings"
 msgstr "Wi-Fi セキュリティー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7870
+#: ../clients/common/nm-meta-setting-desc.c:7893
 msgid "name"
 msgstr "��"
 
-#: ../clients/common/nm-polkit-listener.c:212
+#: ../clients/common/nm-polkit-listener.c:239
 msgid "An authentication session is already underway."
 msgstr "�証セッション����実行�れ����。"
 
-#: ../clients/common/nm-secret-agent-simple.c:240
-#: ../clients/common/nm-secret-agent-simple.c:280
-#: ../clients/common/nm-secret-agent-simple.c:308
-#: ../clients/common/nm-secret-agent-simple.c:344
-#: ../clients/common/nm-secret-agent-simple.c:508
-#: ../clients/common/nm-secret-agent-simple.c:540
-#: ../clients/common/nm-secret-agent-simple.c:562
+#: ../clients/common/nm-secret-agent-simple.c:255
+#: ../clients/common/nm-secret-agent-simple.c:295
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/common/nm-secret-agent-simple.c:359
+#: ../clients/common/nm-secret-agent-simple.c:519
+#: ../clients/common/nm-secret-agent-simple.c:551
+#: ../clients/common/nm-secret-agent-simple.c:573
 #: ../clients/common/nm-vpn-helpers.c:119
 #: ../clients/common/nm-vpn-helpers.c:123
 #: ../clients/common/nm-vpn-helpers.c:129
@@ -5789,29 +5807,29 @@ msgstr "�証セッション����実行�れ����。"
 msgid "Password"
 msgstr "パスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:250
+#: ../clients/common/nm-secret-agent-simple.c:265
 msgid "Identity"
 msgstr "ID"
 
-#: ../clients/common/nm-secret-agent-simple.c:256
+#: ../clients/common/nm-secret-agent-simple.c:271
 msgid "Private key password"
 msgstr "プライベートキー�パスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:295
+#: ../clients/common/nm-secret-agent-simple.c:310
 #: ../clients/tui/nmt-page-wifi.c:289
 msgid "Key"
 msgstr "キー"
 
-#: ../clients/common/nm-secret-agent-simple.c:338
+#: ../clients/common/nm-secret-agent-simple.c:353
 #: ../clients/tui/nmt-page-dsl.c:78
 msgid "Service"
 msgstr "サービス"
 
-#: ../clients/common/nm-secret-agent-simple.c:469
+#: ../clients/common/nm-secret-agent-simple.c:484
 msgid "Authentication required by wireless network"
 msgstr "ワイヤレス�ットワーク�必���れる�証"
 
-#: ../clients/common/nm-secret-agent-simple.c:470
+#: ../clients/common/nm-secret-agent-simple.c:485
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -5820,71 +5838,71 @@ msgstr ""
 "ワイヤレス�ットワーク '%s' ��アクセス���パスワード���暗�キー�必�"
 "��。"
 
-#: ../clients/common/nm-secret-agent-simple.c:478
+#: ../clients/common/nm-secret-agent-simple.c:489
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X ��証"
 
-#: ../clients/common/nm-secret-agent-simple.c:479
+#: ../clients/common/nm-secret-agent-simple.c:490
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "有線�ットワーク '%s' ��アクセス��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:484
+#: ../clients/common/nm-secret-agent-simple.c:495
 msgid "DSL authentication"
 msgstr "DSL �証"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:496
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "DSL 接続 '%s' ��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:493
+#: ../clients/common/nm-secret-agent-simple.c:504
 msgid "PIN code required"
 msgstr "PIN コード�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:494
+#: ../clients/common/nm-secret-agent-simple.c:505
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モ�イルブロード�ンド�デ�イス�� PIN コード�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:497
+#: ../clients/common/nm-secret-agent-simple.c:508
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:503
-#: ../clients/common/nm-secret-agent-simple.c:535
-#: ../clients/common/nm-secret-agent-simple.c:557
+#: ../clients/common/nm-secret-agent-simple.c:514
+#: ../clients/common/nm-secret-agent-simple.c:546
+#: ../clients/common/nm-secret-agent-simple.c:568
 msgid "Mobile broadband network password"
 msgstr "モ�イルブロード�ンド��ットワークパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:504
-#: ../clients/common/nm-secret-agent-simple.c:536
-#: ../clients/common/nm-secret-agent-simple.c:558
-#: ../clients/common/nm-secret-agent-simple.c:579
+#: ../clients/common/nm-secret-agent-simple.c:515
+#: ../clients/common/nm-secret-agent-simple.c:547
+#: ../clients/common/nm-secret-agent-simple.c:569
+#: ../clients/common/nm-secret-agent-simple.c:586
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ��接続��パスワード�必���。"
 
-#: ../clients/common/nm-secret-agent-simple.c:517
+#: ../clients/common/nm-secret-agent-simple.c:528
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "MACsec �ットワーク '%s' ��アクセス��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:521
+#: ../clients/common/nm-secret-agent-simple.c:532
 msgid "MACsec PSK authentication"
 msgstr "MACsec PSK �証"
 
-#: ../clients/common/nm-secret-agent-simple.c:529
+#: ../clients/common/nm-secret-agent-simple.c:540
 msgid "MACsec EAP authentication"
 msgstr "MACsec EAP �証"
 
-#: ../clients/common/nm-secret-agent-simple.c:574
+#: ../clients/common/nm-secret-agent-simple.c:581
 msgid "VPN password required"
 msgstr "VPN パスワード�必���"
 
 #: ../clients/common/nm-vpn-helpers.c:48
 #, c-format
 msgid "unknown VPN plugin \"%s\""
-msgstr "�明� VPNプラグイン '%s'"
+msgstr "�明� VPN プラグイン '%s'"
 
 #: ../clients/common/nm-vpn-helpers.c:59
 #, c-format
@@ -5931,11 +5949,11 @@ msgid "Gateway certificate hash"
 msgstr "ゲートウェイ証明書�ッシュ"
 
 #. Generated file. Do not edit.
-#: ../clients/common/settings-docs.c.in:3
+#: ../clients/common/settings-docs.h.in:3
 msgid "Channel on which the mesh network to join is located."
 msgstr "�加�るメッシュ�ットワーク�存在�る�ャン�ル。"
 
-#: ../clients/common/settings-docs.c.in:4
+#: ../clients/common/settings-docs.h.in:4
 msgid ""
 "Anycast DHCP MAC address used when requesting an IP address via DHCP. The "
 "specific anycast address used determines which DHCP server class answers the "
@@ -5945,45 +5963,45 @@ msgstr ""
 "�。使用�れ�エニーキャストアドレス��リクエスト�応答�る DHCP サー�ーク"
 "ラスを判別���。"
 
-#: ../clients/common/settings-docs.c.in:5
-#: ../clients/common/settings-docs.c.in:18
-#: ../clients/common/settings-docs.c.in:30
-#: ../clients/common/settings-docs.c.in:57
-#: ../clients/common/settings-docs.c.in:96
-#: ../clients/common/settings-docs.c.in:105
-#: ../clients/common/settings-docs.c.in:113
-#: ../clients/common/settings-docs.c.in:115
-#: ../clients/common/settings-docs.c.in:124
-#: ../clients/common/settings-docs.c.in:128
-#: ../clients/common/settings-docs.c.in:132
-#: ../clients/common/settings-docs.c.in:148
-#: ../clients/common/settings-docs.c.in:165
-#: ../clients/common/settings-docs.c.in:174
-#: ../clients/common/settings-docs.c.in:175
-#: ../clients/common/settings-docs.c.in:180
-#: ../clients/common/settings-docs.c.in:192
-#: ../clients/common/settings-docs.c.in:202
-#: ../clients/common/settings-docs.c.in:225
-#: ../clients/common/settings-docs.c.in:246
-#: ../clients/common/settings-docs.c.in:257
-#: ../clients/common/settings-docs.c.in:262
-#: ../clients/common/settings-docs.c.in:268
-#: ../clients/common/settings-docs.c.in:271
-#: ../clients/common/settings-docs.c.in:273
-#: ../clients/common/settings-docs.c.in:279
-#: ../clients/common/settings-docs.c.in:289
-#: ../clients/common/settings-docs.c.in:301
-#: ../clients/common/settings-docs.c.in:309
-#: ../clients/common/settings-docs.c.in:314
-#: ../clients/common/settings-docs.c.in:318
-#: ../clients/common/settings-docs.c.in:325
-#: ../clients/common/settings-docs.c.in:342
-#: ../clients/common/settings-docs.c.in:349
-#: ../clients/common/settings-docs.c.in:354
-#: ../clients/common/settings-docs.c.in:359
-#: ../clients/common/settings-docs.c.in:362
-#: ../clients/common/settings-docs.c.in:376
-#: ../clients/common/settings-docs.c.in:386
+#: ../clients/common/settings-docs.h.in:5
+#: ../clients/common/settings-docs.h.in:18
+#: ../clients/common/settings-docs.h.in:32
+#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:392
 msgid ""
 "The setting's name, which uniquely identifies the setting within the "
 "connection.  Each setting type has a name unique to that type, for example "
@@ -5992,11 +6010,11 @@ msgstr ""
 "設定���。接続�設定を一��識別���。設定タイプ�����タイプ�一��"
 "�� (\"ppp\"�\"wireless\"�\"wired\" ��) ��れ�れ設定�れ��。"
 
-#: ../clients/common/settings-docs.c.in:6
+#: ../clients/common/settings-docs.h.in:6
 msgid "SSID of the mesh network to join."
 msgstr "�加�るメッシュ�ットワーク� SSID。"
 
-#: ../clients/common/settings-docs.c.in:7
+#: ../clients/common/settings-docs.h.in:7
 msgid ""
 "802.11 frequency band of the network.  One of \"a\" for 5GHz 802.11a or \"bg"
 "\" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to "
@@ -6012,7 +6030,7 @@ msgstr ""
 "関連付�を行���ん。��設定��特定�ドライ�ー機能��存������ドラ"
 "イ�ー�利用��る�����り��ん。"
 
-#: ../clients/common/settings-docs.c.in:8
+#: ../clients/common/settings-docs.h.in:8
 msgid ""
 "If specified, directs the device to only associate with the given access "
 "point.  This capability is highly driver dependent and not supported by all "
@@ -6024,7 +6042,7 @@ msgstr ""
 "��ん。注記: ��プロパティー��Ad-Hoc �ットワーク�作�時�使用�れる "
 "BSSID を制御���今後も��ら�制御�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:9
+#: ../clients/common/settings-docs.h.in:9
 msgid ""
 "Wireless channel to use for the Wi-Fi connection.  The device will only join "
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
@@ -6036,8 +6054,7 @@ msgstr ""
 "�ル数��ンド間��複�る�����プロパティー��も� \"band\" プロパ"
 "ティーを設定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:10
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:10
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6065,8 +6082,8 @@ msgstr ""
 "\" �設定�れ��。D-Bus �������フィールド� \"assigned-mac-address\" "
 "���廃止予定� \"cloned-mac-address\" ���表示�れ��。"
 
-#: ../clients/common/settings-docs.c.in:11
-#: ../clients/common/settings-docs.c.in:92
+#: ../clients/common/settings-docs.h.in:11
+#: ../clients/common/settings-docs.h.in:94
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6115,21 +6132,26 @@ msgstr ""
 "化�れ� MAC アドレスを作���ランダム�ローカル���グロー�ル�管��れ�"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:12
+#: ../clients/common/settings-docs.h.in:12
 msgid ""
 "If TRUE, indicates this network is a non-broadcasting network that hides its "
 "SSID.  In this case various workarounds may take place, such as probe-"
 "scanning the SSID for more reliable network discovery.  However, these "
 "workarounds expose inherent insecurities with hidden SSID networks, and thus "
-"hidden SSID networks should be used with caution."
+"hidden SSID networks should be used with caution. Note that marking the "
+"network as hidden may be a privacy issue for you, as the explicit probe-"
+"scans may be distinctly recognizable on the air."
 msgstr ""
 "TRUE �場�����ットワーク���� SSID を�表示��る�ブロードキャスト�"
 "�ットワーク��る��を示�����。��場���信頼性�より高��ットワー"
 "ク検出� SSID をプローブスキャン�る���様々�回�策を�択����。��"
-"���表示� SSID �ットワークを使用���継承�れ��安定を公開�る����"
-"公開� SSID �ットワーク�注���使用�る必���り��。"
+"���れら�回�策���表示� SSID �ットワークを使用��継承�れ��安定を"
+"公開�る����表示� SSID �ットワークを使用�る際�注��必���。明示的"
+"�プローブスキャン��ブロードキャスト�際����り��識��る�能性��る"
+"����ットワークを�表示�マーキング�る����プライ�シー��題��り得"
+"る���注�������。"
 
-#: ../clients/common/settings-docs.c.in:13
+#: ../clients/common/settings-docs.h.in:13
 msgid ""
 "If specified, this connection will only apply to the Wi-Fi device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -6139,7 +6161,7 @@ msgstr ""
 "用�れ��。��プロパティー�デ�イス� MAC アドレスを変更���ん (MAC ス"
 "プーフィング)。"
 
-#: ../clients/common/settings-docs.c.in:14
+#: ../clients/common/settings-docs.h.in:14
 msgid ""
 "A list of permanent MAC addresses of Wi-Fi devices to which this connection "
 "should never apply.  Each MAC address should be given in the standard hex-"
@@ -6149,7 +6171,7 @@ msgstr ""
 "MAC アドレス��標準� 16 進数�コロン (\"00:11:22:33:44:55\" ��) �指定�"
 "る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:15
+#: ../clients/common/settings-docs.h.in:15
 msgid ""
 "One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the "
 "user has set a global default to randomize and the supplicant supports "
@@ -6165,7 +6187,7 @@ msgstr ""
 "(2) (MAC アドレス�常�ランダム化�れ��) ���れ�。��プロパティー� "
 "'cloned-mac-address' ��推奨��り��。�推奨: 1"
 
-#: ../clients/common/settings-docs.c.in:16
+#: ../clients/common/settings-docs.h.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
@@ -6173,8 +6195,8 @@ msgstr ""
 "Wi-Fi �ットワークモード; \"infrastructure\"�\"adhoc\"���� \"ap\" ���"
 "れ�。空白��る��インフラストラク�ャー�推測�れ��。"
 
-#: ../clients/common/settings-docs.c.in:17
-#: ../clients/common/settings-docs.c.in:95
+#: ../clients/common/settings-docs.h.in:17
+#: ../clients/common/settings-docs.h.in:97
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
@@ -6182,7 +6204,7 @@ msgstr ""
 "ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定より大��パ"
 "ケット��複数� Ethernet フレーム�分割�れ��。"
 
-#: ../clients/common/settings-docs.c.in:19
+#: ../clients/common/settings-docs.h.in:19
 msgid ""
 "One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power "
 "saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power "
@@ -6196,7 +6218,7 @@ msgstr ""
 "�)���� NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (グロー�ル�設定��値"
 "を使用) ���れ�。��他�����値�予約�れ��。"
 
-#: ../clients/common/settings-docs.c.in:20
+#: ../clients/common/settings-docs.h.in:20
 msgid ""
 "If non-zero, directs the device to only use the specified bitrate for "
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
@@ -6208,7 +6230,7 @@ msgstr ""
 "��プロパティー��ドライ�ー�高��存���的�ビットレート�設定を���"
 "�デ�イス�サ�ート�る�����り��ん。"
 
-#: ../clients/common/settings-docs.c.in:21
+#: ../clients/common/settings-docs.h.in:21
 msgid ""
 "A list of BSSIDs (each BSSID formatted as a MAC address like "
 "\"00:11:22:33:44:55\") that have been detected as part of the Wi-Fi "
@@ -6222,11 +6244,11 @@ msgstr ""
 "NetworkManager � BSSID 一覧を�映���。��変更�より�プロパティー��存"
 "�れ���り��。"
 
-#: ../clients/common/settings-docs.c.in:22
+#: ../clients/common/settings-docs.h.in:22
 msgid "SSID of the Wi-Fi network. Must be specified."
 msgstr "Wi-Fi � SSID。指定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:23
+#: ../clients/common/settings-docs.h.in:23
 msgid ""
 "If non-zero, directs the device to use the specified transmit power. Units "
 "are dBm.  This property is highly driver dependent and not all devices "
@@ -6236,7 +6258,36 @@ msgstr ""
 "��。��プロパティー��ドライ�ー�大���存���り�����デ�イス�"
 "�的�信電力をサ�ート���る���り��ん。"
 
-#: ../clients/common/settings-docs.c.in:24
+#: ../clients/common/settings-docs.h.in:24
+msgid ""
+"The NMSettingWirelessWakeOnWLan options to enable. Not all devices support "
+"all options. May be any combination of NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY "
+"(0x2), NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) or the special values "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (to use global settings) and "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (to disable management of "
+"Wake-on-LAN in NetworkManager)."
+msgstr ""
+"有効��る NMSettingWirelessWakeOnWLan オプション。����デ�イス�����"
+"オプションをサ�ート�る�����り��ん。\n"
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY (0x2), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT (0x4), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC (0x8), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE (0x10), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST (0x20), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE (0x40), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE (0x80), "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP (0x100) ���特別�値 "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (0x1) (グロー�ル設定を使用) �よ� "
+"NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (0x8000) (NetworkManager � Wake-on-"
+"LAN �管�を無効) �ら組����る�������。"
+
+#: ../clients/common/settings-docs.h.in:25
 msgid ""
 "When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
 "802.11 authentication algorithm required by the AP here.  One of \"open\" "
@@ -6251,7 +6302,28 @@ msgstr ""
 "auth-alg = \"leap\") を使用���る場���\"leap-username\" プロパティー� "
 "\"leap-password\" プロパティーを指定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:25
+#: ../clients/common/settings-docs.h.in:26
+msgid ""
+"Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the "
+"connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use "
+"global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) "
+"(disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS "
+"if the supplicant and the access point support it) or "
+"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not "
+"supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and "
+"no global default is set, FILS will be optionally enabled."
+msgstr ""
+"接続用�ファーストイニシャルリンク設定 (802.11ai) を有効��る必���る��"
+"��を示���。  NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (グロー�ル�"
+"デフォルト値を使用�る)�NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (FILS"
+"を無効��る)�NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (サプリカント�"
+"よ�アクセス�イント�サ�ート���る場�� FILS を有効��る) ��� "
+"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (FILS を有効���サ�ート�れ"
+"����場��失敗�る) ���れ�を有効����。  "
+"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) を設定��グロー�ルデフォルト"
+"�設定�れ����場���FILS �任��有効��り��。"
+
+#: ../clients/common/settings-docs.h.in:27
 msgid ""
 "A list of group/broadcast encryption algorithms which prevents connections "
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
@@ -6264,7 +6336,7 @@ msgstr ""
 "\"wep40\"�\"wep104\"�\"tkip\"���� \"ccmp\" ���れ���る������"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:26
+#: ../clients/common/settings-docs.h.in:28
 msgid ""
 "Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
 "\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure "
@@ -6276,7 +6348,7 @@ msgstr ""
 "� \"wpa-eap\" (WPA-Enterprise) ���れ���り��。��プロパティー��セ"
 "キュリティーを使用�る���� Wi-Fi 接続�設定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:27
+#: ../clients/common/settings-docs.h.in:29
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
@@ -6284,11 +6356,11 @@ msgstr ""
 "レガシー LEAP 接続�ログインパスワード (key-mgmt = \"ieee8021x\" �よ� auth-"
 "alg = \"leap\")。"
 
-#: ../clients/common/settings-docs.c.in:28
+#: ../clients/common/settings-docs.h.in:30
 msgid "Flags indicating how to handle the \"leap-password\" property."
 msgstr "\"leap-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:29
+#: ../clients/common/settings-docs.h.in:31
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
@@ -6296,7 +6368,7 @@ msgstr ""
 "レガシー LEAP 接続�ログインユーザー� (key-mgmt = \"ieee8021x\" �よ� auth-"
 "alg = \"leap\")。"
 
-#: ../clients/common/settings-docs.c.in:31
+#: ../clients/common/settings-docs.h.in:33
 msgid ""
 "A list of pairwise encryption algorithms which prevents connections to Wi-Fi "
 "networks that do not utilize one of the algorithms in the list. For maximum "
@@ -6308,7 +6380,7 @@ msgstr ""
 "ロパティーを空����。リストエレメント��れ�れ \"tkip\" ��� \"ccmp\" "
 "�����。"
 
-#: ../clients/common/settings-docs.c.in:32
+#: ../clients/common/settings-docs.h.in:34
 msgid ""
 "Indicates whether Protected Management Frames (802.11w) must be enabled for "
 "the connection.  One of NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (use "
@@ -6329,7 +6401,7 @@ msgstr ""
 "NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) を設定��グロー�ルデフォルト�"
 "設定�れ����場���PMF �任��有効��り��。"
 
-#: ../clients/common/settings-docs.c.in:33
+#: ../clients/common/settings-docs.h.in:35
 msgid ""
 "List of strings specifying the allowed WPA protocol versions to use. Each "
 "element may be one \"wpa\" (allow WPA) or \"rsn\" (allow WPA2/RSN).  If not "
@@ -6339,7 +6411,7 @@ msgstr ""
 "\" (WPA を許�) ��� \"rsn\" (WPA2/RSN を許�) ��り��。指定�����"
 "��WPA 接続� RSN 接続�両方�許��れ��。"
 
-#: ../clients/common/settings-docs.c.in:34
+#: ../clients/common/settings-docs.h.in:36
 msgid ""
 "Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must "
 "contain only hexadecimal characters and is interpreted as a hexadecimal WPA "
@@ -6355,11 +6427,11 @@ msgstr ""
 "ワーク�接続�る際�使用�れる実際� WPA-PSK を�得�る����ッシュ化�れ�"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:35
+#: ../clients/common/settings-docs.h.in:37
 msgid "Flags indicating how to handle the \"psk\" property."
 msgstr "\"psk\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:36
+#: ../clients/common/settings-docs.h.in:38
 msgid ""
 "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
 "and \"wep-key3\" properties."
@@ -6367,7 +6439,7 @@ msgstr ""
 "プロパティー \"wep-key0\"�\"wep-key1\"�\"wep-key2\"��よ� \"wep-key3\" �"
 "処�方法を示�フラグ"
 
-#: ../clients/common/settings-docs.c.in:37
+#: ../clients/common/settings-docs.h.in:39
 msgid ""
 "Controls the interpretation of WEP keys.  Allowed values are "
 "NM_WEP_KEY_TYPE_KEY (1), in which case the key is either a 10- or 26-"
@@ -6382,7 +6454,7 @@ msgstr ""
 "�������場���パスフレーズを文字列����供��実際� WEP キーを�得"
 "�る MD5 メソッドを使用���ッシュ化�れ��。"
 
-#: ../clients/common/settings-docs.c.in:38
+#: ../clients/common/settings-docs.h.in:40
 msgid ""
 "Index 0 WEP key.  This is the WEP key used in most networks.  See the \"wep-"
 "key-type\" property for a description of how this key is interpreted."
@@ -6390,7 +6462,7 @@ msgstr ""
 "インデックス 0 � WEP キー。�� WEP キー��多��ットワーク�使用�れ���"
 "�。キー�解釈方法��\"wep-key-type\" プロパティーを�照������。"
 
-#: ../clients/common/settings-docs.c.in:39
+#: ../clients/common/settings-docs.h.in:41
 msgid ""
 "Index 1 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6399,7 +6471,7 @@ msgstr ""
 "�れ����ん。キー�解釈方法��\"wep-key-type\" プロパティーを�照����"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:40
+#: ../clients/common/settings-docs.h.in:42
 msgid ""
 "Index 2 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6408,7 +6480,7 @@ msgstr ""
 "�れ����ん。キー�解釈方法��\"wep-key-type\" プロパティーを�照����"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:41
+#: ../clients/common/settings-docs.h.in:43
 msgid ""
 "Index 3 WEP key.  This WEP index is not used by most networks.  See the "
 "\"wep-key-type\" property for a description of how this key is interpreted."
@@ -6417,7 +6489,7 @@ msgstr ""
 "�れ����ん。キー�解釈方法��\"wep-key-type\" プロパティーを�照����"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:42
+#: ../clients/common/settings-docs.h.in:44
 msgid ""
 "When static WEP is used (ie, key-mgmt = \"none\") and a non-default WEP key "
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
@@ -6429,7 +6501,7 @@ msgstr ""
 "��。有効�値� 0 (デフォルトキー) �ら 3 ��。コンシューマー�アクセス�イ"
 "ント (Linksys WRT54G ��) �キー番�� 1 - 4 ��り��。"
 
-#: ../clients/common/settings-docs.c.in:43
+#: ../clients/common/settings-docs.h.in:45
 msgid ""
 "Flags indicating which mode of WPS is to be used if any. There's little "
 "point in changing the default setting as NetworkManager will automatically "
@@ -6442,7 +6514,7 @@ msgstr ""
 "NetworkManager  �自動的�決定�る���デフォルト設定�変更を�る利点���"
 "ん��り��ん。��プロパティー�値を 1 ��る� WPS を無効�����。"
 
-#: ../clients/common/settings-docs.c.in:44
+#: ../clients/common/settings-docs.h.in:46
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
@@ -6451,7 +6523,7 @@ msgstr ""
 "�証サー�ー�表示�れる証明書� altSubjectName �一致�る文字列�一覧。��"
 "一覧�空�場���サー�ー証明書� altSubjectName �検証�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:45
+#: ../clients/common/settings-docs.h.in:47
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
@@ -6461,7 +6533,7 @@ msgstr ""
 "イデンティティをサ�ート�る EAP タイプ��暗�化�����アイデンティティ�"
 "��使用����。"
 
-#: ../clients/common/settings-docs.c.in:46
+#: ../clients/common/settings-docs.h.in:48
 msgid ""
 "A timeout for the authentication. Zero means the global default; if the "
 "global default is not set, the authentication timeout is 25 seconds."
@@ -6469,7 +6541,7 @@ msgstr ""
 "�証�タイムアウト。ゼロ�グロー�ル�デフォルト��り��。グロー�ルデフォ"
 "ルトを設定������証�タイムアウト� 25 秒��り��。"
 
-#: ../clients/common/settings-docs.c.in:47
+#: ../clients/common/settings-docs.h.in:49
 msgid ""
 "Contains the CA certificate if used by the EAP method specified in the \"eap"
 "\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6486,12 +6558,12 @@ msgstr ""
 "2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) ブロブスキームを使用"
 "�る場�����プロパティーを�証明書� DER エンコードデータ�設定�る必��"
 "�り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://"
-"\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�る証"
-"明書�設定�る必���り��。��プロパティー��EAP メソッド� CA 証明書を"
-"サ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能"
-"��る���推奨�れ��ん。"
+"\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フルパス�指定�る証明"
+"書�設定�る必���り��。��プロパティー��EAP メソッド� CA 証明書をサ"
+"�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能�"
+"�る���推奨�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:48
+#: ../clients/common/settings-docs.h.in:50
 msgid ""
 "The password used to access the CA certificate stored in \"ca-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
@@ -6501,11 +6573,11 @@ msgstr ""
 "スワード。証明書��ログインを�求�る PKCS#11 トークン��存�れ�場����"
 "�用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:49
+#: ../clients/common/settings-docs.h.in:51
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
 msgstr "\"ca-cert-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:50
+#: ../clients/common/settings-docs.h.in:52
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
@@ -6515,7 +6587,7 @@ msgstr ""
 "�れる PEM フォーマット��� DER フォーマット�証明書を�むディレクトリー�"
 "� UTF-8 エンコードパス。"
 
-#: ../clients/common/settings-docs.c.in:51
+#: ../clients/common/settings-docs.h.in:53
 msgid ""
 "Contains the client certificate if used by the EAP method specified in the "
 "\"eap\" property. Certificate data is specified using a \"scheme\"; two are "
@@ -6533,7 +6605,7 @@ msgstr ""
 "\"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指"
 "定�る証明書�設定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:52
+#: ../clients/common/settings-docs.h.in:54
 msgid ""
 "The password used to access the client certificate stored in \"client-cert\" "
 "property. Only makes sense if the certificate is stored on a PKCS#11 token "
@@ -6543,11 +6615,11 @@ msgstr ""
 "�使用�れるパスワード。証明書��ログインを�求�る PKCS#11 トークン��存�"
 "れ�場�����用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:53
+#: ../clients/common/settings-docs.h.in:55
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
 msgstr "\"client-cert-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:54
+#: ../clients/common/settings-docs.h.in:56
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6560,7 +6632,7 @@ msgstr ""
 "る dNSName �見��る����制約�満��れ��。dNSName 値�表示�れ����"
 "��制約����サフィックス一致比較を使用�� SubjectName CN を照����。"
 
-#: ../clients/common/settings-docs.c.in:55
+#: ../clients/common/settings-docs.h.in:57
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6574,7 +6646,7 @@ msgstr ""
 "��り��。�能�組����������wpa_supplicant ドキュメントを�照��"
 "����。"
 
-#: ../clients/common/settings-docs.c.in:56
+#: ../clients/common/settings-docs.h.in:58
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
@@ -6582,11 +6654,11 @@ msgstr ""
 "EAP �証方法�アイデンティティ文字列。�����ユーザー�ユーザー����ロ"
 "グイン���り��。"
 
-#: ../clients/common/settings-docs.c.in:58
+#: ../clients/common/settings-docs.h.in:60
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr "EAP-FAST � PAC を�む UTF-8 エンコーディングファイルパス。"
 
-#: ../clients/common/settings-docs.c.in:59
+#: ../clients/common/settings-docs.h.in:61
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
@@ -6596,15 +6668,15 @@ msgstr ""
 "ティー� \"password-raw\" プロパティー�両方を指定�る��\"password\" �優先"
 "�れ��。"
 
-#: ../clients/common/settings-docs.c.in:60
-#: ../clients/common/settings-docs.c.in:107
-#: ../clients/common/settings-docs.c.in:135
-#: ../clients/common/settings-docs.c.in:184
-#: ../clients/common/settings-docs.c.in:304
+#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:310
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "\"password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:61
+#: ../clients/common/settings-docs.h.in:63
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
@@ -6616,11 +6688,11 @@ msgstr ""
 "\"password-raw\" プロパティー�両方を指定�る��\"password\" �優先�れ�"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:62
+#: ../clients/common/settings-docs.h.in:64
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr "\"password-raw\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:63
+#: ../clients/common/settings-docs.h.in:65
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6635,7 +6707,7 @@ msgstr ""
 "TLS オプション� tls_disable_tlsv1_x 設定�マッピング�れ��。詳細��"
 "wpa_supplicant ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.c.in:64
+#: ../clients/common/settings-docs.h.in:66
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6651,7 +6723,7 @@ msgstr ""
 "ジョニングを許�) ��り��。詳細��wpa_supplicant ドキュメントを�照���"
 "���。"
 
-#: ../clients/common/settings-docs.c.in:65
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
@@ -6663,7 +6735,7 @@ msgstr ""
 "��。\"1\" �設定�る��新�� PEAP ラベルを使用�る��を強制���。詳細"
 "��wpa_supplicant ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.c.in:66
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -6677,7 +6749,7 @@ msgstr ""
 "PEAP �ージョンを使用�るよ��強制�る必���り��。���������プロ"
 "パティーを \"0\" ��� \"1\" �設定����� PEAP �ージョンを強制���。"
 
-#: ../clients/common/settings-docs.c.in:67
+#: ../clients/common/settings-docs.h.in:69
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
@@ -6688,7 +6760,7 @@ msgstr ""
 "一致��文字列�一覧。��一覧�空�場���サー�ー証明書� altSubjectName "
 "�検証�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:68
+#: ../clients/common/settings-docs.h.in:70
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6704,7 +6776,7 @@ msgstr ""
 "��る���� \"phase 2\" �内部メソッド�特別�パラメーター�必���。詳細"
 "� wpa_supplicant ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.c.in:69
+#: ../clients/common/settings-docs.h.in:71
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6713,14 +6785,14 @@ msgid ""
 "requires specific parameters for successful authentication; see the "
 "wpa_supplicant documentation for more details."
 msgstr ""
-"内部 TLS トン�ルを使用�る EAP メソッドを \"eap\" プロパティ�指定��場�"
-"��利用�能� \"phase 2\" 内�� EAP �証方法を指定���。一般的�広�られ"
-"��る EAP ベース� \"phase 2\"方法��\"md5\"�\"mschapv2\"�\"otp\"�\"gtc"
+"内部 TLS トン�ルを使用�る EAP メソッドを \"eap\" プロパティー�指定��場�"
+"��利用�能� \"phase 2\" 内� EAP �証方法を指定���。一般的�広�られ�"
+"�る EAP ベース� \"phase 2\" 方法��\"md5\"�\"mschapv2\"�\"otp\"�\"gtc"
 "\"��よ� \"tls\" ��。�証を�功��る���\"phase 2\" 内��方法�特別�"
 "パラメーター�必���。詳細� wpa_supplicant ドキュメントを�照�����"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:70
+#: ../clients/common/settings-docs.h.in:72
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6744,7 +6816,7 @@ msgstr ""
 "�も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨"
 "�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:71
+#: ../clients/common/settings-docs.h.in:73
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
@@ -6754,12 +6826,12 @@ msgstr ""
 "セス�る��使用�れるパスワード。��証明書��ログ�必�� PKCS#11 トークン"
 "��存�れ��る場���用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:72
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr "\"phase2-ca-cert-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:73
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
@@ -6769,7 +6841,7 @@ msgstr ""
 "追加�れ� PEM フォーマット��� DER  フォーマット�証明書��存�れ��る"
 "ディレクトリー�� UTF-8  エンコード�パス。"
 
-#: ../clients/common/settings-docs.c.in:74
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6793,7 +6865,7 @@ msgstr ""
 "�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る�"
 "��推奨�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:75
+#: ../clients/common/settings-docs.h.in:77
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
@@ -6803,12 +6875,12 @@ msgstr ""
 "明書�アクセス�る��使用�れるパスワード。��証明書��ログイン�必�� "
 "PKCS#11 トークン��存�れ��る場�����用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:76
+#: ../clients/common/settings-docs.h.in:78
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr "\"phase2-client-cert-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:77
+#: ../clients/common/settings-docs.h.in:79
 msgid ""
 "Constraint for server domain name. If set, this FQDN is used as a suffix "
 "match requirement for dNSName element(s) of the certificate presented by the "
@@ -6823,7 +6895,7 @@ msgstr ""
 "dNSName 値�表示�れ������制約����サフィックス一致比較を使用�� "
 "SubjectName CN を照����。"
 
-#: ../clients/common/settings-docs.c.in:78
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -6857,7 +6929,7 @@ msgstr ""
 "��\"phase2-private-key-password\" プロパティーを�PKCS#12 秘密��よ�証明"
 "書を復��るパスワード�設定�る必���る����。"
 
-#: ../clients/common/settings-docs.c.in:79
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
@@ -6867,12 +6939,12 @@ msgstr ""
 "��\"phase2-private-key\" プロパティー�指定�� \"phase 2\" 秘密��複��"
 "使用�れるパスワード。"
 
-#: ../clients/common/settings-docs.c.in:80
+#: ../clients/common/settings-docs.h.in:82
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr "\"phase2-private-key-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:81
+#: ../clients/common/settings-docs.h.in:83
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -6886,16 +6958,16 @@ msgstr ""
 "�推奨�れ��代�り� NMSetting8021x:phase2-domain-suffix-match �使用�れ�"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:82
+#: ../clients/common/settings-docs.h.in:84
 msgid "PIN used for EAP authentication methods."
 msgstr "EAP �証方法�使用�れる PIN"
 
-#: ../clients/common/settings-docs.c.in:83
-#: ../clients/common/settings-docs.c.in:186
+#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:189
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "\"pin\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:84
+#: ../clients/common/settings-docs.h.in:86
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -6935,7 +7007,7 @@ msgstr ""
 "��常�秘密�パスワード�暗�化��暗�化�れ����秘密�データ���証ア"
 "クセス�行�れ��よ���る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:85
+#: ../clients/common/settings-docs.h.in:87
 msgid ""
 "The password used to decrypt the private key specified in the \"private-key"
 "\" property when the private key either uses the path scheme, or if the "
@@ -6945,11 +7017,11 @@ msgstr ""
 "場���\"private-key\" プロパティー�指定��秘密��復�化�使用�れるパス"
 "ワード。"
 
-#: ../clients/common/settings-docs.c.in:86
+#: ../clients/common/settings-docs.h.in:88
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr "\"private-key-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:87
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -6962,7 +7034,7 @@ msgstr ""
 "リティー����護�れ�������使用��推奨��り�代�り� "
 "NMSetting8021x:domain-suffix-match �使用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:88
+#: ../clients/common/settings-docs.h.in:90
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -6982,18 +7054,25 @@ msgstr ""
 "ティー�代�り�上書��れ�� (wpa_supplicant � ca_cert オプション�よ�  "
 "ca_cert2 オプションを設定���)。"
 
-#: ../clients/common/settings-docs.c.in:89
+#: ../clients/common/settings-docs.h.in:91
 msgid ""
-"If TRUE, enforce auto-negotiation of port speed and duplex mode.  If FALSE, "
-"\"speed\" and \"duplex\" properties should be both set or link configuration "
-"will be skipped."
+"When TRUE, enforce auto-negotiation of speed and duplex mode. If \"speed\" "
+"and \"duplex\" properties are both specified, only that single mode will be "
+"advertised and accepted during the link auto-negotiation process: this works "
+"only for BASE-T 802.3 specifications and is useful for enforcing gigabits "
+"modes, as in these cases link negotiation is mandatory. When FALSE, \"speed"
+"\" and \"duplex\" properties should be both set or link configuration will "
+"be skipped."
 msgstr ""
-"TRUE �場����ート速度�二�モード�自動�ゴシエーションを強制���。"
-"FALSE �場���\"speed\" プロパティー� \"duplex\" プロパティー�両方設定�"
-"れる��リンク設定�スキップ�れ��。"
+"TRUE �場���速度�二�モード�自動�ゴシエーションを強制���。\"speed\" "
+"プロパティー� \"duplex\" プロパティー�両方�も指定�れる場��リンク自動�"
+"ゴシエーション�プロセス�間�1 ��モード���アド�タイズ�れ���入れら"
+"れ��。�れ��BASE-T 802.3 仕様���機能��ギガビットモード�強制�役立�"
+"��。���ら���よ��ケース���リンク�ゴシエーション�必須��ら�"
+"�。FALSE �場���\"speed\" プロパティー� \"duplex\" プロパティー�両方�"
+"も設定�れる��リンク設定�スキップ�れ��。"
 
-#: ../clients/common/settings-docs.c.in:90
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -7023,20 +7102,33 @@ msgstr ""
 "�。D-Bus �������フィールド� \"assigned-mac-address\" ���廃止予定"
 "� \"cloned-mac-address\" ���表示�れ��。"
 
-#: ../clients/common/settings-docs.c.in:91
-msgid ""
-"Can be specified only when \"auto-negotiate\" is \"off\". In that case, "
-"statically configures the device to use that specified duplex mode, either "
-"\"half\" or \"full\". Must be set together with the \"speed\" property if "
-"specified. Before specifying a duplex mode be sure your device supports it."
-msgstr ""
-"\"auto-negotiate\" � \"off\" �����る場���り指定����。��場��"
-"デ�イス��デュプレックスモード \"half\" ��� \"full\" を指定��デ�イス"
-"を使用�るよ���的�設定���。指定�る場�� \"speed\" プロパティーも設定"
-"�る必���り��。デュプレックスモードを指定�る���デ�イス���モード"
-"をサ�ート�る��を確�������。"
-
-#: ../clients/common/settings-docs.c.in:93
+#: ../clients/common/settings-docs.h.in:93
+msgid ""
+"When a value is set, either \"half\" or \"full\", configures the device to "
+"use the specified duplex mode. If \"auto-negotiate\" is \"yes\" the "
+"specified duplex mode will be the only one advertised during link "
+"negotiation: this works only for BASE-T 802.3 specifications and is useful "
+"for enforcing gigabits modes, as in these cases link negotiation is "
+"mandatory. If the value is unset (the default), the link configuration will "
+"be either skipped (if \"auto-negotiate\" is \"no\", the default) or will be "
+"auto-negotiated (if \"auto-negotiate\" is \"yes\") and the local device will "
+"advertise all the supported duplex modes. Must be set together with the "
+"\"speed\" property if specified. Before specifying a duplex mode be sure "
+"your device supports it."
+msgstr ""
+"値� \"half\" ��� \"full\" ���れ��設定�れ��る場��指定�れ�二�"
+"モードを使用�るよ��デ�イスを設定���。\"auto-negotiate\" � \"yes\" �"
+"場��リンク�ゴシエーション�間�アド�タイズ�れる���指定�れ�二�モー"
+"ド����り��。�れ��BASE-T 802.3 仕様���機能��ギガビットモード�強"
+"制�役立���。���ら���よ��ケース���リンク�ゴシエーション�必須"
+"��ら��。値�設定�れ����場� (デフォルト)�リンク�設定�スキップ�れ"
+"る� (\"auto-negotiate\" � \"no\" �場� = デフォルト)�自動�ゴシエート�れ"
+"る� (\"auto-negotiate\" � \"yes\" �場�) ���れ���り�ローカルデ�イ"
+"ス�����サ�ート�れる二�モードをアド�タイズ���。指定�る場�� "
+"\"speed\" プロパティーも設定�る必���り��。二�モードを指定�る���デ"
+"�イス���モードをサ�ート�る��を確�������。"
+
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -7046,7 +7138,7 @@ msgstr ""
 "�用�れ��。��プロパティー��デ�イス� MAC アドレスを変更���ん (MAC "
 "スプーフィング)。"
 
-#: ../clients/common/settings-docs.c.in:94
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
@@ -7056,7 +7148,7 @@ msgstr ""
 "Ethernet デ�イス���用�れ��ん。 � MAC アドレス��標準� 16 進数�コロ"
 "ン (00:11:22:33:44:55) �指定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:97
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
@@ -7068,7 +7160,7 @@ msgstr ""
 "�ット)���� \"mii\" (メディア独立インターフェース) ���れ���り��。"
 "デ�イス��ート�タイプを 1 ���サ�ート�る場����設定�無視�れ��。"
 
-#: ../clients/common/settings-docs.c.in:98
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
@@ -7077,7 +7169,7 @@ msgstr ""
 "���り��。s390 システム�利用�能������仮想�ットワークデ�イス��"
 "り��。"
 
-#: ../clients/common/settings-docs.c.in:99
+#: ../clients/common/settings-docs.h.in:101
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
@@ -7089,7 +7181,7 @@ msgstr ""
 "\"�\"layer2\"�\"portname\"�\"protocol\" ���キー�使用����。キー��"
 "��英数字�� (��り [a-zA-Z0-9]) �使用����。"
 
-#: ../clients/common/settings-docs.c.in:100
+#: ../clients/common/settings-docs.h.in:102
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -7105,21 +7197,33 @@ msgstr ""
 "文字列���れ��る必���り��文字列���16 進数�ピリオド (.) ��を使"
 "用����。"
 
-#: ../clients/common/settings-docs.c.in:101
-msgid ""
-"Can be set to a value greater than zero only when \"auto-negotiate\" is \"off"
-"\". In that case, statically configures the device to use that specified "
-"speed. In Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex"
-"\" property when non-zero. Before specifying a speed value be sure your "
-"device supports it."
-msgstr ""
-"\"auto-negotiate\" � \"off\" �����る場���り�ゼロより大��値を設定"
-"����。��場��デ�イス�指定��速度を使用�るよ����的�設定��"
-"�。Mbit/s �� 100 == 100Mbit/s ��。ゼロ以外��る場���\"duplex\" プロ"
-"パティーも設定�る必���り��。速度値を指定�る���デ�イス���速度を"
-"サ�ート�る��を確�������。"
-
-#: ../clients/common/settings-docs.c.in:102
+#: ../clients/common/settings-docs.h.in:103
+msgid ""
+"When a value grater than 0 is set, configures the device to use the "
+"specified speed. If \"auto-negotiate\" is \"yes\" the specified speed will "
+"be the only one advertised during link negotiation: this works only for BASE-"
+"T 802.3 specifications and is useful for enforcing gigabit speeds, as in "
+"this case link negotiation is mandatory. If the value is unset (0, the "
+"default), the link configuration will be either skipped (if \"auto-negotiate"
+"\" is \"no\", the default) or will be auto-negotiated (if \"auto-negotiate\" "
+"is \"yes\") and the local device will advertise all the supported speeds. In "
+"Mbit/s, ie 100 == 100Mbit/s. Must be set together with the \"duplex\" "
+"property when non-zero. Before specifying a speed value be sure your device "
+"supports it."
+msgstr ""
+"0 より大��値�設定�れ��る場��指定�れ�速度を使用�るよ��デ�イスを"
+"設定���。\"auto-negotiate\" � \"yes\" �場��リンク�ゴシエーション�間"
+"�アド�タイズ�れる���指定�れ�速度����り��。�れ��BASE-T 802.3 "
+"仕様���機能��ギガビット速度�強制�役立���。���ら���ケース�"
+"��リンク�ゴシエーション�必須��ら��。値�設定�れ����場� (0 = デ"
+"フォルト)�リンク�設定�スキップ�れる� (\"auto-negotiate\" � \"no\" �場"
+"� = デフォルト)�自動�ゴシエート�れる� (\"auto-negotiate\" � \"yes\" �"
+"場�) ���れ���り�ローカルデ�イス�����サ�ート�れる速度をアド�"
+"タイズ���。Mbit/s �� 100 == 100Mbit/s ��。ゼロ以外��る場�"
+"��\"duplex\" プロパティーも設定�る必���り��。速度値を指定�る���デ"
+"�イス���速度をサ�ート�る��を確�������。"
+
+#: ../clients/common/settings-docs.h.in:104
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -7141,7 +7245,7 @@ msgstr ""
 "設定を使用) �よ� NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) "
 "(NetworkManager � Wake-on-LAN �管�を無効) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.c.in:103
+#: ../clients/common/settings-docs.h.in:105
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
@@ -7151,36 +7255,36 @@ msgstr ""
 "Ethernet � MAC アドレス���表示�れ��。NULL ��る��パスワード��求�"
 "れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:104
+#: ../clients/common/settings-docs.h.in:106
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr "ADSL 接続�カプセル化。\"vcmux\" ��� \"llc\" �����。"
 
-#: ../clients/common/settings-docs.c.in:106
+#: ../clients/common/settings-docs.h.in:108
 msgid "Password used to authenticate with the ADSL service."
 msgstr "ADSL サービス���証�使用�るパスワード。"
 
-#: ../clients/common/settings-docs.c.in:108
+#: ../clients/common/settings-docs.h.in:110
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr ""
 "ADSL 接続プロトコル。\"pppoa\"�\"pppoe\"���� \"ipoatm\" �����。"
 
-#: ../clients/common/settings-docs.c.in:109
+#: ../clients/common/settings-docs.h.in:111
 msgid "Username used to authenticate with the ADSL service."
 msgstr "ユーザー���ADSL サービス���証�使用�れ���。"
 
-#: ../clients/common/settings-docs.c.in:110
+#: ../clients/common/settings-docs.h.in:112
 msgid "VCI of ADSL connection"
 msgstr "ADSL 接続� VCI"
 
-#: ../clients/common/settings-docs.c.in:111
+#: ../clients/common/settings-docs.h.in:113
 msgid "VPI of ADSL connection"
 msgstr "ADSL 接続� VPI"
 
-#: ../clients/common/settings-docs.c.in:112
+#: ../clients/common/settings-docs.h.in:114
 msgid "The Bluetooth address of the device."
 msgstr "デ�イス� Bluetooth アドレス。"
 
-#: ../clients/common/settings-docs.c.in:114
+#: ../clients/common/settings-docs.h.in:116
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
@@ -7189,7 +7293,7 @@ msgstr ""
 "キング接続�場�) ��� \"panu\" (パーソナルエリア�ットワーキング接続�場"
 "�) ���れ�。"
 
-#: ../clients/common/settings-docs.c.in:116
+#: ../clients/common/settings-docs.h.in:118
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
@@ -7199,15 +7303,15 @@ msgstr ""
 "�値�両方を文字列��る必���り��。オプション���英数字�� (��り "
 "[a-zA-Z0-9]) を使用����。"
 
-#: ../clients/common/settings-docs.c.in:117
+#: ../clients/common/settings-docs.h.in:119
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "Ethernet MAC アドレス�エージングタイム (秒��)。"
 
-#: ../clients/common/settings-docs.c.in:118
+#: ../clients/common/settings-docs.h.in:120
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr "スパニングツリープロトコル (STP) フォワード�延 (秒��)。"
 
-#: ../clients/common/settings-docs.c.in:119
+#: ../clients/common/settings-docs.h.in:121
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -7221,12 +7325,11 @@ msgstr ""
 "対応���。マスク��STP�MAC �止フレーム��よ� LACP �使用�れ��る�"
 "��ビット 0�1���� 2 を設定�る�������ん。"
 
-#: ../clients/common/settings-docs.c.in:120
+#: ../clients/common/settings-docs.h.in:122
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "スパニングツリープロトコル (STP) Hello タイム (秒��)。"
 
-#: ../clients/common/settings-docs.c.in:121
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:123
 msgid ""
 "If specified, the MAC address of bridge. When creating a new bridge, this "
 "MAC address will be set. If this field is left unspecified, the \"ethernet."
@@ -7240,12 +7343,13 @@ msgstr ""
 "mac-address\" �代�り��照�れ��期 MAC アドレス�生��れ�"
 "�。\"ethernet.cloned-mac-address\" ��ブリッジ�アクティベート中��ブリッ"
 "ジ� MAC アドレスを上書����。��������プロパティー�廃止�れ��。"
+"�推奨: 1"
 
-#: ../clients/common/settings-docs.c.in:122
+#: ../clients/common/settings-docs.h.in:124
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "スパニングツリープロトコル (STP) メッセージ最大期間 (秒��)。"
 
-#: ../clients/common/settings-docs.c.in:123
+#: ../clients/common/settings-docs.h.in:125
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -7255,7 +7359,7 @@ msgstr ""
 "�一致�原因�スヌーピング�自動的�無効�����る場�����矛盾�解決�"
 "る����機能�有効��ら������り��。"
 
-#: ../clients/common/settings-docs.c.in:125
+#: ../clients/common/settings-docs.h.in:127
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
@@ -7265,14 +7369,14 @@ msgstr ""
 "����方�優先度�高��り��。優先度�一番低�ブリッジ� root ブリッジ�"
 "�択�れ��。"
 
-#: ../clients/common/settings-docs.c.in:126
+#: ../clients/common/settings-docs.h.in:128
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr ""
 "��ブリッジ�����スパニングツリープロトコル (STP) �有効����を制御�"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:127
+#: ../clients/common/settings-docs.h.in:129
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
@@ -7280,19 +7384,19 @@ msgstr ""
 "�ート� \"hairpin mode\" を有効���無効����。��モード���フレーム"
 "を������ート�らフレームを�り戻��������。"
 
-#: ../clients/common/settings-docs.c.in:129
+#: ../clients/common/settings-docs.h.in:131
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr ""
 "���ートを経由���宛先�スパニングツリープロトコル (STP) �ートコスト。"
 
-#: ../clients/common/settings-docs.c.in:130
+#: ../clients/common/settings-docs.h.in:132
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr "��ブリッジ�ート�スパニングツリープロトコル (STP) �優先度。"
 
-#: ../clients/common/settings-docs.c.in:131
-#: ../clients/common/settings-docs.c.in:179
-#: ../clients/common/settings-docs.c.in:191
+#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
@@ -7300,7 +7404,7 @@ msgstr ""
 "ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定��サイズよ"
 "り大��パケット��複数�フレーム�分割�れ��。"
 
-#: ../clients/common/settings-docs.c.in:133
+#: ../clients/common/settings-docs.h.in:135
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
@@ -7310,8 +7414,8 @@ msgstr ""
 "���れ�指定���。指定���場���必��応��デフォルト�番� (#777) "
 "�使用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:134
-#: ../clients/common/settings-docs.c.in:183
+#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:186
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
@@ -7321,8 +7425,8 @@ msgstr ""
 "ダー�パスワードを必����������るパスワードも許��れ��。パスワー"
 "ド�必��場������指定���。"
 
-#: ../clients/common/settings-docs.c.in:136
-#: ../clients/common/settings-docs.c.in:189
+#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
@@ -7332,7 +7436,7 @@ msgstr ""
 "ダー�ユーザー�を必����������るユーザー�も許��れ��。ユーザー"
 "��必��場������指定���。"
 
-#: ../clients/common/settings-docs.c.in:137
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
@@ -7344,18 +7448,22 @@ msgstr ""
 "���証を 3 回�試行��ら接続�失敗���。�在��れ� 802-1x �証����"
 "用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:138
+#: ../clients/common/settings-docs.h.in:140
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
 "automatically activate the connection, FALSE to require manual intervention "
-"to activate the connection."
+"to activate the connection. Note that autoconnect is not implemented for VPN "
+"profiles. See \"secondaries\" as an alternative to automatically connect VPN "
+"profiles."
 msgstr ""
 "接続�リソース�利用�能�場���NetworkManager �接続を自動的�行����"
 "�。TRUE �場��接続�自動的�有効��り�FALSE �場��手作業�接続を有効化"
-"���。"
+"���。自動接続� VPN プロファイル��実装�れ��点�注�������。VPN "
+"プロファイル を自動接続�る別�方法��� \"secondaries\" を�照�����"
+"�。"
 
-#: ../clients/common/settings-docs.c.in:139
+#: ../clients/common/settings-docs.h.in:141
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
@@ -7364,7 +7472,7 @@ msgstr ""
 "自動接続�優先度。接続を自動接続�設定�る��優先度�高�接続�優先�れ�"
 "�。デフォルト� 0 ��。数値�高��る��優先度�高��り��。"
 
-#: ../clients/common/settings-docs.c.in:140
+#: ../clients/common/settings-docs.h.in:142
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -7377,24 +7485,27 @@ msgstr ""
 "定�る��1 度��有効����ら自動接続をブロック���。タイムアウト後�"
 "NetworkManager ��度�自動接続を試行�る���注�������。"
 
-#: ../clients/common/settings-docs.c.in:141
+#: ../clients/common/settings-docs.h.in:143
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
-"for master connections. The permitted values are: 0: leave slave connections "
-"untouched, 1: activate all the slave connections with this connection, -1: "
-"default. If -1 (default) is set, global connection.autoconnect-slaves is "
-"read to determine the real value. If it is default as well, this fallbacks "
-"to 0."
+"for master connections. The properties \"autoconnect\", \"autoconnect-"
+"priority\" and \"autoconnect-retries\" are unrelated to this setting. The "
+"permitted values are: 0: leave slave connections untouched, 1: activate all "
+"the slave connections with this connection, -1: default. If -1 (default) is "
+"set, global connection.autoconnect-slaves is read to determine the real "
+"value. If it is default as well, this fallbacks to 0."
 msgstr ""
 "NetworkManager ���接続を有効���場�����接続�スレーブ�自動的�起動"
-"�る����。�れ��マスター接続���有効��。利用��る値��0: スレーブ"
-"接続�変更����1: ��接続�スレーブ接続を���アクティブ��る�-1: デ"
-"フォルト��り��。-1 (デフォルト) �設定�れ��る場���グロー�ル� "
-"connection.autoconnect-slaves �読�込�れ�値�決定���。�れもデフォルト"
-"�設定�れ��る場���0 �フォール�ック�れ��。"
+"�る����。�れ��マスター接続���有効��。\"autoconnect"
+"\"�\"autoconnect-priority\"��よ� \"autoconnect-retries\" ��プロパティー"
+"����設定��関係�り��ん。利用��る値��0: スレーブ接続�変更����"
+"1: ��接続�スレーブ接続を���アクティブ��る�-1: デフォルト��り�"
+"�。-1 (デフォルト) �設定�れ��る場���グロー�ル� connection."
+"autoconnect-slaves �読�込�れ�値�決定���。�れもデフォルト�設定�れ�"
+"�る場���0 �フォール�ック�れ��。"
 
-#: ../clients/common/settings-docs.c.in:142
+#: ../clients/common/settings-docs.h.in:144
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
@@ -7402,14 +7513,14 @@ msgstr ""
 "ゼロより大���る��タイムアウト�到��る��IP ゲートウェイ� ping �応答"
 "�る���IP アドレス��延��功���。"
 
-#: ../clients/common/settings-docs.c.in:143
+#: ../clients/common/settings-docs.h.in:145
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr ""
 "\"Work Wi-Fi\" や \"T-Mobile 3G\" ���人�判別��る接続�一�識別�。"
 
-#: ../clients/common/settings-docs.c.in:144
+#: ../clients/common/settings-docs.h.in:146
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -7430,15 +7541,31 @@ msgstr ""
 "使用��るインターフェースを制���インターフェース�を変更��り�順番を変"
 "更�る��誤��インターフェース�接続��用�れる場���り��。"
 
-#: ../clients/common/settings-docs.c.in:145
+#: ../clients/common/settings-docs.h.in:147
 msgid "Whether LLDP is enabled for the connection."
 msgstr "��接続�対�� LLDP �有効��る����。"
 
-#: ../clients/common/settings-docs.c.in:146
+#: ../clients/common/settings-docs.h.in:148
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "マスター接続�マスターデ�イス��� UUID �インターフェース�。"
 
-#: ../clients/common/settings-docs.c.in:147
+#: ../clients/common/settings-docs.h.in:149
+msgid ""
+"Whether mDNS is enabled for the connection. The permitted values are: yes: "
+"register hostname and resolving for the connection, no: disable mDNS for the "
+"interface, resolve: do not register hostname but allow resolving of mDNS "
+"host names. When updating this property on a currently activated connection, "
+"the change takes effect immediately. This feature requires a plugin which "
+"supports mDNS. One such plugin is dns-systemd-resolved."
+msgstr ""
+"mDNS �接続�実行�れる����。利用��る値��yes: ホスト�を登録��接続"
+"を解決�no: インターフェース�対�� mDNS を無効��る �resolve: ホスト�を"
+"登録��� mDNS ホスト��解決を許��� 3 ���り��。�在有効�接続���"
+"プロパティーをアップデート�る��変更����有効��り��。��機能���"
+"mDNS をサ�ート�るプラグイン�必���。�����dns-systemd-resolved ��"
+"��。"
+
+#: ../clients/common/settings-docs.h.in:150
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
@@ -7446,7 +7573,7 @@ msgstr ""
 "接続を測定�る����。�在有効�接続���プロパティーをアップデート�る"
 "��変更����有効��り��。"
 
-#: ../clients/common/settings-docs.c.in:149
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -7466,13 +7593,13 @@ msgstr ""
 "�。�れ�空���������指定��ユーザー� 1 人�アクティブ�セッション"
 "�ログイン��場���り�接続�アクティブ��り��。�エントリー�形�� "
 "\"[type]:[id]:[reserved]\" (���� \"user:dcbw:blah\") ��り��。��他�"
-"値�無視�れ�今後�使用����予約�れ��。�時点���ユーザー\" � "
-"[type] ���利用����。[id] ����権���照�るユーザー���\":\" 文"
-"字�使用����ん。表示�れ��る [reserved] 情報�無視�れ�今後使用�れる"
-"���予約�れる必���り��。[type]�[id]��よ� [reserved] ����有効"
-"� UTF-8 ��る必���り��。"
+"値�無視�れ�今後�使用����予約�れ��。�時点���\"user\" � [type] "
+"���利用����。[id] ����権���照�るユーザー���\":\" 文字�使用"
+"����ん。表示�れ��る [reserved] 情報�無視�れ�今後使用�れる���予"
+"約�れる必���り��。[type]�[id]��よ� [reserved] ����有効� UTF-8 "
+"��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:150
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
@@ -7481,7 +7608,7 @@ msgstr ""
 "正��権����供�れ�設定サービス� D-Bus インターフェースを使用��接続�"
 "修正��る場�� FALSE�接続�読��り専用�修正����場�� TRUE。"
 
-#: ../clients/common/settings-docs.c.in:151
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
@@ -7489,7 +7616,7 @@ msgstr ""
 "ベース接続自身�有効��る�有効��る接続� UUID リスト。�時点��VPN 接続"
 "���サ�ート�れ��。"
 
-#: ../clients/common/settings-docs.c.in:152
+#: ../clients/common/settings-docs.h.in:155
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, \"bond"
 "\"), or NULL if this connection is not a slave."
@@ -7497,48 +7624,64 @@ msgstr ""
 "��スレーブ�マスター接続 (\"bond\" ��) �デ�イスタイプ�設定�。��接続"
 "�スレーブ����場�� NULL。"
 
-#: ../clients/common/settings-docs.c.in:153
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
-"Token to generate stable IDs for the connection. The stable-id is used for "
+"This represents the identity of the connection used for various purposes. It "
+"allows to configure multiple profiles to share the identity. Also, the "
+"stable-id can contain placeholders that are substituted dynamically and "
+"deterministically depending on the context. The stable-id is used for "
 "generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-"
 "privacy. It is also used to seed the generated cloned MAC address for "
-"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. Note "
-"that also the interface name of the activating connection and a per-host "
-"secret key is included into the address generation so that the same stable-"
-"id on different hosts/devices yields different addresses. If the value is "
-"unset, an ID unique for the connection is used. Specifying a stable-id "
-"allows multiple connections to generate the same addresses. Another use is "
-"to generate IDs at runtime via dynamic substitutions. The '$' character is "
+"ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is "
+"also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to "
+"derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that "
+"depending on the context where it is used, other parameters are also seeded "
+"into the generation algorithm. For example, a per-host key is commonly also "
+"included, so that different systems end up generating different IDs. Or with "
+"ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so "
+"that different interfaces yield different addresses. The '$' character is "
 "treated special to perform dynamic substitutions at runtime. Currently "
-"supported are \"${CONNECTION}\", \"${BOOT}\", \"${RANDOM}\". These "
-"effectively create unique IDs per-connection, per-boot, or every time. Any "
-"unrecognized patterns following '$' are treated verbatim, however are "
-"reserved for future use. You are thus advised to avoid '$' or escape it as "
-"\"$$\". For example, set it to \"${CONNECTION}/${BOOT}\" to create a unique "
-"id for this connection that changes with every reboot. Note that two "
-"connections only use the same effective id if their stable-id is also "
-"identical before performing dynamic substitutions."
-msgstr ""
-"接続�対�る安定�� ID を生��るトークン。stable-id ��ipv6.addr-gen-"
-"mode=stable-privacy � IPv6 �安定��プライベートアドレスを生��る��使用"
-"�れ��。���ethernet.cloned-mac-address=stable �よ� wifi.cloned-mac-"
-"address=stable �対��生��れ�クローン� MAC アドレス�シード�も使用�れ"
-"��。有効�接続�インターフェイス����ホスト�秘密�をアドレス生��追加"
-"�る��別�ホスト���デ�イス��� stable-id �別�アドレス�生��れ�"
-"�。値を設定�����接続�固有� ID を使用���。stable-id を指定�る��"
-"複数�接続���アドレスを生�����。��他�も�動的置��よりランタイム"
-"時� ID を生����。�� '$' 文字��ランタイム時�動的置�を実行�る��使"
-"用�れ��。�在サ�ート�れ��る�"
-"��\"${CONNECTION}\"�\"${BOOT}\"�\"${RANDOM}\" ��。�れ���接続時��"
-"起動時����毎回�固有� ID を効果的�作����。'$' �続��識�れ���"
-"�パターン�文字通り�扱�れ����今後使用�れる���予約�れ��。��"
-"�����れ� '$' を使用��������エスケープ文字 \"$$\" ���使用�る"
-"���推奨�れ��。������れを \"${CONNECTION}/${BOOT}\" ��る��シス"
-"テムを�起動�る���変更�る��接続�対��固有� ID を作����。2 ��"
-"接続��動的置�を行��� stable-id も��場���有効��� ID ��を使用�"
-"る���注�������。"
+"supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". "
+"These effectively create unique IDs per-connection, per-device, per-boot, or "
+"every time. Note that \"${DEVICE}\" corresponds the the interface name of "
+"the device. Any unrecognized patterns following '$' are treated verbatim, "
+"however are reserved for future use. You are thus advised to avoid '$' or "
+"escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-"
+"${DEVICE}\" to create a unique id for this connection that changes with "
+"every reboot and differs depending on the interface where the profile "
+"activates. If the value is unset, a global connection default is consulted. "
+"If the value is still unset, the default is similar to \"${CONNECTION}\" and "
+"uses a unique, fixed ID for the connection."
+msgstr ""
+"�れ��様々�目的�使用�れる接続�アイデンティティーを示�����。�れ�"
+"より�複数�プロファイルを設定��アイデンティティーを共有����。���"
+"stable-id ���コンテキスト�よ��動的�よ�確定的�置��れるプレースホル"
+"ダーを�む�������。stable-id ��ipv6.addr-gen-mode=stable-privacy � "
+"IPv6 �安定��プライベートアドレスを生��る��使用�れ��。���"
+"ethernet.cloned-mac-address=stable �よ� wifi.cloned-mac-address=stable �対"
+"��生��れるクローン� MAC アドレス�シード�も使用�れ��。�れ��ipv4."
+"dhcp-client-id=stable � DHCP クライアント識別����も使用�れ�ipv6.dhcp-"
+"duid=stable-[llt,ll,uuid] を使�� DHCP DUID を�得�る場��も使用�れ��。"
+"使用�れる場所�コンテキスト�よ����他�パラメーターも生�アルゴリズム�"
+"シード�れる���注�������。�����別々�システム�別々� ID を生"
+"��る�果��るよ���一般�ホスト���キーも��れ����。����ipv6."
+"addr-gen-mode=stable-privacy ���別々�インターフェース�別々�アドレスを生"
+"��るよ��デ�イス�も��れ����。�� '$' 文字��ランタイム時�動的置"
+"�を実行�る��使用�れ��。�在サ�ート�れ��る�"
+"��\"${CONNECTION}\"�\"${DEVICE}\"�\"${BOOT}\"�\"${RANDOM}\" ��。�れ"
+"���接続時��デ�イス����起動時����毎回�固有� ID を効果的�作�"
+"���。\"${DEVICE}\"��デ�イス�インターフェース��対応���る点�注��"
+"�����。'$' �続��識�れ����パターン�文字通り�扱�れ����今後"
+"使用�れる���予約�れ��。�������れ� '$' を使用��������エ"
+"スケープ文字 \"$$\" ���使用�る���推奨�れ��。������れを "
+"\"${CONNECTION}-${BOOT}-${DEVICE}\" �設定�る����接続�対��固有� ID "
+"を作����。�れ��システムを�起動�る���変更�れ�プロファイル�アク"
+"ティベート�れるインターフェース�応��異������。値�設定�れ����"
+"場���グロー�ル�接続デフォルトを�考����。引�続�値�設定�れ��場"
+"���デフォルト� \"${CONNECTION}\" �類似��接続�固有�固定 ID を使用��"
+"�。"
 
-#: ../clients/common/settings-docs.c.in:154
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -7552,7 +7695,7 @@ msgstr ""
 "�プロパティー�読�込�������使用�れ�� (��プロパティー��変更�"
 "�存�れ��ん)。"
 
-#: ../clients/common/settings-docs.c.in:155
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -7566,7 +7709,7 @@ msgstr ""
 "存���接続�����設定�タイプ� (��り \"vpn\"�\"bridge\" ��) ���"
 "れる必���り��。"
 
-#: ../clients/common/settings-docs.c.in:156
+#: ../clients/common/settings-docs.h.in:159
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7586,7 +7729,7 @@ msgstr ""
 "\"2815492f-7e56-435e-b2e9-246bd7cdc664\" (16 進数�文字� \"-\" �����れ"
 "る) ��り��。"
 
-#: ../clients/common/settings-docs.c.in:157
+#: ../clients/common/settings-docs.h.in:160
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -7599,7 +7742,7 @@ msgstr ""
 "��ファイアウォール�定義��デフォルトゾーン�設定�れ��。�在アクティブ"
 "�接続���プロパティーをアップデート�る��接続����有効��り��。"
 
-#: ../clients/common/settings-docs.c.in:158
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7609,13 +7752,13 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ"
 "� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.c.in:159
+#: ../clients/common/settings-docs.h.in:162
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr ""
 "FCoE コントローラーモード; \"fabric\" (デフォルト) ��� \"vn2vn\" ���れ"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:160
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
@@ -7625,7 +7768,7 @@ msgstr ""
 "�優先度)。\"app-fcoe-flags\" プロパティー�� NM_SETTING_DCB_FLAG_ENABLE "
 "(0x1) フラグを�む場���り使用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:161
+#: ../clients/common/settings-docs.h.in:164
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7635,7 +7778,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ"
 "� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.c.in:162
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
@@ -7645,7 +7788,7 @@ msgstr ""
 "優先度)。\"app-fip-flags\" プロパティー� NM_SETTING_DCB_FLAG_ENABLE (0x1) フ"
 "ラグを��る場���り使用���。"
 
-#: ../clients/common/settings-docs.c.in:163
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7655,7 +7798,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ"
 "� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.c.in:164
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -7665,7 +7808,7 @@ msgstr ""
 "�優先度)。\"app-iscsi-flags\" プロパティー� NM_SETTING_DCB_FLAG_ENABLE "
 "(0x1) フラグを追加�る場���り使用���。"
 
-#: ../clients/common/settings-docs.c.in:166
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -7678,7 +7821,7 @@ msgstr ""
 "用�るパーセンテージを示���。グループ内��計を 100% ��る必���り�"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:167
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
@@ -7687,7 +7830,7 @@ msgstr ""
 "8 個�ブール値��列。�列�インデックス��ユーザー�優先度 (0 - 7) �対応�"
 "��。値��対応�る優先度��優先度��止を�信�る����を示���。"
 
-#: ../clients/common/settings-docs.c.in:168
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7697,7 +7840,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ"
 "� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.c.in:169
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -7708,7 +7851,7 @@ msgstr ""
 "���。値����グループ�割り当�られ�リンク帯域幅�パーセンテージを示�"
 "��。使用��る値� 0 - 100 ���計を 100 パーセント��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:170
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -7718,7 +7861,7 @@ msgstr ""
 "NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ"
 "� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.c.in:171
+#: ../clients/common/settings-docs.h.in:174
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
@@ -7728,7 +7871,7 @@ msgstr ""
 "�。値�優先度グループ ID を示���。使用��る優先度グループ ID �値� 0 - "
 "7 ��15 ��る�無制�グループ��り��。"
 
-#: ../clients/common/settings-docs.c.in:172
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
@@ -7738,7 +7881,7 @@ msgstr ""
 "�。値����優先度を割り当��グループ�割り当�られ�����帯域幅を��"
 "�優先度�使用�る����を示���。"
 
-#: ../clients/common/settings-docs.c.in:173
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
@@ -7747,7 +7890,7 @@ msgstr ""
 "8 uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。"
 "値��優先度�マッピング�れるトラフィッククラス (0 - 7) を示�����。"
 
-#: ../clients/common/settings-docs.c.in:176
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -7764,7 +7907,7 @@ msgstr ""
 "ロード�ンドプラン�対��正�� APN を使用�る�������。APN �文字列"
 "��a- z � 0 - 9 ���使用���GSM 03.60 セクション 14.9 �準拠���。"
 
-#: ../clients/common/settings-docs.c.in:177
+#: ../clients/common/settings-docs.h.in:180
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
@@ -7773,7 +7916,7 @@ msgstr ""
 "(WWAN 管�サービス�指定�れ�よ��) ��接続��用�れるデ�イス�一�識別"
 "�。�れを指定�る��接続��指定��デ�イス����用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:178
+#: ../clients/common/settings-docs.h.in:181
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
@@ -7781,7 +7924,7 @@ msgstr ""
 "TRUE ��る��ホーム�ットワーク��接続����能��り��。ローミング�ッ"
 "トワーク��接続�作��れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:181
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -7794,7 +7937,7 @@ msgstr ""
 "��デ�イス�登録を強制�よ�����。�れ��デ�イス�ローミングを阻止�"
 "る���使用����。 �れ以外��ローミングを直接制御�る�������ん。"
 
-#: ../clients/common/settings-docs.c.in:182
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "Number to dial when establishing a PPP data session with the GSM-based "
 "mobile broadband network.  Many modems do not require PPP for connections to "
@@ -7806,7 +7949,7 @@ msgstr ""
 "����プロパティー�空�������NetworkManager �自動的��切�設定を�"
 "択�るよ���る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:185
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
@@ -7815,7 +7958,7 @@ msgstr ""
 "PIN � SIM �ロック�れ�場�����他��作を行���アンロック�る必���"
 "り��。��� PIN を指定�る��デ�イス��作��能��り��。"
 
-#: ../clients/common/settings-docs.c.in:187
+#: ../clients/common/settings-docs.h.in:190
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -7826,7 +7969,7 @@ msgstr ""
 "一�識別�。�れを指定�る��接続��\"device-id\" �も許��れ��るデ�イ"
 "ス��用�れ��。�れ���指定��識別��一致�る SIM カード���れ��。"
 
-#: ../clients/common/settings-docs.c.in:188
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -7838,7 +7981,7 @@ msgstr ""
 "\" �よ� \"sim-id\" �許��れるデ�イス�も�用�れ��。�れ���指定��"
 "オペレーター�ら�供�れる SIM カード���れ��。"
 
-#: ../clients/common/settings-docs.c.in:190
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
@@ -7848,7 +7991,7 @@ msgstr ""
 "用�れ��。��プロパティー�デ�イス� MAC アドレスを変更���ん (MAC ス"
 "プーフィング)。"
 
-#: ../clients/common/settings-docs.c.in:193
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
@@ -7859,7 +8002,7 @@ msgstr ""
 "署���整数��。\"完全メン�ーシップ\" � P_Key �場�����高ビット�設"
 "定�れ��。"
 
-#: ../clients/common/settings-docs.c.in:194
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
@@ -7869,13 +8012,13 @@ msgstr ""
 "プロパティー�設定�れる����プロパティー��� \"mac-address\" ���れ�"
 "を設定���ベースデ�イスを指定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:195
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr ""
 "IPoIB トランス�ートモード。\"datagram\" ��� \"connected\" ���れ�。"
 
-#: ../clients/common/settings-docs.c.in:196
+#: ../clients/common/settings-docs.h.in:199
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
@@ -7883,7 +8026,25 @@ msgstr ""
 "パケット�先頭�カプセル化レベルを���ら�追加��る�。��プロパティー"
 "��IPv6 トン�ル����用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:197
+#: ../clients/common/settings-docs.h.in:200
+msgid ""
+"Tunnel flags. Currently the following values are supported: "
+"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
+"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
+"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only "
+"for IPv6 tunnels."
+msgstr ""
+"トン�ルフラグ。�在�以下�値�サ�ート�れ����。 "
+"NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), "
+"NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), "
+"NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY "
+"(0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). �れら��IPv6 トン�ル"
+"���有効��。"
+
+#: ../clients/common/settings-docs.h.in:201
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
@@ -7891,7 +8052,7 @@ msgstr ""
 "トン�ルパケット�割り当�るフローラベル。��プロパティー��IPv6 ����用"
 "�れ��。"
 
-#: ../clients/common/settings-docs.c.in:198
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
@@ -7899,7 +8060,7 @@ msgstr ""
 "トン�ル入力パケット�使用�れるキー。��プロパティー��特定�トン�ルモー"
 "ド (GRE�IP6GRE) �対����有効��。空��る��キー�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:199
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
@@ -7907,7 +8068,7 @@ msgstr ""
 "トン�ル�ローカルエンド�イント。値�空�����。も����IPv4 アドレス�"
 "�� IPv6 アドレスを�む必���り��。"
 
-#: ../clients/common/settings-docs.c.in:200
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
@@ -7915,7 +8076,7 @@ msgstr ""
 "トン�リングモード。���� NM_IP_TUNNEL_MODE_IPIP (1) や "
 "NM_IP_TUNNEL_MODE_GRE (2)。"
 
-#: ../clients/common/settings-docs.c.in:201
+#: ../clients/common/settings-docs.h.in:205
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
@@ -7923,15 +8084,15 @@ msgstr ""
 "ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定より大��パ"
 "ケット��複数�フラグメント�分割�れ��。"
 
-#: ../clients/common/settings-docs.c.in:203
+#: ../clients/common/settings-docs.h.in:207
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr ""
-"トン�ル出力パケット�使用�れるキー。��プロパティ��特定�トン�ルモード "
-"(GRE�IP6GRE) �対����有効��。空��る��キー�使用�れ��ん。"
+"トン�ル出力パケット�使用�れるキー。��プロパティー��特定�トン�ルモー"
+"ド (GRE�IP6GRE) �対����有効��。空��る��キー�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:204
+#: ../clients/common/settings-docs.h.in:208
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
@@ -7941,11 +8102,11 @@ msgstr ""
 "���新��デ�イス��インド�れる親インターフェース����親接続� UUID "
 "を指定���。"
 
-#: ../clients/common/settings-docs.c.in:205
+#: ../clients/common/settings-docs.h.in:209
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "��トン�ル��パス MTU 検出を有効��る����。"
 
-#: ../clients/common/settings-docs.c.in:206
+#: ../clients/common/settings-docs.h.in:210
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
@@ -7953,7 +8114,7 @@ msgstr ""
 "トン�ル�リモートエンド�イント。��値���IPv4 アドレス��� IPv6 アドレ"
 "スを��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:207
+#: ../clients/common/settings-docs.h.in:211
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
@@ -7961,7 +8122,7 @@ msgstr ""
 "トン�ル化パケット�設定�れるサービス�タイプ (IPv4) ���トラフィッククラ"
 "ス (IPv6) フィールド。"
 
-#: ../clients/common/settings-docs.c.in:208
+#: ../clients/common/settings-docs.h.in:212
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
@@ -7969,28 +8130,29 @@ msgstr ""
 "トン�ル化パケット�割り当�る TTL。0 �特別�値��パケット� TTL 値を継承�"
 "る��を示�����。"
 
-#: ../clients/common/settings-docs.c.in:209
-#: ../clients/common/settings-docs.c.in:231
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:235
 msgid "Array of IP addresses."
 msgstr "IP アドレス��列。"
 
-#: ../clients/common/settings-docs.c.in:210
-#: ../clients/common/settings-docs.c.in:232
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:236
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
 "activation will fail.  A zero value means that no duplicate address "
 "detection is performed, -1 means the default value (either configuration "
-"ipvx.dad-timeout override or 3 seconds).  A value greater than zero is a "
-"timeout in milliseconds."
+"ipvx.dad-timeout override or zero).  A value greater than zero is a timeout "
+"in milliseconds. The property is currently implemented only for IPv4."
 msgstr ""
 "�ットワーク上� IP アドレス��複を確��る��使用�れるタイムアウト (ミリ"
 "秒��)。アドレス�競��検出�れる��アクティベーション�失敗���。��値"
 "をゼロ��る���複アドレス�検出�行�れ��ん。-1 ��デフォルト値 (設定 "
-"ipvx.dad-timeout を上書���� 3 秒���れ�) ��り��。値�ゼロより大�"
-"�場��タイムアウト (ミリ秒) ��り��。"
+"ipvx.dad-timeout を上書����ゼロ���れ�) ��り��。値�ゼロより大��"
+"場��タイムアウト (ミリ秒) ��り��。�在���プロパティー� IPv4 ���"
+"実装�れ����。"
 
-#: ../clients/common/settings-docs.c.in:211
+#: ../clients/common/settings-docs.h.in:215
 msgid ""
 "A string sent to the DHCP server to identify the local machine which the "
 "DHCP server may use to customize the DHCP lease and options. When the "
@@ -7999,7 +8161,14 @@ msgid ""
 "RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e."
 "g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a "
 "MAC address). If the property is not a hex string it is considered as a non-"
-"hardware-address client ID and the 'type' field is set to 0."
+"hardware-address client ID and the 'type' field is set to 0. The special "
+"values \"mac\" and \"perm-mac\" are supported, which use the current or "
+"permanent MAC address of the device to generate a client identifier with "
+"type ethernet (01). Currently, these options only work for ethernet "
+"type of links. The special value \"stable\" is supported to generate a type "
+"0 client identifier based on the stable-id (see connection.stable-id) and a "
+"per-host key. If unset, a globally configured default is used. If still "
+"unset, the client-id from the last lease is reused."
 msgstr ""
 "DHCP サー�ー��られる文字列。DHCP サー�ー� DHCP リース�オプションをカス"
 "タマイズ�る��使用�るローカルマシンを識別���。プロパティー� 16 進数 "
@@ -8008,9 +8177,16 @@ msgstr ""
 "��'type' フィールド��り�残り��イト��ードウェアアドレス ('01:xx:xx:"
 "xx:xx:xx:xx' ��。1 � Ethernet � ARP タイプ��残り� MAC アドレス) ��り"
 "��。文字列� 16 進数����場�����ードウェアアドレス�クライアント "
-"ID �見��れ�'type' フィールド� 0 �設定�れ��。"
+"ID �見��れ�'type' フィールド� 0 �設定�れ��。特別値��る \"mac\" �"
+"よ� \"perm-mac\" �サ�ート�れ����。�れら��デ�イス��在���永続"
+"的 MAC アドレスを使用���type ethernet (01) �クライアント識別�を生���"
+"�。�在��れら�オプション��ethernet リンク���有効��。特別値 "
+"\"stable\" ��stable-id (connection.stable-id を�照) �よ�ホスト���キー"
+"を基��type 0 �クライアント識別�を生��るよ�サ�ート�れ����。値�設"
+"定�れ��場���グロー�ル�設定�れ�デフォルト�使用�れ��。引�続�値"
+"�設定�れ��場���最後�リース�クライアント ID ��利用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:212
+#: ../clients/common/settings-docs.h.in:216
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8020,8 +8196,8 @@ msgstr ""
 "定�� FQDN � DHCP サー�ー��られ��。��優先度�よ� \"dhcp-hostname\" "
 "�相互�排他的���時�設定����ん。"
 
-#: ../clients/common/settings-docs.c.in:213
-#: ../clients/common/settings-docs.c.in:233
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:238
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -8031,8 +8207,8 @@ msgstr ""
 "定����� DHCP サー�ー��られ��。��プロパティー� \"dhcp-fqdn\" �相"
 "互�排他的���時�設定����ん。"
 
-#: ../clients/common/settings-docs.c.in:214
-#: ../clients/common/settings-docs.c.in:234
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:239
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -8046,18 +8222,18 @@ msgstr ""
 "NULL ����プロパティー� TRUE �場�����コンピューター��在�永続ホス"
 "ト���られ��。"
 
-#: ../clients/common/settings-docs.c.in:215
-#: ../clients/common/settings-docs.c.in:235
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:240
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "DHCP トランザクション�タイムアウト (秒��)。"
 
-#: ../clients/common/settings-docs.c.in:216
-#: ../clients/common/settings-docs.c.in:236
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:241
 msgid "Array of IP addresses of DNS servers."
 msgstr "DNS サー�ー� IP アドレス�列。"
 
-#: ../clients/common/settings-docs.c.in:217
-#: ../clients/common/settings-docs.c.in:237
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "Array of DNS options as described in man 5 resolv.conf. NULL means that the "
 "options are unset and left at the default. In this case NetworkManager will "
@@ -8068,43 +8244,65 @@ msgstr ""
 "NetworkManager �デフォルト�オプションを使用��プロパティー�リスト�空�"
 "����る場���区別�れ��。"
 
-#: ../clients/common/settings-docs.c.in:218
-#: ../clients/common/settings-docs.c.in:238
-msgid ""
-"Intra-connection DNS priority. The relative priority to be used when "
-"determining the order of DNS servers in resolv.conf.  A lower value means "
-"that servers will be on top of the file.  Zero selects the default value, "
-"which is 50 for VPNs and 100 for other connections.  Note that the priority "
-"is to order DNS settings for multiple active connections. It does not "
-"disambiguate multiple DNS servers within the same connection profile. For "
-"that, just specify the DNS servers in the desired order. When multiple "
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:243
+msgid ""
+"DNS servers priority. The relative priority for DNS servers specified by "
+"this setting.  A lower value is better (higher priority).  Zero selects the "
+"default value, which is 50 for VPNs and 100 for other connections. Note that "
+"the priority is to order DNS settings for multiple active connections.  It "
+"does not disambiguate multiple DNS servers within the same connection "
+"profile. When using dns=default, servers with higher priority will be on top "
+"of resolv.conf.  To prioritize a given server over another one within the "
+"same connection, just specify them in the desired order.  When multiple "
 "devices have configurations with the same priority, the one with an active "
-"default route will be preferred. Note that when using dns=dnsmasq the order "
-"is meaningless since dnsmasq forwards queries to all known servers at the "
-"same time. Negative values have the special effect of excluding other "
-"configurations with a greater priority value; so in presence of at least a "
-"negative priority, only DNS servers from connections with the lowest "
-"priority value will be used."
-msgstr ""
-"内部接続� DNS 優先度。resolv.conf � DNS サー�ー�順番を決定�る際�使用�"
-"れる関連優先度。値を低��る��サー�ー�ファイル�上部�置�れ��。ゼロ�"
-"デフォルト値 (VPN �場�� 50���他�接続�場�� 100) を�択���。優先度"
-"��複数�アクティブ�接続�対�� DNS 設定�順番を設定�������接続プロ"
-"ファイル��る複数� DNS サー�ー�曖昧��解消�れ��ん。�れを解消�る�"
-"��DNS サー�ー�順番を指定���。複数�デ�イス�優先度���も���る場"
-"���アクティブ�デフォルトルートを��も��優先�れ��。����"
-"dns=dnsmasq を使用���る場��順番を付��も�味��り��ん。dnsmasq ��"
-"既知�����サー�ー��クエリーを�時�転��る����。負�値��より大"
-"��優先度を����他�設定を除外���。������優先度�負�場���一"
-"番低�優先度�設定�れ��る接続� DNS サー�ー���使用�れ��。"
-
-#: ../clients/common/settings-docs.c.in:219
-#: ../clients/common/settings-docs.c.in:239
-msgid "Array of DNS search domains."
-msgstr "DNS 検索ドメイン��列。"
-
-#: ../clients/common/settings-docs.c.in:220
-#: ../clients/common/settings-docs.c.in:240
+"default route will be preferred.  Negative values have the special effect of "
+"excluding other configurations with a greater priority value; so in presence "
+"of at least a negative priority, only DNS servers from connections with the "
+"lowest priority value will be used. When using a DNS resolver that supports "
+"split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to "
+"query domains in its search list.  Queries for domains not present in any "
+"search list are routed through connections having the '~.' special wildcard "
+"domain, which is added automatically to connections with the default route "
+"(or can be added manually).  When multiple connections specify the same "
+"domain, the one with the highest priority (lowest numerical value) wins.  If "
+"a connection specifies a domain which is subdomain of another domain with a "
+"negative DNS priority value, the subdomain is ignored."
+msgstr ""
+"DNS サー�ー優先度。��設定�より指定�れ� DNS サー�ー�関連優先度。値�低"
+"�方�良� (優先度�高�) ��。ゼロ�デフォルト値 (VPN �場�� 50���他�"
+"接続�場�� 100) を�択���。優先度��複数�アクティブ�接続�対�� DNS "
+"設定�順番を設定�������接続プロファイル��る複数� DNS サー�ー�曖昧"
+"��解消�れ��ん。dns=default を使用�る場��優先度�高�サー�ー� "
+"resolv.conf �上�置�れ��。��接続内��特定�サー�ーを別�サー�ーより"
+"も優先���場���優先順�を指定���。複数�デ�イス�優先度���も��"
+"�る場���アクティブ�デフォルトルートを��も��優先�れ��。負�値��"
+"より大��優先度を����他�設定を除外���。������優先度�負�場�"
+"��一番低�優先度�設定�れ��る接続� DNS サー�ー���使用�れ��。"
+"dns=dnsmasq ��� dns=systemd-resolved ��� split-DNS をサ�ート�る DNS "
+"リゾル�ーを使用�る際��接続を使用���検索リスト�ドメインをクエリー��"
+"�。検索リスト���ドメイン�クエリー��特別�ワイルドカードドメイン��る "
+"'~.' を���る接続�ルーティング�れ��。'~.' ��デフォルト�ルート�接続"
+"�自動的�追加�れ�� (���手動��追加も�能��)。複数�接続���ドメイ"
+"ンを指定��場��優先度�最も高�接続 (数値�最も低�接続) ���れ��。接"
+"続�ドメインを指定����ドメイン��DNS �優先度�値�負��る別�ドメイン"
+"�サブドメイン��る場����サブドメイン�無視�れ��。"
+
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:244
+msgid ""
+"Array of DNS search domains. Domains starting with a tilde ('~') are "
+"considered 'routing' domains and are used only to decide the interface over "
+"which a query must be forwarded; they are not used to complete unqualified "
+"host names."
+msgstr ""
+"DNS 検索ドメイン��列。�ルダ ('~') �始�るドメイン��ドメインを "
+"'routing' ���る�考�られ���インターフェース�クエリーを転�����を"
+"決�る際���使用�れ��。�れら���修飾ホスト�を完���る����使用"
+"�れ��ん。"
+
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
@@ -8112,8 +8310,8 @@ msgstr ""
 "ゲートウェイ����設定�関連付�られ����。\"アドレス\" ��も�設定��"
 "場���り有効��り��。"
 
-#: ../clients/common/settings-docs.c.in:221
-#: ../clients/common/settings-docs.c.in:241
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:246
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -8125,8 +8323,8 @@ msgstr ""
 "� \"dns-search\" プロパティー�指定���ームサー�ー�検索ドメイン���使"
 "用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:222
-#: ../clients/common/settings-docs.c.in:242
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
@@ -8136,8 +8334,8 @@ msgstr ""
 "�設定��ルート�無視�れ�ルートを \"routes\" プロパティー�指定��場�"
 "����ルート���使用�れ��。"
 
-#: ../clients/common/settings-docs.c.in:223
-#: ../clients/common/settings-docs.c.in:244
+#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:249
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8152,8 +8350,8 @@ msgstr ""
 "����NMSettingIP4Config ���プロパティーを TRUE �設定�る��IPv4 設定"
 "�失敗��IPv6 設定�完全��功��も�全体��ットワーク設定��功���。"
 
-#: ../clients/common/settings-docs.c.in:224
-#: ../clients/common/settings-docs.c.in:245
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"auto\", \"manual\", and \"link-local\". See the subclass-specific "
@@ -8177,8 +8375,8 @@ msgstr ""
 "定�� IP サブセットを設定����。設定���場�� 10.42.x.0/24 ��択�れ"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:226
-#: ../clients/common/settings-docs.c.in:247
+#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
@@ -8186,8 +8384,8 @@ msgstr ""
 "TRUE ��る����接続��� IP タイプ�対�るデフォルト�接続���ら���"
 "��NetworkManager �よ��デフォルトルート�割り当�られ��ん。"
 
-#: ../clients/common/settings-docs.c.in:227
-#: ../clients/common/settings-docs.c.in:248
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:253
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -8205,8 +8403,8 @@ msgstr ""
 "ティーをゼロ�設定�る��実際�� 1024 ��る���注�������。IPv4 �"
 "��ゼロ�メトリック�正則値��り��。"
 
-#: ../clients/common/settings-docs.c.in:228
-#: ../clients/common/settings-docs.c.in:249
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8236,12 +8434,12 @@ msgstr ""
 "NetworkManager 以外�ルーティングテーブルを管��る���後方互�性を確���"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:229
-#: ../clients/common/settings-docs.c.in:250
+#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:255
 msgid "Array of IP routes."
 msgstr "IP ルート��列。"
 
-#: ../clients/common/settings-docs.c.in:230
+#: ../clients/common/settings-docs.h.in:234
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8265,7 +8463,7 @@ msgstr ""
 "RFC4862 IPv6 ステートレスアドレス�自動設定�使用�るアドレスを作��る方法を"
 "設定���。利用��る値� NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) ��"
 "� NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1) ��。��プロパ"
-"ティーを EUI64 �設定�る��アドレス���ードウェアアドレス�ら算出��イン"
+"ティーを EUI64 �設定�る��アドレス���ードウェアアドレス�ら�得��イン"
 "ターフェーストークンを使用��生��れ��。�れ�より�アドレス�ホスト部分"
 "�一定��り��ットワークを変更�る際�ホスト�存在を追跡����。インター"
 "フェース��ードウェアを交��る�アドレス�変更���。stable-privacy �値"
@@ -8279,7 +8477,56 @@ msgstr ""
 "��\"ip6-privacy\" プロパティー�より設定�れ�プライ�シー拡張��異�り�"
 "��オプション�設定��一時アドレス��影響������注�������。"
 
-#: ../clients/common/settings-docs.c.in:243
+#: ../clients/common/settings-docs.h.in:237
+msgid ""
+"A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp "
+"client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried "
+"in the Client Identifier option. If the property is a hex string ('aa:bb:"
+"cc') it is interpreted as a binary DUID and filled as an opaque value in the "
+"Client Identifier option. The special value \"lease\" will retrieve the DUID "
+"previously used from the lease file belonging to the connection. If no DUID "
+"is found and \"dhclient\" is the configured dhcp client, the DUID is "
+"searched in the system-wide dhclient lease file. If still no DUID is found, "
+"or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) "
+"will be generated based on the machine-id. The special values \"llt\" and "
+"\"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the "
+"current MAC address of the device. In order to try providing a stable DUID-"
+"LLT, the time field will contain a constant timestamp that is used globally "
+"(for all profiles) and persisted to disk. The special values \"stable-llt\", "
+"\"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding "
+"type, derived from the connection's stable-id and a per-host unique key. So, "
+"the link-layer address of \"stable-ll\" and \"stable-llt\" will be a "
+"generated address derived from the stable id. The DUID-LLT time value in the "
+"\"stable-llt\" option will be picked among a static timespan of three years "
+"(the upper bound of the interval is the same constant timestamp used in \"llt"
+"\"). When the property is unset, the global value provided for \"ipv6.dhcp-"
+"duid\" is used. If no global value is provided, the default \"lease\" value "
+"is assumed."
+msgstr ""
+"DHCP クライアント��DHCPv6 サー�ー (RFC 3315) �識別��もら����使用�"
+"る DHCPv6 一�識別� (DUID) を�む文字列。DUID ��クライアント識別��オプ"
+"ション��り��。プロパティー� 16 進数 ('aa:bb:cc') �場����イナリー� "
+"DUID ���解釈�れ�クライアント識別��オプション���明�値���記入�れ"
+"��。特別値� \"lease\" ��接続�リースファイル�ら以�使用�� DUID を�得"
+"���。DUID �見��ら��\"dhclient\" �設定�れ� DHCP クライアント�場"
+"��システム全体� dhclient リースファイル内� DUID を検索���。引�続� "
+"DUID �見��ら��場�����別� DHCP クライアント�使用�れ��る場���"
+"グロー�ル��永続的� DUID-UUID (RFC 6355) � machine-id �基���生��れ"
+"��。特別値� \"llt\" �よ� \"ll\" ��デ�イス��在� MAC アドレス�基�"
+"���LLT ��� LL (RFC 3315 を�照) タイプ� DUID を生����。安定�� "
+"DUID-LLT を�供�る����タイムフィールド���(����プロファイル��"
+"�) グロー�ル�使用�れ�ディスク�永続�る一定�タイムスタンプ���れ�"
+"�。特別値� \"stable-llt\"�\"stable-ll\"��よ� \"stable-uuid\" ��対応�"
+"るタイプ� DUID を生����。�れ��接続� stable-id �よ�ホスト���固有"
+"�キー�ら�得��も���。������\"stable-ll\" �よ� \"stable-llt\" "
+"�リンク層�アドレス��stable id �ら算出�れる生��れ�アドレス��り�"
+"�。\"stable-llt\" オプション� DUID-LLT タイム値��3 年����的タイムスパ"
+"ン�中�ら��れ�� (インター�ル�上���\"llt\" �使用�れる一定�タイム"
+"スタンプ�����)。プロパティー�設定�れ����場��\"ipv6.dhcp-duid\" "
+"��供�れるグロー�ル値�使用�れ��。グロー�ル値��供�れ��場���デ"
+"フォルト� \"lease\" 値�想定�れ��。 "
+
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8308,7 +8555,7 @@ msgstr ""
 "ロパティー� \"stable-privacy\" 設定�有効���る�安定��プライ�シーアド"
 "レス��区別�れ��。"
 
-#: ../clients/common/settings-docs.c.in:251
+#: ../clients/common/settings-docs.h.in:256
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -8316,33 +8563,33 @@ msgstr ""
 "IPv6 トークン化��インターフェース識別� draft-chown-6man-tokenised-ipv6-"
 "identifiers-02 �トークンを設定���。eui64 addr-gen-mode �行��便利��。"
 
-#: ../clients/common/settings-docs.c.in:252
+#: ../clients/common/settings-docs.h.in:257
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "転�トラフィック�暗�化�必�����。"
 
-#: ../clients/common/settings-docs.c.in:253
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr "MACsec キー一致���る共有�� CAK (接続関連キー)。"
 
-#: ../clients/common/settings-docs.c.in:254
+#: ../clients/common/settings-docs.h.in:259
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "\"mka-cak\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.c.in:255
+#: ../clients/common/settings-docs.h.in:260
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr "MACsec キー一致���る共有�� CKN (接続�関連�るキー�)。"
 
-#: ../clients/common/settings-docs.c.in:256
+#: ../clients/common/settings-docs.h.in:261
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr ""
 "MKA (MACsec キー一致) � CAK (接続関連キー) を�得�る方法を指定���。"
 
-#: ../clients/common/settings-docs.c.in:258
+#: ../clients/common/settings-docs.h.in:263
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -8354,17 +8601,25 @@ msgstr ""
 "���\"mac-address\" プロパティー�追加�れ� \"802-3-ethernet\" 設定を��"
 "る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:259
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr "SCI (セキュア�ャ�ル識別�) ��ートコン�ー�ント (1 - 65534)。"
 
-#: ../clients/common/settings-docs.c.in:260
+#: ../clients/common/settings-docs.h.in:265
+msgid ""
+"Specifies whether the SCI (Secure Channel Identifier) is included in every "
+"packet."
+msgstr ""
+"パケット��� SCI (セキュア�ャ�ル識別�) ���れ��る����を指定��"
+"�。"
+
+#: ../clients/common/settings-docs.h.in:266
 msgid "Specifies the validation mode for incoming frames."
 msgstr "入力フレーム�検証モードを指定���。"
 
-#: ../clients/common/settings-docs.c.in:261
+#: ../clients/common/settings-docs.h.in:267
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
@@ -8372,7 +8627,7 @@ msgstr ""
 "��低�デ�イス��複数� macvlans 間�通信メカニズムを指定�る macvlan モー"
 "ド。"
 
-#: ../clients/common/settings-docs.c.in:263
+#: ../clients/common/settings-docs.h.in:269
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -8384,71 +8639,70 @@ msgstr ""
 "��\"mac-address\" プロパティー�追加�れ� \"802-3-ethernet\" 設定を��る"
 "必���り��。"
 
-#: ../clients/common/settings-docs.c.in:264
+#: ../clients/common/settings-docs.h.in:270
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "インターフェースをプロミスキャスモード��る������。"
 
-#: ../clients/common/settings-docs.c.in:265
+#: ../clients/common/settings-docs.h.in:271
 msgid "Whether the interface should be a MACVTAP."
 msgstr "インターフェース� MACVTAP ��������。"
 
-#: ../clients/common/settings-docs.c.in:266
+#: ../clients/common/settings-docs.h.in:272
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr "ブリッジ�失敗モード。\"secure\"�\"standalone\"���空���れ�。"
 
-#: ../clients/common/settings-docs.c.in:267
+#: ../clients/common/settings-docs.h.in:273
 msgid "Enable or disable multicast snooping."
 msgstr "マル�キャスト�スヌーピングを有効化���無効化����。"
 
-#: ../clients/common/settings-docs.c.in:269
+#: ../clients/common/settings-docs.h.in:275
 msgid "Enable or disable RSTP."
 msgstr "RSTP を有効化���無効化����。"
 
-#: ../clients/common/settings-docs.c.in:270
+#: ../clients/common/settings-docs.h.in:276
 msgid "Enable or disable STP."
 msgstr "STP を有効化���無効化����。"
 
-#: ../clients/common/settings-docs.c.in:272
+#: ../clients/common/settings-docs.h.in:278
 msgid "The interface type. Either \"internal\", or empty."
 msgstr "インターフェース�タイプ。\"internal\" ���空���れ���り��。"
 
-#: ../clients/common/settings-docs.c.in:274
+#: ../clients/common/settings-docs.h.in:280
 msgid ""
-"Specifies the unicast destination IP address of a remote OpenVSwitch bridge "
+"Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
 msgstr ""
-"接続�るリモート� OpenVSwitch  ブリッジ�ート�ユニキャスト宛先 IP アドレス"
+"接続�るリモート� Open vSwitch ブリッジ�ート�ユニキャスト宛先 IP アドレス"
 "を指定���。"
 
-#: ../clients/common/settings-docs.c.in:275
+#: ../clients/common/settings-docs.h.in:281
 msgid "The time port must be inactive in order to be considered down."
 msgstr ""
 "ダウン���見�������タイム�ートを�アクティブ��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:276
+#: ../clients/common/settings-docs.h.in:282
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 "ボンディングモード。\"active-backup\"�\"balance-slb\"���� \"balance-tcp"
 "\" ���れ���り��。"
 
-#: ../clients/common/settings-docs.c.in:277
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:283
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr ""
-"トラフィック�転�を開始�る���タイム�ートをアクティブ��る必���り�"
+"トラフィック�転�を始�る���タイム�ートをアクティブ��る必���り�"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:278
+#: ../clients/common/settings-docs.h.in:284
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr ""
 "LACP モード。\"active\"�\"off\"���� \"passive\" ���れ���り��。"
 
-#: ../clients/common/settings-docs.c.in:280
+#: ../clients/common/settings-docs.h.in:286
 msgid "The VLAN tag in the range 0-4095."
 msgstr "VLAN タグ�  0 - 4095 �範囲内��り��。"
 
-#: ../clients/common/settings-docs.c.in:281
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
@@ -8456,7 +8710,7 @@ msgstr ""
 "VLAN モード。\"access\"�\"native-tagged\"�\"native-untagged\"�\"trunk\" �"
 "��れ��設定�る��何も設定���ん。"
 
-#: ../clients/common/settings-docs.c.in:282
+#: ../clients/common/settings-docs.h.in:288
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified "
 "baudrate.  This value should normally be left as 0 to automatically choose "
@@ -8465,7 +8719,7 @@ msgstr ""
 "ゼロ以外��pppd より指定��ボーレート�シリアル�ートを設定���。速度�自"
 "動的��択�れるよ���通常����値を 0 ����。"
 
-#: ../clients/common/settings-docs.c.in:283
+#: ../clients/common/settings-docs.h.in:289
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
@@ -8475,7 +8729,7 @@ msgstr ""
 "フロー制御を使用�るシリアル�ートを設定�る必���り��。��値��通常� "
 "FALSE �設定�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:284
+#: ../clients/common/settings-docs.h.in:290
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -8487,7 +8741,7 @@ msgstr ""
 "場���\"lcp-echo-interval\" プロパティーもゼロ以外�値�設定�る必���り"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:285
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -8495,10 +8749,10 @@ msgid ""
 "autodetect this."
 msgstr ""
 "ゼロ以外��る��pppd ��n 秒���ピア� LCP echo-request フレームを�るよ"
-"�� �り�� (n �指定��値)。PPP ピア�一部���エコー�求�応答���。"
-"�れを自動検出�る�������ん。"
+"���り�� (n �指定��値)。PPP ピア�一部���エコー�求�応答���。�"
+"れを自動検出�る�������ん。"
 
-#: ../clients/common/settings-docs.c.in:286
+#: ../clients/common/settings-docs.h.in:292
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
@@ -8506,7 +8760,7 @@ msgstr ""
 "TRUE �場���ステートフル MPPE �使用�れ��。ステートフル MPPE �詳細� "
 "pppd ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.c.in:287
+#: ../clients/common/settings-docs.h.in:293
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
@@ -8515,16 +8769,16 @@ msgstr ""
 "ゼロ以外��指定��サイズ以下�パケットをピア��信�るよ�� pppd ��求�"
 "��。ゼロ以外���MRU � 128 �ら 16384 �間��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:288
+#: ../clients/common/settings-docs.h.in:294
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr "ゼロ以外��pppd �より�指定��サイズ以下�パケット��信�れ��。"
 
-#: ../clients/common/settings-docs.c.in:290
+#: ../clients/common/settings-docs.h.in:296
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr "TRUE �場���Van Jacobsen TCP ヘッダー圧縮��求�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:291
+#: ../clients/common/settings-docs.h.in:297
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
@@ -8534,35 +8788,35 @@ msgstr ""
 "�れ��ん。FALSE �場���リモート��ら��証�必���り��。��ん��"
 "���場����れ� TRUE ��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:292
+#: ../clients/common/settings-docs.h.in:298
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "TRUE �場���BSD 圧縮��求�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:293
+#: ../clients/common/settings-docs.h.in:299
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "TRUE �場���\"deflate\" 圧縮��求�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:294
+#: ../clients/common/settings-docs.h.in:300
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "TRUE �場���CHAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:295
+#: ../clients/common/settings-docs.h.in:301
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "TRUE �場���EAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:296
+#: ../clients/common/settings-docs.h.in:302
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "TRUE �場���MSCHAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:297
+#: ../clients/common/settings-docs.h.in:303
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "TRUE �場���MSCHAPv2 �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:298
+#: ../clients/common/settings-docs.h.in:304
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "TRUE �場���PAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.c.in:299
+#: ../clients/common/settings-docs.h.in:305
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
@@ -8573,7 +8827,7 @@ msgstr ""
 "�る��セッション�失敗���。MPPE �モ�イルブロード�ンド接続�使用�れ�"
 "�点�注�������。"
 
-#: ../clients/common/settings-docs.c.in:300
+#: ../clients/common/settings-docs.h.in:306
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -8584,7 +8838,7 @@ msgstr ""
 "定�る必���り��。128 ビット� MPPE �利用������セッション�失敗�"
 "��。"
 
-#: ../clients/common/settings-docs.c.in:302
+#: ../clients/common/settings-docs.h.in:308
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -8595,11 +8849,11 @@ msgstr ""
 "��プロパティーを指定�������接続��NMSettingConnection � "
 "\"interface-name\" �指定��インターフェース�接続�有効��り��。"
 
-#: ../clients/common/settings-docs.c.in:303
+#: ../clients/common/settings-docs.h.in:309
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "PPPoE サービス���証�使用�るパスワード。"
 
-#: ../clients/common/settings-docs.c.in:305
+#: ../clients/common/settings-docs.h.in:311
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -8611,29 +8865,29 @@ msgstr ""
 "定を空白�����る必���り��。�れ��アクセス集線装置�複数�る場�"
 "や�特別�サービス�必���る���分����る場���り必���り��。"
 
-#: ../clients/common/settings-docs.c.in:306
+#: ../clients/common/settings-docs.h.in:312
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "PPPoE サービス���証�使用�るユーザー�。"
 
-#: ../clients/common/settings-docs.c.in:307
+#: ../clients/common/settings-docs.h.in:313
 msgid "Whether the proxy configuration is for browser only."
 msgstr "プロキシー設定�ブラウザー専用��る����。"
 
-#: ../clients/common/settings-docs.c.in:308
+#: ../clients/common/settings-docs.h.in:314
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr ""
 "プロキシー設定�方法。デフォルト� NM_SETTING_PROXY_METHOD_NONE (0) ��。"
 
-#: ../clients/common/settings-docs.c.in:310
+#: ../clients/common/settings-docs.h.in:316
 msgid "PAC script for the connection."
 msgstr "接続� PAC スクリプト。"
 
-#: ../clients/common/settings-docs.c.in:311
+#: ../clients/common/settings-docs.h.in:317
 msgid "PAC URL for obtaining PAC file."
 msgstr "PAC ファイルを�得�る PAC URL"
 
-#: ../clients/common/settings-docs.c.in:312
+#: ../clients/common/settings-docs.h.in:318
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
@@ -8643,19 +8897,19 @@ msgstr ""
 "ドモデム��影響���ん。通常�速度設定を無視��利用�能�最高�速度を使用"
 "���。"
 
-#: ../clients/common/settings-docs.c.in:313
+#: ../clients/common/settings-docs.h.in:319
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "シリアル接続��イト幅。�����\"8n1\" � 8 ��。"
 
-#: ../clients/common/settings-docs.c.in:315
+#: ../clients/common/settings-docs.h.in:321
 msgid "Parity setting of the serial port."
 msgstr "シリアル�ート�パリティ設定。"
 
-#: ../clients/common/settings-docs.c.in:316
+#: ../clients/common/settings-docs.h.in:322
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr "モデム��信���イト間��延時間 (マイクロ秒��)。"
 
-#: ../clients/common/settings-docs.c.in:317
+#: ../clients/common/settings-docs.h.in:323
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -8663,16 +8917,15 @@ msgstr ""
 "シリアル�ート�通信�る����止ビット�数。1 ��� 2 ���れ���り�"
 "�。�����\"8n1\" � 1 ��。"
 
-#: ../clients/common/settings-docs.c.in:319
+#: ../clients/common/settings-docs.h.in:325
 msgid "Array of TC queuening disciplines."
-msgstr ""
+msgstr "TC キュー処���列"
 
-#: ../clients/common/settings-docs.c.in:320
-#, fuzzy
+#: ../clients/common/settings-docs.h.in:326
 msgid "Array of TC traffic filters."
-msgstr "IP ルート��列。"
+msgstr "TC トラフィックフィルター��列"
 
-#: ../clients/common/settings-docs.c.in:321
+#: ../clients/common/settings-docs.h.in:327
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -8684,8 +8937,8 @@ msgstr ""
 "指定�����デフォルト�設定�使用�れ��。フォーマット�詳細��man "
 "teamd.conf を�照������。"
 
-#: ../clients/common/settings-docs.c.in:322
-#: ../clients/common/settings-docs.c.in:341
+#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:347
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8696,66 +8949,82 @@ msgid ""
 "'validate-active', 'validate-incative', 'send-always'. See teamd.conf man "
 "for more details."
 msgstr ""
+"接続�リンクウォッ�ャー設定: リンクウォッ�ャー��れ�れディクショナリー�"
+"よ��定義�れ�キー��択��リンクウォッ�ャー�よ��異�り��。利用��"
+"るリンクウォッ�ャー� 'ethtool'�'nsna_ping'�'arp_ping' �加��キー� "
+"'name' �ディクショナリー�指定��も���り��。利用��るキー: ethtool �"
+"� 'delay-up'�'delay-down'�'init-wait'。nsna_ping �� 'init-"
+"wait'�'interval'�'missed-max'�'target-host'。arp_ping ���nsna_ping �全"
+"キー�よ� 'source-host'�'validate-active'�'validate-incative'�'send-"
+"always'。詳細� teamd.conf � man ページを�照������。"
 
-#: ../clients/common/settings-docs.c.in:323
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd mcast_rejoin.count."
-msgstr ""
+msgstr "teamd mcast_rejoin.count �相当���。"
 
-#: ../clients/common/settings-docs.c.in:324
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd mcast_rejoin.interval."
-msgstr ""
+msgstr "teamd mcast_rejoin.interval �相当���。"
 
-#: ../clients/common/settings-docs.c.in:326
+#: ../clients/common/settings-docs.h.in:332
 msgid "Corresponds to the teamd notify_peers.count."
-msgstr ""
+msgstr "teamd notify_peers.count �相当���。"
 
-#: ../clients/common/settings-docs.c.in:327
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd notify_peers.interval."
-msgstr ""
+msgstr "teamd notify_peers.interval �相当���。"
 
-#: ../clients/common/settings-docs.c.in:328
+#: ../clients/common/settings-docs.h.in:334
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
-"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\"."
-msgstr ""
-
-#: ../clients/common/settings-docs.c.in:329
+"\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When "
+"setting the runner, all the properties specific to the runner will be reset "
+"to the default value; all the properties specific to other runners will be "
+"set to an empty value (or if not possible to a default value)."
+msgstr ""
+"teamd runner.name �相当���。�能�値: \"roundrobin\"�\"broadcast"
+"\"�\"activebackup\"�\"loadbalance\"�\"lacp\"�\"random\"。ランナーを設定�"
+"る際���ランナー特有�����プロパティー��デフォルト値�リセット�れ�"
+"�。他�ランナー特有�プロパティー�����空�値�設定�れ�� (����デ"
+"フォルト値�設定�れ��場��空�値�設定�れ��)。"
+
+#: ../clients/common/settings-docs.h.in:335
 msgid "Corresponds to the teamd runner.active."
-msgstr ""
+msgstr "teamd runner.active �相当���。"
 
-#: ../clients/common/settings-docs.c.in:330
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd runner.agg_select_policy."
-msgstr ""
+msgstr "teamd runner.agg_select_policy �相当���"
 
-#: ../clients/common/settings-docs.c.in:331
+#: ../clients/common/settings-docs.h.in:337
 msgid "Corresponds to the teamd runner.fast_rate."
-msgstr ""
+msgstr "teamd runner.fast_rate �相当���。"
 
-#: ../clients/common/settings-docs.c.in:332
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd runner.hwaddr_policy."
-msgstr ""
+msgstr "teamd runner.hwaddr_policy �相当���。"
 
-#: ../clients/common/settings-docs.c.in:333
+#: ../clients/common/settings-docs.h.in:339
 msgid "Corresponds to the teamd runner.min_ports."
-msgstr ""
+msgstr "teamd runner.min_ports �相当���。"
 
-#: ../clients/common/settings-docs.c.in:334
+#: ../clients/common/settings-docs.h.in:340
 msgid "Corresponds to the teamd runner.sys_prio."
-msgstr ""
+msgstr "teamd runner.sys_prio �相当���。"
 
-#: ../clients/common/settings-docs.c.in:335
+#: ../clients/common/settings-docs.h.in:341
 msgid "Corresponds to the teamd runner.tx_balancer.name."
-msgstr ""
+msgstr "teamd runner.tx_balancer.name �相当���。"
 
-#: ../clients/common/settings-docs.c.in:336
+#: ../clients/common/settings-docs.h.in:342
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
-msgstr ""
+msgstr "teamd runner.tx_balancer.interval �相当���。"
 
-#: ../clients/common/settings-docs.c.in:337
+#: ../clients/common/settings-docs.h.in:343
 msgid "Corresponds to the teamd runner.tx_hash."
-msgstr ""
+msgstr "teamd runner.tx_hash �相当���。"
 
-#: ../clients/common/settings-docs.c.in:338
+#: ../clients/common/settings-docs.h.in:344
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -8767,29 +9036,31 @@ msgstr ""
 "��デフォルト設定�使用�れ��。フォーマット�詳細��man teamd.conf を�照"
 "������。"
 
-#: ../clients/common/settings-docs.c.in:339
+#: ../clients/common/settings-docs.h.in:345
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.lacp_key �相当���。"
 
-#: ../clients/common/settings-docs.c.in:340
+#: ../clients/common/settings-docs.h.in:346
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.lacp_prio �相当���。"
 
-#: ../clients/common/settings-docs.c.in:343
+#: ../clients/common/settings-docs.h.in:349
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.prio �相当���。"
 
-#: ../clients/common/settings-docs.c.in:344
+#: ../clients/common/settings-docs.h.in:350
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
 msgstr ""
+"teamd ports.PORTIFNAME.queue_id �相当���。-1 �設定�る����パラメー"
+"ター� json 設定�無視�れ��。"
 
-#: ../clients/common/settings-docs.c.in:345
+#: ../clients/common/settings-docs.h.in:351
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
-msgstr ""
+msgstr "teamd ports.PORTIFNAME.sticky �相当���。"
 
-#: ../clients/common/settings-docs.c.in:346
+#: ../clients/common/settings-docs.h.in:352
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -8797,7 +9068,7 @@ msgstr ""
 "デ�イスを所有�るグループ ID。NULL を設定�る��誰�も��デ�イスを使用�"
 "�るよ���り��。"
 
-#: ../clients/common/settings-docs.c.in:347
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -8807,7 +9078,7 @@ msgstr ""
 "��る NM_SETTING_TUN_MODE_TUN (1) ��Ethernet �よ��レイヤー 2 デ�イスを"
 "作��る NM_SETTING_TUN_MODE_TAP (2) ��。"
 
-#: ../clients/common/settings-docs.c.in:348
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
@@ -8817,7 +9088,7 @@ msgstr ""
 "プター (キュー) を使用���パケット���信を並行��処����。TRUE �設定"
 "�����インターフェース� 1 ��キュー��サ�ート���ん。"
 
-#: ../clients/common/settings-docs.c.in:350
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
@@ -8825,7 +9096,7 @@ msgstr ""
 "デ�イスを所有�るユーザー ID。NULL を設定�る��誰�も��デ�イスを使用�"
 "�るよ���り��。"
 
-#: ../clients/common/settings-docs.c.in:351
+#: ../clients/common/settings-docs.h.in:357
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
@@ -8833,7 +9104,7 @@ msgstr ""
 "TRUE �場��インターフェース��パケット�先頭��物�インターフェースを接続"
 "�る 4 �イト�ヘッダーを追加���。"
 
-#: ../clients/common/settings-docs.c.in:352
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
@@ -8841,7 +9112,7 @@ msgstr ""
 "IFF_VNET_HDR を TRUE ��る��トン�ルパケット���virtio �ットワークヘッ"
 "ダー���れ��。"
 
-#: ../clients/common/settings-docs.c.in:353
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -8853,7 +9124,7 @@ msgstr ""
 "ascii フォーマット��をサ�ート�����値��指定��長����任�� "
 "UTF8 文字列�����。"
 
-#: ../clients/common/settings-docs.c.in:355
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -8863,7 +9134,7 @@ msgstr ""
 "��マッピング��\"from:to\" �形��指定��\"from\" � \"to\" ��\"7:3\" "
 "���署���整数����。"
 
-#: ../clients/common/settings-docs.c.in:356
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -8882,9 +9153,9 @@ msgstr ""
 "グ)�NM_VLAN_FLAG_MVRP (0x8) (MVRP プロトコル�使用) ����り��。��プロ"
 "パティー�デフォルト値� NM_VLAN_FLAG_REORDER_HEADERS ����以�� 0 ��"
 "�。後方互�性を確��る�� D-Bus API �デフォルト値を 0 ������D-Bus "
-"���る�明�プロパティ�引�続� 0 �見��れ��。"
+"���る�明�プロパティー�引�続� 0 �見��れ��。"
 
-#: ../clients/common/settings-docs.c.in:357
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
@@ -8892,7 +9163,7 @@ msgstr ""
 "��接続�作��るインターフェースを割り当�る必���る VLAN 識別�。有効�"
 "範囲� 0 - 4094 ��り�予約�れ��る id 4095 �除外�れ��。"
 
-#: ../clients/common/settings-docs.c.in:358
+#: ../clients/common/settings-docs.h.in:364
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both \"from"
@@ -8902,7 +9173,7 @@ msgstr ""
 "��マッピング��\"from:to\" �形��指定��\"from\" � \"to\" ��\"7:3\" "
 "���署���整数����。"
 
-#: ../clients/common/settings-docs.c.in:360
+#: ../clients/common/settings-docs.h.in:366
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -8914,7 +9185,7 @@ msgstr ""
 "��\"mac-address\" プロパティー�指定�れ��る \"802-3-ethernet\" 設定を�"
 "�る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:361
+#: ../clients/common/settings-docs.h.in:367
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
@@ -8922,7 +9193,7 @@ msgstr ""
 "VPN プラグイン特有�データ���るキー�値�ペア����ディクショナリー。"
 "キー�値�両方を文字列��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:363
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
@@ -8932,7 +9203,7 @@ msgstr ""
 "VPN ��明示的�切断�れる���リンク�変更�れ��止��も接続�れ����"
 "�り��。"
 
-#: ../clients/common/settings-docs.c.in:364
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
@@ -8940,7 +9211,7 @@ msgstr ""
 "パスワードや秘密����VPN プラグイン特有�シークレット�関�るキー�値�ペ"
 "ア�ディクショナリー。キー�値��も�文字列��る必���り��。"
 
-#: ../clients/common/settings-docs.c.in:365
+#: ../clients/common/settings-docs.h.in:371
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -8948,7 +9219,7 @@ msgstr ""
 "��設定��ットワーク�接続�る��使用�る VPN プラグイン� D-Bus サービス"
 "�。vpnc プラグイン�場�� org.freedesktop.NetworkManager.vpnc ��。"
 
-#: ../clients/common/settings-docs.c.in:366
+#: ../clients/common/settings-docs.h.in:372
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -8956,11 +9227,11 @@ msgid ""
 "Values greater than zero mean timeout in seconds."
 msgstr ""
 "VPN �接続確立�関�るタイムアウト。一部�サービス��接続�時間���る場�"
-"��り��。値を 0 ��る��デフォルト�タイムアウト 60 秒��り�� (設定"
+"��り��。値を 0 ��る��デフォルト�タイムアウト� 60 秒��り�� (設定"
 "ファイル� vpn.timeout を上書������場�)。ゼロ以外�値を設定��場�"
 "���れ�タイムアウト (秒��) ��り��。"
 
-#: ../clients/common/settings-docs.c.in:367
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -8975,11 +9246,11 @@ msgstr ""
 "�る��NetworkManager ��VPN 接続を�求�るユーザー�ユーザー�を自動的��"
 "供���。"
 
-#: ../clients/common/settings-docs.c.in:368
+#: ../clients/common/settings-docs.h.in:374
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "カー�ル�学習�る FDB エントリー�存続時間 (秒��) を指定���。"
 
-#: ../clients/common/settings-docs.c.in:369
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
@@ -8987,24 +9258,24 @@ msgstr ""
 "リモート� VXLAN トン�ルエンド�イント�接続�る UDP 宛先�ートを指定��"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:370
+#: ../clients/common/settings-docs.h.in:376
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr ""
 "使用�る VXLAN �ットワーク識別� (��� VXLAN セグメント識別�) を指定��"
 "�。"
 
-#: ../clients/common/settings-docs.c.in:371
+#: ../clients/common/settings-docs.h.in:377
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr ""
 "�ットリンク LL ADDR �欠����る通知�生��れる����を指定���。"
 
-#: ../clients/common/settings-docs.c.in:372
+#: ../clients/common/settings-docs.h.in:378
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr ""
 "�ットリンク IP ADDR �欠����る通知�生��れる����を指定���。"
 
-#: ../clients/common/settings-docs.c.in:373
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
@@ -9012,7 +9283,7 @@ msgstr ""
 "未知�ソースリンクレイヤー�アドレス� IP アドレスを�VXLAN デ�イス転�デー"
 "タベース�入力�る����を指定���。"
 
-#: ../clients/common/settings-docs.c.in:374
+#: ../clients/common/settings-docs.h.in:380
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
@@ -9020,21 +9291,21 @@ msgstr ""
 "FDB エントリー�最大数を指定���。値�ゼロ�場���カー�ル�エントリーを"
 "無���存�る��を�味���。"
 
-#: ../clients/common/settings-docs.c.in:375
+#: ../clients/common/settings-docs.h.in:381
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr ""
 "指定��場����信パケット�使用�るソース� IP アドレスを指定���。"
 
-#: ../clients/common/settings-docs.c.in:377
+#: ../clients/common/settings-docs.h.in:383
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr "指定��場���親インターフェース����親接続� UUID を指定���。"
 
-#: ../clients/common/settings-docs.c.in:378
+#: ../clients/common/settings-docs.h.in:384
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "ARP プロキシーをオン��る����を指定���"
 
-#: ../clients/common/settings-docs.c.in:379
+#: ../clients/common/settings-docs.h.in:385
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
@@ -9044,11 +9315,11 @@ msgstr ""
 "パケット�使用�るユニキャスト�宛先 IP アドレス�����加�るマル�キャス"
 "ト IP アドレスを指定���。"
 
-#: ../clients/common/settings-docs.c.in:380
+#: ../clients/common/settings-docs.h.in:386
 msgid "Specifies whether route short circuit is turned on."
 msgstr "ルート�ショートサーキット�オン�����る����を指定���。"
 
-#: ../clients/common/settings-docs.c.in:381
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -9056,7 +9327,7 @@ msgstr ""
 "リモート VXLAN �トン�ルエンド�イント�接続�る最大 UDP ソース�ートを指定"
 "���。"
 
-#: ../clients/common/settings-docs.c.in:382
+#: ../clients/common/settings-docs.h.in:388
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
@@ -9064,15 +9335,15 @@ msgstr ""
 "リモート� VXLAN トン�ルエンド�イント�接続�る���最� UDP ソース�ート"
 "を指定���。"
 
-#: ../clients/common/settings-docs.c.in:383
+#: ../clients/common/settings-docs.h.in:389
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "�信パケット�使用�る TOS 値を指定���。"
 
-#: ../clients/common/settings-docs.c.in:384
+#: ../clients/common/settings-docs.h.in:390
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr "�信パケット�使用�る生存時間�値を使用���。"
 
-#: ../clients/common/settings-docs.c.in:385
+#: ../clients/common/settings-docs.h.in:391
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
@@ -9082,7 +9353,7 @@ msgstr ""
 "�。��プロパティー�デ�イス� MAC アドレスを変更���ん (MAC スプーフィン"
 "グ���知られ����)。�推奨: 1"
 
-#: ../clients/common/settings-docs.c.in:387
+#: ../clients/common/settings-docs.h.in:393
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
@@ -9090,21 +9361,21 @@ msgstr ""
 "��接続�使用�る WiMAX �ットワーク��ットワークサービスプロ�イダー "
 "(NSP) �。�推奨: 1"
 
-#: ../clients/nm-online.c:91
+#: ../clients/nm-online.c:89
 msgid "Connecting"
 msgstr "接続中"
 
-#: ../clients/nm-online.c:189
+#: ../clients/nm-online.c:187
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr "エラー: NMClient オブジェクト�作��タイムアウト\n"
 
-#: ../clients/nm-online.c:209
+#: ../clients/nm-online.c:207
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "エラー: NMClient オブジェクトを作�����ん���: %s\n"
 
-#: ../clients/nm-online.c:235
+#: ../clients/nm-online.c:233
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
@@ -9112,35 +9383,35 @@ msgstr ""
 "接続を待機�る時間を秒���指定�る (オプション���場��デフォルト値� "
 "30)"
 
-#: ../clients/nm-online.c:236
+#: ../clients/nm-online.c:234
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "NetworkManager �実行中���接続中���場��直��終了���"
 
-#: ../clients/nm-online.c:237
+#: ../clients/nm-online.c:235
 msgid "Don't print anything"
 msgstr "出力を抑制�る"
 
-#: ../clients/nm-online.c:238
+#: ../clients/nm-online.c:236
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "接続�代�り� NetworkManager �起動を待機���"
 
-#: ../clients/nm-online.c:260
+#: ../clients/nm-online.c:256
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr ""
 "NetworkManager �より�スタートアップ�ットワーク接続�アクティベート�完了�"
 "れる�を待機���。"
 
-#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
+#: ../clients/nm-online.c:263 ../clients/nm-online.c:269
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr ""
 "無効�オプション��。--help を使用��有効�オプション�一覧を確������"
 "�。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:430
+#: ../clients/tui/newt/nmt-newt-utils.c:177 ../clients/tui/nmt-editor.c:429
 #: ../clients/tui/nmt-password-dialog.c:174
 #: ../clients/tui/nmt-route-editor.c:122 ../clients/tui/nmtui-hostname.c:69
-#: ../clients/tui/nmtui.c:136
+#: ../clients/tui/nmtui.c:134
 msgid "OK"
 msgstr "OK"
 
@@ -9150,137 +9421,127 @@ msgstr "OK"
 msgid "Could not create temporary file: %s"
 msgstr "一時ファイルを作�����ん���: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:365
+#: ../clients/tui/newt/nmt-newt-utils.c:363
 #, c-format
 msgid "Editor failed: %s"
 msgstr "エディタ�失敗����: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:373
-#, c-format
-msgid "Editor failed with status %d"
-msgstr "エディター�ステータス %d �失敗����"
-
-#: ../clients/tui/newt/nmt-newt-utils.c:375
-#, c-format
-msgid "Editor failed with signal %d"
-msgstr "エディター�シグナル %d �失敗����"
-
-#: ../clients/tui/newt/nmt-newt-utils.c:379
+#: ../clients/tui/newt/nmt-newt-utils.c:369
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "ファイル��読�込������ん���: %s"
 
-#: ../clients/tui/nm-editor-utils.c:146 ../libnm-glib/nm-device.c:1821
-#: ../libnm/nm-device.c:1521
+#: ../clients/tui/nm-editor-utils.c:144 ../libnm-glib/nm-device.c:1820
+#: ../libnm/nm-device.c:1303
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/tui/nm-editor-utils.c:150
+#: ../clients/tui/nm-editor-utils.c:148
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:154 ../libnm-glib/nm-device.c:1823
-#: ../libnm/nm-device.c:1523
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-glib/nm-device.c:1822
+#: ../libnm/nm-device.c:1305
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/tui/nm-editor-utils.c:158
+#: ../clients/tui/nm-editor-utils.c:156
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:2114
-#: ../libnm-glib/nm-device.c:1833 ../libnm/nm-device.c:1539
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm-core/nm-connection.c:2103
+#: ../libnm-glib/nm-device.c:1832 ../libnm/nm-device.c:1321
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:167
+#: ../clients/tui/nm-editor-utils.c:165
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:172 ../libnm-glib/nm-device.c:1831
-#: ../libnm/nm-device.c:1537
+#: ../clients/tui/nm-editor-utils.c:170 ../libnm-glib/nm-device.c:1830
+#: ../libnm/nm-device.c:1319
 msgid "Mobile Broadband"
 msgstr "モ�イルブロード�ンド"
 
-#: ../clients/tui/nm-editor-utils.c:175
+#: ../clients/tui/nm-editor-utils.c:173
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "モ�イルブロード�ンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:181 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nm-editor-utils.c:179 ../clients/tui/nmt-page-dsl.c:62
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:185
+#: ../clients/tui/nm-editor-utils.c:183
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:2106
-#: ../libnm-glib/nm-device.c:1835 ../libnm-util/nm-connection.c:1626
-#: ../libnm/nm-device.c:1541
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4563
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2095
+#: ../libnm-glib/nm-device.c:1834 ../libnm-util/nm-connection.c:1623
+#: ../libnm/nm-device.c:1323
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4594
 msgid "Bond"
 msgstr "ボンド"
 
-#: ../clients/tui/nm-editor-utils.c:194
+#: ../clients/tui/nm-editor-utils.c:192
 #, c-format
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:2110
-#: ../libnm-glib/nm-device.c:1839 ../libnm-util/nm-connection.c:1630
-#: ../libnm/nm-device.c:1545
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4899
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2099
+#: ../libnm-glib/nm-device.c:1838 ../libnm-util/nm-connection.c:1627
+#: ../libnm/nm-device.c:1327
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4930
 msgid "Bridge"
 msgstr "ブリッジ"
 
-#: ../clients/tui/nm-editor-utils.c:204
+#: ../clients/tui/nm-editor-utils.c:202
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:2108
-#: ../libnm-glib/nm-device.c:1837 ../libnm-util/nm-connection.c:1628
-#: ../libnm/nm-device.c:1543
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4666
+#: ../clients/tui/nm-editor-utils.c:206 ../libnm-core/nm-connection.c:2097
+#: ../libnm-glib/nm-device.c:1836 ../libnm-util/nm-connection.c:1625
+#: ../libnm/nm-device.c:1325
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4697
 msgid "Team"
 msgstr "team "
 
-#: ../clients/tui/nm-editor-utils.c:213
+#: ../clients/tui/nm-editor-utils.c:211
 #, c-format
 msgid "Team connection %d"
 msgstr "team 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:82
-#: ../libnm-core/nm-connection.c:2112 ../libnm-glib/nm-device.c:1841
-#: ../libnm-util/nm-connection.c:1632 ../libnm/nm-device.c:1547
+#: ../clients/tui/nm-editor-utils.c:215 ../clients/tui/nmt-page-vlan.c:82
+#: ../libnm-core/nm-connection.c:2101 ../libnm-glib/nm-device.c:1840
+#: ../libnm-util/nm-connection.c:1629 ../libnm/nm-device.c:1329
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:221
+#: ../clients/tui/nm-editor-utils.c:219
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:225 ../clients/tui/nmt-page-ip-tunnel.c:136
+#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-ip-tunnel.c:136
 msgid "IP tunnel"
 msgstr "IP トン�ル"
 
-#: ../clients/tui/nm-editor-utils.c:229
+#: ../clients/tui/nm-editor-utils.c:227
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP トン�ル接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:244
+#: ../clients/tui/nm-editor-utils.c:242
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 接続 %d"
 
-#: ../clients/tui/nmt-device-entry.c:370
+#: ../clients/tui/nmt-device-entry.c:368
 msgid "Select..."
 msgstr "�択..."
 
@@ -9295,7 +9556,7 @@ msgid "Edit..."
 msgstr "編集..."
 
 #: ../clients/tui/nmt-edit-connection-list.c:116
-#: ../clients/tui/nmtui-edit.c:531
+#: ../clients/tui/nmtui-edit.c:529
 msgid "Delete"
 msgstr "削除"
 
@@ -9321,40 +9582,40 @@ msgstr "無効�接続 '%s' �エディターを作�����ん���
 msgid "Edit Connection"
 msgstr "接続�編集"
 
-#: ../clients/tui/nmt-editor.c:174
+#: ../clients/tui/nmt-editor.c:173
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "接続を�存����ん: %s"
 
-#: ../clients/tui/nmt-editor.c:188
+#: ../clients/tui/nmt-editor.c:187
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "新��接続を追加����ん: %s"
 
-#: ../clients/tui/nmt-editor.c:333
+#: ../clients/tui/nmt-editor.c:332
 msgid "Profile name"
 msgstr "プロファイル�"
 
-#: ../clients/tui/nmt-editor.c:344
+#: ../clients/tui/nmt-editor.c:343
 msgid "Ethernet device"
 msgstr "Ethernet デ�イス"
 
-#: ../clients/tui/nmt-editor.c:346
+#: ../clients/tui/nmt-editor.c:345
 msgid "Device"
 msgstr "デ�イス"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:406
+#: ../clients/tui/nmt-editor.c:405
 msgid "Automatically connect"
 msgstr "自動的�接続�る"
 
-#: ../clients/tui/nmt-editor.c:412
+#: ../clients/tui/nmt-editor.c:411
 msgid "Available to all users"
 msgstr "全ユーザー�使用�能"
 
-#: ../clients/tui/nmt-editor.c:427 ../clients/tui/nmt-password-dialog.c:171
-#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:222
-#: ../clients/tui/nmtui-edit.c:530 ../clients/tui/nmtui-hostname.c:67
+#: ../clients/tui/nmt-editor.c:426 ../clients/tui/nmt-password-dialog.c:171
+#: ../clients/tui/nmt-route-editor.c:115 ../clients/tui/nmtui-edit.c:220
+#: ../clients/tui/nmtui-edit.c:528 ../clients/tui/nmtui-hostname.c:67
 msgid "Cancel"
 msgstr "�り消�"
 
@@ -9868,27 +10129,27 @@ msgstr "毎回���パスワード�入力を求�る"
 msgid "Show password"
 msgstr "パスワードを表示�る"
 
-#: ../clients/tui/nmt-route-table.c:191
+#: ../clients/tui/nmt-route-table.c:187
 msgid "Destination"
 msgstr "�信先"
 
-#: ../clients/tui/nmt-route-table.c:191
+#: ../clients/tui/nmt-route-table.c:187
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../clients/tui/nmt-route-table.c:200
+#: ../clients/tui/nmt-route-table.c:196
 msgid "Next Hop"
 msgstr "次�ホップ"
 
-#: ../clients/tui/nmt-route-table.c:208
+#: ../clients/tui/nmt-route-table.c:204
 msgid "Metric"
 msgstr "メトリック"
 
-#: ../clients/tui/nmt-route-table.c:228
+#: ../clients/tui/nmt-route-table.c:224
 msgid "No custom routes are defined."
 msgstr "カスタム�ルート�定義�れ����ん。"
 
-#: ../clients/tui/nmt-slave-list.c:136
+#: ../clients/tui/nmt-slave-list.c:134
 msgid "Select the type of slave connection you wish to add."
 msgstr "追加���スレーブ接続�タイプを�択������。"
 
@@ -9945,12 +10206,12 @@ msgstr "アクティベート"
 msgid "Deactivate"
 msgstr "解除"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
-#: ../clients/tui/nmtui.c:130
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
+#: ../clients/tui/nmtui.c:128
 msgid "Quit"
 msgstr "終了"
 
-#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:120
+#: ../clients/tui/nmtui-connect.c:445 ../clients/tui/nmtui-edit.c:118
 msgid "Back"
 msgstr "戻る"
 
@@ -9963,15 +10224,15 @@ msgstr "��よ��接続 '%s' ��り��ん"
 msgid "Connection is already active"
 msgstr "接続����アクティブ�������"
 
-#: ../clients/tui/nmtui-edit.c:230
+#: ../clients/tui/nmtui-edit.c:228
 msgid "Create"
 msgstr "作�"
 
-#: ../clients/tui/nmtui-edit.c:372
+#: ../clients/tui/nmtui-edit.c:370
 msgid "Select the type of connection you wish to create."
 msgstr "作����接続タイプを�択������。"
 
-#: ../clients/tui/nmtui-edit.c:380
+#: ../clients/tui/nmtui-edit.c:378
 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."
@@ -9979,21 +10240,21 @@ msgstr ""
 "VPN �作�中�作���� VPN 接続�一覧�表示�れ��場���切� VPN プラグ"
 "イン�インストール�れ�����能性��り��。"
 
-#: ../clients/tui/nmtui-edit.c:416 ../clients/tui/nmtui-edit.c:432
+#: ../clients/tui/nmtui-edit.c:414 ../clients/tui/nmtui-edit.c:430
 msgid "New Connection"
 msgstr "新��接続"
 
-#: ../clients/tui/nmtui-edit.c:471
+#: ../clients/tui/nmtui-edit.c:469
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "接続を削除����ん: %s"
 
-#: ../clients/tui/nmtui-edit.c:510
+#: ../clients/tui/nmtui-edit.c:508
 #, c-format
 msgid "Could not delete connection '%s': %s"
 msgstr "接続 '%s' を削除����ん���: %s"
 
-#: ../clients/tui/nmtui-edit.c:532
+#: ../clients/tui/nmtui-edit.c:530
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
 msgstr "本当�接続 '%s' を削除��も�����?"
@@ -10017,129 +10278,129 @@ msgstr "ホスト�を '%s' �設定���"
 msgid "Unable to set hostname: %s"
 msgstr "ホスト�を設定����ん: %s"
 
-#: ../clients/tui/nmtui.c:53 ../clients/tui/nmtui.c:56
+#: ../clients/tui/nmtui.c:51 ../clients/tui/nmtui.c:54
 msgid "connection"
 msgstr "接続"
 
-#: ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:52
 msgid "Edit a connection"
 msgstr "接続�編集"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:55
 msgid "Activate a connection"
 msgstr "接続をアクティベート�る"
 
-#: ../clients/tui/nmtui.c:59
+#: ../clients/tui/nmtui.c:57
 msgid "new hostname"
 msgstr "新��ホスト�"
 
-#: ../clients/tui/nmtui.c:60
+#: ../clients/tui/nmtui.c:58
 msgid "Set system hostname"
 msgstr "システム�ホスト�を設定�る"
 
-#: ../clients/tui/nmtui.c:104
+#: ../clients/tui/nmtui.c:102
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:112
+#: ../clients/tui/nmtui.c:110
 msgid "Please select an option"
 msgstr "オプションを�択������"
 
-#: ../clients/tui/nmtui.c:160
+#: ../clients/tui/nmtui.c:158
 msgid "Usage"
 msgstr "使�方"
 
-#: ../clients/tui/nmtui.c:241
+#: ../clients/tui/nmtui.c:239
 msgid "Could not parse arguments"
 msgstr "引数を解�����ん���"
 
-#: ../clients/tui/nmtui.c:251
+#: ../clients/tui/nmtui.c:249
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "NetworkManager �接続����ん���: %s.\n"
 
-#: ../clients/tui/nmtui.c:256
+#: ../clients/tui/nmtui.c:254
 msgid "NetworkManager is not running."
 msgstr "NetworkManager �実行�����ん。"
 
-#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:131
+#: ../libnm-core/crypto.c:118 ../libnm-util/crypto.c:130
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM キーファイル��終了タグ '%s' ��り��ん。"
 
-#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:143
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM プライベートキーファイル����よ���。"
 
-#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:161
+#: ../libnm-core/crypto.c:148 ../libnm-util/crypto.c:160
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "�正形�� PEM ファイル: Proc-Type �最��タグ���り��ん。"
 
-#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:169
+#: ../libnm-core/crypto.c:156 ../libnm-util/crypto.c:168
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "�正形�� PEM ファイル: �明� Proc-Type タグ '%s' ��。"
 
-#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:179
+#: ../libnm-core/crypto.c:166 ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "�正形�� PEM ファイル: DEK-Info �２�目�タグ���り��ん。"
 
-#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:190
+#: ../libnm-core/crypto.c:177 ../libnm-util/crypto.c:189
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "�正形�� PEM ファイル: DEK-Info タグ内� IV �見��り��ん。"
 
-#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:197
+#: ../libnm-core/crypto.c:184 ../libnm-util/crypto.c:196
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "�正形�� PEM ファイル: DEK-Info タグ内�無効�形�� IV"
 
-#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:212
+#: ../libnm-core/crypto.c:199 ../libnm-util/crypto.c:211
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "�正形�� PEM ファイル: �明�プライベートキー暗�文 '%s'。"
 
-#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:231
+#: ../libnm-core/crypto.c:218 ../libnm-util/crypto.c:230
 #, c-format
 msgid "Could not decode private key."
 msgstr "プライベートキーを復�����ん���。"
 
-#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:283
+#: ../libnm-core/crypto.c:272 ../libnm-util/crypto.c:282
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "期待�れ��る PKCS#8 開始タグ�検出�失敗����。"
 
-#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:291
+#: ../libnm-core/crypto.c:280 ../libnm-util/crypto.c:290
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "期待�れ��る PKCS#8 終了タグ '%s' �検出�失敗����。"
 
-#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:310
+#: ../libnm-core/crypto.c:299 ../libnm-util/crypto.c:309
 msgid "Failed to decode PKCS#8 private key."
 msgstr "PKCS#8 プライベートキー�復��失敗����。"
 
-#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:352
+#: ../libnm-core/crypto.c:341 ../libnm-util/crypto.c:351
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ����長���数��イト数���れ��り��ん。"
 
-#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:366
+#: ../libnm-core/crypto.c:355 ../libnm-util/crypto.c:365
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV � 16進法���数字を�ん����。"
 
 #: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
 #: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
-#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
-#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:405
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:253
 #: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "プライベートキー暗�文 '%s' ��明��。"
 
-#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:516
+#: ../libnm-core/crypto.c:494 ../libnm-util/crypto.c:515
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "プライベートキー�タイプを判定����ん。"
@@ -10149,17 +10410,17 @@ msgstr "プライベートキー�タイプを判定����ん。"
 msgid "Password provided, but key was not encrypted."
 msgstr "パスワード��供�れ�����キー�暗�化�れ��ん���。"
 
-#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:571
+#: ../libnm-core/crypto.c:555 ../libnm-util/crypto.c:570
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "PEM 証明書�終了タグ '%s' ��り��ん���。"
 
-#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:580
+#: ../libnm-core/crypto.c:564 ../libnm-util/crypto.c:579
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "PEM 証明書�終了タグ '%s' ��り��ん���。"
 
-#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:598
+#: ../libnm-core/crypto.c:582 ../libnm-util/crypto.c:597
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "証明書�復��失敗����。"
@@ -10195,47 +10456,47 @@ msgstr "プライベートキーã�®å¾©å�·ã�«å¤±æ•—ã�—ã�¾ã�—ã�Ÿ: 予想外ã�®ä¸�è
 msgid "Failed to decrypt the private key."
 msgstr "プライベートキー�復��失敗����。"
 
-#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:283
+#: ../libnm-core/crypto_gnutls.c:224 ../libnm-util/crypto_gnutls.c:280
 #, 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
+#: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:289
 #, 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
+#: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:329
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "証明書データ��期化�エラー発生: %s"
 
-#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:354
+#: ../libnm-core/crypto_gnutls.c:298 ../libnm-util/crypto_gnutls.c:351
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "証明書をデコード����ん���: %s"
 
-#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:378
+#: ../libnm-core/crypto_gnutls.c:326 ../libnm-util/crypto_gnutls.c:375
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12 デコーダーを�期化����ん: %s"
 
-#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:391
+#: ../libnm-core/crypto_gnutls.c:339 ../libnm-util/crypto_gnutls.c:388
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルをデコード����ん: %s"
 
-#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:403
+#: ../libnm-core/crypto_gnutls.c:351 ../libnm-util/crypto_gnutls.c:400
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルを確証����ん: %s"
 
-#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:431
+#: ../libnm-core/crypto_gnutls.c:383 ../libnm-util/crypto_gnutls.c:428
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "PKCS#8 デコーダーを�期化����ん���: %s"
 
-#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:454
+#: ../libnm-core/crypto_gnutls.c:406 ../libnm-util/crypto_gnutls.c:451
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "PKCS#8 ファイルをデコード����ん���: %s"
@@ -10356,246 +10617,240 @@ msgstr "�明�設定�"
 msgid "duplicate setting name"
 msgstr "�複�る設定�"
 
-#: ../libnm-core/nm-connection.c:1233
+#: ../libnm-core/nm-connection.c:1230
 msgid "setting not found"
 msgstr "設定�見��り��ん"
 
-#: ../libnm-core/nm-connection.c:1300
+#: ../libnm-core/nm-connection.c:1297
 msgid "setting not allowed in slave connection"
 msgstr "設定�スレーブ接続�許��れ��ん"
 
-#: ../libnm-core/nm-connection.c:1316
+#: ../libnm-core/nm-connection.c:1313
 msgid "setting is required for non-slave connections"
 msgstr "設定��スレーブ接続�必���"
 
-#: ../libnm-core/nm-connection.c:1412
+#: ../libnm-core/nm-connection.c:1409
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を確��る���予期���障害"
 
-#: ../libnm-core/nm-connection.c:1454
+#: ../libnm-core/nm-connection.c:1451
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を正�化�る���予期���障害"
 
-#: ../libnm-core/nm-connection.c:1973 ../libnm-core/nm-setting-8021x.c:2881
-#: ../libnm-core/nm-setting-8021x.c:2898 ../libnm-core/nm-setting-8021x.c:2929
-#: ../libnm-core/nm-setting-8021x.c:2946 ../libnm-core/nm-setting-8021x.c:2988
-#: ../libnm-core/nm-setting-8021x.c:3000 ../libnm-core/nm-setting-8021x.c:3018
-#: ../libnm-core/nm-setting-8021x.c:3030 ../libnm-core/nm-setting-8021x.c:3054
-#: ../libnm-core/nm-setting-8021x.c:3235 ../libnm-core/nm-setting-adsl.c:189
+#: ../libnm-core/nm-connection.c:1962 ../libnm-core/nm-setting-8021x.c:2869
+#: ../libnm-core/nm-setting-8021x.c:2886 ../libnm-core/nm-setting-8021x.c:2917
+#: ../libnm-core/nm-setting-8021x.c:2934 ../libnm-core/nm-setting-8021x.c:2976
+#: ../libnm-core/nm-setting-8021x.c:2988 ../libnm-core/nm-setting-8021x.c:3006
+#: ../libnm-core/nm-setting-8021x.c:3018 ../libnm-core/nm-setting-8021x.c:3042
+#: ../libnm-core/nm-setting-8021x.c:3221 ../libnm-core/nm-setting-adsl.c:189
 #: ../libnm-core/nm-setting-bluetooth.c:138
 #: ../libnm-core/nm-setting-bluetooth.c:196
 #: ../libnm-core/nm-setting-bluetooth.c:210 ../libnm-core/nm-setting-cdma.c:159
-#: ../libnm-core/nm-setting-connection.c:894
-#: ../libnm-core/nm-setting-connection.c:937
-#: ../libnm-core/nm-setting-connection.c:1066
-#: ../libnm-core/nm-setting-ip-config.c:2514
-#: ../libnm-core/nm-setting-ip-tunnel.c:352
+#: ../libnm-core/nm-setting-connection.c:912
+#: ../libnm-core/nm-setting-connection.c:955
+#: ../libnm-core/nm-setting-connection.c:1097
+#: ../libnm-core/nm-setting-ip-config.c:2484
+#: ../libnm-core/nm-setting-ip-tunnel.c:373
 #: ../libnm-core/nm-setting-olpc-mesh.c:120
-#: ../libnm-core/nm-setting-ovs-patch.c:95 ../libnm-core/nm-setting-pppoe.c:161
-#: ../libnm-core/nm-setting-vpn.c:518 ../libnm-core/nm-setting-vxlan.c:360
+#: ../libnm-core/nm-setting-ovs-patch.c:94 ../libnm-core/nm-setting-pppoe.c:161
+#: ../libnm-core/nm-setting-vpn.c:489 ../libnm-core/nm-setting-vxlan.c:360
 #: ../libnm-core/nm-setting-wimax.c:126
-#: ../libnm-core/nm-setting-wireless-security.c:900
-#: ../libnm-core/nm-setting-wireless.c:750 ../libnm-util/nm-setting.c:1357
-#: ../libnm-util/nm-setting.c:1376 ../libnm-util/nm-setting.c:1394
-#: ../libnm-util/nm-setting-8021x.c:2325 ../libnm-util/nm-setting-8021x.c:2342
-#: ../libnm-util/nm-setting-8021x.c:2383 ../libnm-util/nm-setting-8021x.c:2400
-#: ../libnm-util/nm-setting-8021x.c:2452 ../libnm-util/nm-setting-8021x.c:2464
-#: ../libnm-util/nm-setting-8021x.c:2482 ../libnm-util/nm-setting-8021x.c:2494
-#: ../libnm-util/nm-setting-8021x.c:2518 ../libnm-util/nm-setting-8021x.c:2680
-#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:142
-#: ../libnm-util/nm-setting-bluetooth.c:160 ../libnm-util/nm-setting-cdma.c:162
-#: ../libnm-util/nm-setting-connection.c:768
-#: ../libnm-util/nm-setting-connection.c:784
-#: ../libnm-util/nm-setting-connection.c:845
+#: ../libnm-core/nm-setting-wireless-security.c:920
+#: ../libnm-core/nm-setting-wireless.c:752 ../libnm-util/nm-setting.c:1355
+#: ../libnm-util/nm-setting.c:1374 ../libnm-util/nm-setting.c:1392
+#: ../libnm-util/nm-setting-8021x.c:2324 ../libnm-util/nm-setting-8021x.c:2341
+#: ../libnm-util/nm-setting-8021x.c:2382 ../libnm-util/nm-setting-8021x.c:2399
+#: ../libnm-util/nm-setting-8021x.c:2451 ../libnm-util/nm-setting-8021x.c:2463
+#: ../libnm-util/nm-setting-8021x.c:2481 ../libnm-util/nm-setting-8021x.c:2493
+#: ../libnm-util/nm-setting-8021x.c:2517 ../libnm-util/nm-setting-8021x.c:2677
+#: ../libnm-util/nm-setting-adsl.c:209 ../libnm-util/nm-setting-bluetooth.c:141
+#: ../libnm-util/nm-setting-bluetooth.c:159 ../libnm-util/nm-setting-cdma.c:161
+#: ../libnm-util/nm-setting-connection.c:765
+#: ../libnm-util/nm-setting-connection.c:781
+#: ../libnm-util/nm-setting-connection.c:842
 #: ../libnm-util/nm-setting-ip4-config.c:869
-#: ../libnm-util/nm-setting-ip6-config.c:833
-#: ../libnm-util/nm-setting-ip6-config.c:899
+#: ../libnm-util/nm-setting-ip6-config.c:831
+#: ../libnm-util/nm-setting-ip6-config.c:897
 #: ../libnm-util/nm-setting-olpc-mesh.c:123
-#: ../libnm-util/nm-setting-pppoe.c:163 ../libnm-util/nm-setting-vpn.c:423
-#: ../libnm-util/nm-setting-wimax.c:150
-#: ../libnm-util/nm-setting-wireless-security.c:891
-#: ../libnm-util/nm-setting-wireless.c:769
+#: ../libnm-util/nm-setting-pppoe.c:162 ../libnm-util/nm-setting-vpn.c:422
+#: ../libnm-util/nm-setting-wimax.c:149
+#: ../libnm-util/nm-setting-wireless-security.c:890
+#: ../libnm-util/nm-setting-wireless.c:768
 msgid "property is missing"
-msgstr "プロパティ��り��ん"
+msgstr "プロパティー��り��ん"
 
-#: ../libnm-core/nm-connection.c:2117
+#: ../libnm-core/nm-connection.c:2106
 msgid "IP Tunnel"
 msgstr "IP トン�ル"
 
-#: ../libnm-core/nm-dbus-utils.c:188
+#: ../libnm-core/nm-dbus-utils.c:189
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "メソッド�タイプ '%s' を返������'%s' を想定������"
 
-#: ../libnm-core/nm-keyfile-reader.c:144
+#: ../libnm-core/nm-keyfile.c:156
 msgid "ignoring missing number"
 msgstr "�明�数字を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:152
+#: ../libnm-core/nm-keyfile.c:164
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "無効�数字 '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:173
+#: ../libnm-core/nm-keyfile.c:185
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "無効� %s アドレスを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:215
+#: ../libnm-core/nm-keyfile.c:227
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "無効�ゲートウェイ '%s' (%s ルート用) を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:236
+#: ../libnm-core/nm-keyfile.c:248
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "無効� %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:362
+#: ../libnm-core/nm-keyfile.c:373
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "アドレス %c �予期���文字 '%s': '%s' (�置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:372
+#: ../libnm-core/nm-keyfile.c:383
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "%c �予期���文字 '%s': '%s' (�置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:381
+#: ../libnm-core/nm-keyfile.c:392
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "%c �予期���プレフィックス長�文字 '%s': '%s' (�置 %td)"
 
-#: ../libnm-core/nm-keyfile-reader.c:392
+#: ../libnm-core/nm-keyfile.c:403
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "値 %s �後�ガベッジ: '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:398
+#: ../libnm-core/nm-keyfile.c:409
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "値 %s �後��推奨�セミコロン: '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:413
+#: ../libnm-core/nm-keyfile.c:424
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' �無効�プレフィックス長 (デフォルト値� %d)"
 
-#: ../libnm-core/nm-keyfile-reader.c:420
+#: ../libnm-core/nm-keyfile.c:431
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' ��明�プレフィックス長 (デフォルト値� %d)"
 
-#: ../libnm-core/nm-keyfile-reader.c:554
-#, c-format
-msgid "ignoring invalid DNS server IPv4 address '%s'"
-msgstr "無効� DNS サー�ー IPv4 アドレス '%s' を無視"
-
-#: ../libnm-core/nm-keyfile-reader.c:593
+#: ../libnm-core/nm-keyfile.c:695
 #, c-format
-msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "無効� DNS サー�ー IPv6 アドレス '%s' を無視"
+msgid "ignoring invalid DNS server IPv%c address '%s'"
+msgstr "無効� DNS サー�ー IPv%c アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:687 ../libnm-core/nm-keyfile-reader.c:1721
+#: ../libnm-core/nm-keyfile.c:791 ../libnm-core/nm-keyfile.c:2541
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "無効��イト�素 '%d' (0〜255 以外) を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:698
+#: ../libnm-core/nm-keyfile.c:802
 msgid "ignoring invalid MAC address"
 msgstr "有効� MAC アドレスを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:935
+#: ../libnm-core/nm-keyfile.c:1039
 msgid "ignoring invalid SSID"
 msgstr "無効� SSID を無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:951
+#: ../libnm-core/nm-keyfile.c:1055
 msgid "ignoring invalid raw password"
 msgstr "無効�生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile-reader.c:1026
-#: ../libnm-core/nm-keyfile-reader.c:1202
-#, c-format
-msgid "certificate or key file '%s' does not exist"
-msgstr "証明書���キーファイル '%s' �存在���ん"
+#: ../libnm-core/nm-keyfile.c:1193
+msgid "invalid key/cert value"
+msgstr "無効�キー/証明書値"
 
-#: ../libnm-core/nm-keyfile-reader.c:1031
+#: ../libnm-core/nm-keyfile.c:1204
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "無効�キー/証明書値パス \"%s\""
 
-#: ../libnm-core/nm-keyfile-reader.c:1041
+#: ../libnm-core/nm-keyfile.c:1220 ../libnm-core/nm-keyfile.c:1303
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr "証明書���キーファイル '%s' �存在���ん"
+
+#: ../libnm-core/nm-keyfile.c:1229
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "無効� PKCS#11 URI \"%s\""
 
-#: ../libnm-core/nm-keyfile-reader.c:1079
+#: ../libnm-core/nm-keyfile.c:1273
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "無効�キー/証明書値 data:;base64, � base64 ���り��ん"
 
-#: ../libnm-core/nm-keyfile-reader.c:1092
+#: ../libnm-core/nm-keyfile.c:1282
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "無効�キー/証明書値 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile-reader.c:1239
+#: ../libnm-core/nm-keyfile.c:1315
 msgid "invalid key/cert value is not a valid blob"
 msgstr "無効�キー/証明書値��有効�ブロブ���り��ん"
 
-#: ../libnm-core/nm-keyfile-reader.c:1244
-msgid "invalid key/cert value"
-msgstr "無効�キー/証明書値"
-
-#: ../libnm-core/nm-keyfile-reader.c:1291
+#: ../libnm-core/nm-keyfile.c:1365
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "無効�パリティー値 '%s'"
 
-#: ../libnm-core/nm-keyfile-reader.c:1309
+#: ../libnm-core/nm-keyfile.c:1383
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "無効� team 設定を無視: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1352
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1426
+#, c-format
 msgid "invalid qdisc: %s"
-msgstr "無効� IP アドレス: %s"
+msgstr "無効� qdisc: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1400
-#, fuzzy, c-format
+#: ../libnm-core/nm-keyfile.c:1474
+#, c-format
 msgid "invalid tfilter: %s"
-msgstr "無効�プレフィックス %s"
+msgstr "無効� tfilter: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1622
+#: ../libnm-core/nm-keyfile.c:2450
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "設定値�ロード中�エラー�発生����: %s"
 
-#: ../libnm-core/nm-keyfile-reader.c:1654
+#: ../libnm-core/nm-keyfile.c:2475
 #, c-format
 msgid "invalid negative value (%i)"
 msgstr "無効�負�値 (%i)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1675
+#: ../libnm-core/nm-keyfile.c:2496
 #, c-format
 msgid "invalid char value (%i)"
 msgstr "無効� char 値 (%i)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1698
+#: ../libnm-core/nm-keyfile.c:2518
 #, c-format
 msgid "invalid int64 value (%s)"
 msgstr "無効� int64 値 (%s)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1757
+#: ../libnm-core/nm-keyfile.c:2577
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
 msgstr "大���る FLAGS プロパティー '%s' (%llu)"
 
-#: ../libnm-core/nm-keyfile-reader.c:1770
+#: ../libnm-core/nm-keyfile.c:2590
 #, c-format
 msgid "unhandled setting property type '%s'"
 msgstr "プロパティータイプ '%s' �設定�未処�"
 
-#: ../libnm-core/nm-keyfile-reader.c:1801
+#: ../libnm-core/nm-keyfile.c:2619
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "無効�設定� '%s'"
@@ -10625,130 +10880,130 @@ msgid "CA certificate must be in X.509 format"
 msgstr "CA 証明書� X.509 形���る必���り��"
 
 #: ../libnm-core/nm-setting-8021x.c:1158 ../libnm-core/nm-setting-8021x.c:1512
-#: ../libnm-core/nm-setting-8021x.c:1923 ../libnm-util/nm-setting-8021x.c:957
-#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1543
+#: ../libnm-core/nm-setting-8021x.c:1922 ../libnm-util/nm-setting-8021x.c:957
+#: ../libnm-util/nm-setting-8021x.c:1220 ../libnm-util/nm-setting-8021x.c:1542
 msgid "invalid certificate format"
 msgstr "無効�証明書形�"
 
-#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
+#: ../libnm-core/nm-setting-8021x.c:2274 ../libnm-util/nm-setting-8021x.c:1811
 msgid "invalid private key"
 msgstr "無効�プライベートキー"
 
-#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
+#: ../libnm-core/nm-setting-8021x.c:2616 ../libnm-util/nm-setting-8021x.c:2122
 msgid "invalid phase2 private key"
 msgstr "無効� phase2 プライベートキー"
 
-#: ../libnm-core/nm-setting-8021x.c:2888 ../libnm-core/nm-setting-8021x.c:2905
-#: ../libnm-core/nm-setting-8021x.c:2936 ../libnm-core/nm-setting-8021x.c:2953
-#: ../libnm-core/nm-setting-8021x.c:2994 ../libnm-core/nm-setting-8021x.c:3006
-#: ../libnm-core/nm-setting-8021x.c:3024 ../libnm-core/nm-setting-8021x.c:3036
-#: ../libnm-core/nm-setting-8021x.c:3061 ../libnm-core/nm-setting-adsl.c:196
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2893
+#: ../libnm-core/nm-setting-8021x.c:2924 ../libnm-core/nm-setting-8021x.c:2941
+#: ../libnm-core/nm-setting-8021x.c:2982 ../libnm-core/nm-setting-8021x.c:2994
+#: ../libnm-core/nm-setting-8021x.c:3012 ../libnm-core/nm-setting-8021x.c:3024
+#: ../libnm-core/nm-setting-8021x.c:3049 ../libnm-core/nm-setting-adsl.c:196
 #: ../libnm-core/nm-setting-cdma.c:166 ../libnm-core/nm-setting-cdma.c:175
-#: ../libnm-core/nm-setting-connection.c:901
-#: ../libnm-core/nm-setting-connection.c:949 ../libnm-core/nm-setting-gsm.c:299
+#: ../libnm-core/nm-setting-connection.c:919
+#: ../libnm-core/nm-setting-connection.c:967 ../libnm-core/nm-setting-gsm.c:299
 #: ../libnm-core/nm-setting-gsm.c:356 ../libnm-core/nm-setting-gsm.c:393
-#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2521
+#: ../libnm-core/nm-setting-gsm.c:402 ../libnm-core/nm-setting-ip-config.c:2491
 #: ../libnm-core/nm-setting-ip4-config.c:198
 #: ../libnm-core/nm-setting-ip4-config.c:205
 #: ../libnm-core/nm-setting-pppoe.c:168 ../libnm-core/nm-setting-pppoe.c:177
-#: ../libnm-core/nm-setting-vpn.c:527 ../libnm-core/nm-setting-vpn.c:537
+#: ../libnm-core/nm-setting-vpn.c:498 ../libnm-core/nm-setting-vpn.c:508
 #: ../libnm-core/nm-setting-wimax.c:135
-#: ../libnm-core/nm-setting-wireless-security.c:930
-#: ../libnm-core/nm-setting-wireless-security.c:954
-#: ../libnm-core/nm-setting.c:1118 ../libnm-util/nm-setting-8021x.c:2332
-#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2390
-#: ../libnm-util/nm-setting-8021x.c:2407 ../libnm-util/nm-setting-8021x.c:2458
-#: ../libnm-util/nm-setting-8021x.c:2470 ../libnm-util/nm-setting-8021x.c:2488
-#: ../libnm-util/nm-setting-8021x.c:2500 ../libnm-util/nm-setting-8021x.c:2525
-#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:169
-#: ../libnm-util/nm-setting-cdma.c:178
-#: ../libnm-util/nm-setting-connection.c:775
-#: ../libnm-util/nm-setting-connection.c:852 ../libnm-util/nm-setting-gsm.c:282
-#: ../libnm-util/nm-setting-gsm.c:339 ../libnm-util/nm-setting-ip4-config.c:934
+#: ../libnm-core/nm-setting-wireless-security.c:950
+#: ../libnm-core/nm-setting-wireless-security.c:974
+#: ../libnm-core/nm-setting.c:1116 ../libnm-util/nm-setting-8021x.c:2331
+#: ../libnm-util/nm-setting-8021x.c:2348 ../libnm-util/nm-setting-8021x.c:2389
+#: ../libnm-util/nm-setting-8021x.c:2406 ../libnm-util/nm-setting-8021x.c:2457
+#: ../libnm-util/nm-setting-8021x.c:2469 ../libnm-util/nm-setting-8021x.c:2487
+#: ../libnm-util/nm-setting-8021x.c:2499 ../libnm-util/nm-setting-8021x.c:2524
+#: ../libnm-util/nm-setting-adsl.c:216 ../libnm-util/nm-setting-cdma.c:168
+#: ../libnm-util/nm-setting-cdma.c:177
+#: ../libnm-util/nm-setting-connection.c:772
+#: ../libnm-util/nm-setting-connection.c:849 ../libnm-util/nm-setting-gsm.c:281
+#: ../libnm-util/nm-setting-gsm.c:338 ../libnm-util/nm-setting-ip4-config.c:934
 #: ../libnm-util/nm-setting-ip4-config.c:943
-#: ../libnm-util/nm-setting-pppoe.c:170 ../libnm-util/nm-setting-pppoe.c:179
-#: ../libnm-util/nm-setting-vpn.c:432 ../libnm-util/nm-setting-vpn.c:442
-#: ../libnm-util/nm-setting-wimax.c:159
-#: ../libnm-util/nm-setting-wireless-security.c:921
-#: ../libnm-util/nm-setting-wireless-security.c:945
+#: ../libnm-util/nm-setting-pppoe.c:169 ../libnm-util/nm-setting-pppoe.c:178
+#: ../libnm-util/nm-setting-vpn.c:431 ../libnm-util/nm-setting-vpn.c:441
+#: ../libnm-util/nm-setting-wimax.c:158
+#: ../libnm-util/nm-setting-wireless-security.c:920
+#: ../libnm-util/nm-setting-wireless-security.c:944
 msgid "property is empty"
-msgstr "プロパティ�空��"
+msgstr "プロパティー�空��"
 
-#: ../libnm-core/nm-setting-8021x.c:2918 ../libnm-core/nm-setting-8021x.c:2966
-#: ../libnm-util/nm-setting-8021x.c:2360 ../libnm-util/nm-setting-8021x.c:2372
-#: ../libnm-util/nm-setting-8021x.c:2418 ../libnm-util/nm-setting-8021x.c:2430
+#: ../libnm-core/nm-setting-8021x.c:2906 ../libnm-core/nm-setting-8021x.c:2954
+#: ../libnm-util/nm-setting-8021x.c:2359 ../libnm-util/nm-setting-8021x.c:2371
+#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429
 #, 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:3197
+#: ../libnm-core/nm-setting-8021x.c:3183
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "証明書�無効��: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:3207
+#: ../libnm-core/nm-setting-8021x.c:3193
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr "証明書� PKCS#11 トークン���場���パスワード�サ�ート�れ��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:3244
+#: ../libnm-core/nm-setting-8021x.c:3230
 #: ../libnm-core/nm-setting-bluetooth.c:123
 #: ../libnm-core/nm-setting-infiniband.c:192
 #: ../libnm-core/nm-setting-infiniband.c:207
 #: ../libnm-core/nm-setting-ip4-config.c:189
-#: ../libnm-core/nm-setting-ip6-config.c:215
-#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-ip6-config.c:237
+#: ../libnm-core/nm-setting-ip6-config.c:248
 #: ../libnm-core/nm-setting-olpc-mesh.c:149
 #: ../libnm-core/nm-setting-wimax.c:144 ../libnm-core/nm-setting-wired.c:678
 #: ../libnm-core/nm-setting-wired.c:688
-#: ../libnm-core/nm-setting-wireless-security.c:973
-#: ../libnm-core/nm-setting-wireless-security.c:982
-#: ../libnm-core/nm-setting-wireless-security.c:991
-#: ../libnm-core/nm-setting-wireless-security.c:1027
-#: ../libnm-core/nm-setting-wireless-security.c:1037
-#: ../libnm-core/nm-setting-wireless-security.c:1060
-#: ../libnm-core/nm-setting-wireless-security.c:1085
-#: ../libnm-core/nm-setting-wireless-security.c:1112
-#: ../libnm-core/nm-setting-wireless-security.c:1151
-#: ../libnm-core/nm-setting-wireless.c:811
-#: ../libnm-core/nm-setting-wireless.c:820
-#: ../libnm-core/nm-setting-wireless.c:831 ../libnm-util/nm-setting.c:1367
-#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1404
-#: ../libnm-util/nm-setting-8021x.c:2655 ../libnm-util/nm-setting-8021x.c:2689
-#: ../libnm-util/nm-setting-bluetooth.c:151
+#: ../libnm-core/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:1002
+#: ../libnm-core/nm-setting-wireless-security.c:1011
+#: ../libnm-core/nm-setting-wireless-security.c:1047
+#: ../libnm-core/nm-setting-wireless-security.c:1057
+#: ../libnm-core/nm-setting-wireless-security.c:1080
+#: ../libnm-core/nm-setting-wireless-security.c:1105
+#: ../libnm-core/nm-setting-wireless-security.c:1132
+#: ../libnm-core/nm-setting-wireless-security.c:1171
+#: ../libnm-core/nm-setting-wireless.c:813
+#: ../libnm-core/nm-setting-wireless.c:822
+#: ../libnm-core/nm-setting-wireless.c:833 ../libnm-util/nm-setting.c:1365
+#: ../libnm-util/nm-setting.c:1383 ../libnm-util/nm-setting.c:1402
+#: ../libnm-util/nm-setting-8021x.c:2652 ../libnm-util/nm-setting-8021x.c:2686
+#: ../libnm-util/nm-setting-bluetooth.c:150
 #: ../libnm-util/nm-setting-infiniband.c:205
 #: ../libnm-util/nm-setting-infiniband.c:221
 #: ../libnm-util/nm-setting-ip4-config.c:925
-#: ../libnm-util/nm-setting-ip6-config.c:890
+#: ../libnm-util/nm-setting-ip6-config.c:888
 #: ../libnm-util/nm-setting-olpc-mesh.c:151
-#: ../libnm-util/nm-setting-wimax.c:168 ../libnm-util/nm-setting-wired.c:658
-#: ../libnm-util/nm-setting-wired.c:667
-#: ../libnm-util/nm-setting-wireless-security.c:964
-#: ../libnm-util/nm-setting-wireless-security.c:973
-#: ../libnm-util/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless-security.c:1018
-#: ../libnm-util/nm-setting-wireless-security.c:1028
-#: ../libnm-util/nm-setting-wireless.c:829
-#: ../libnm-util/nm-setting-wireless.c:838
-#: ../libnm-util/nm-setting-wireless.c:847
+#: ../libnm-util/nm-setting-wimax.c:167 ../libnm-util/nm-setting-wired.c:657
+#: ../libnm-util/nm-setting-wired.c:666
+#: ../libnm-util/nm-setting-wireless-security.c:963
+#: ../libnm-util/nm-setting-wireless-security.c:972
+#: ../libnm-util/nm-setting-wireless-security.c:981
+#: ../libnm-util/nm-setting-wireless-security.c:1017
+#: ../libnm-util/nm-setting-wireless-security.c:1027
+#: ../libnm-util/nm-setting-wireless.c:828
+#: ../libnm-util/nm-setting-wireless.c:837
+#: ../libnm-util/nm-setting-wireless.c:846
 msgid "property is invalid"
-msgstr "プロパティ�無効��"
+msgstr "プロパティー�無効��"
 
-#: ../libnm-core/nm-setting-8021x.c:3269 ../libnm-core/nm-setting-8021x.c:3279
-#: ../libnm-core/nm-setting-8021x.c:3289 ../libnm-core/nm-setting-8021x.c:3308
-#: ../libnm-core/nm-setting-8021x.c:3318 ../libnm-core/nm-setting-adsl.c:208
+#: ../libnm-core/nm-setting-8021x.c:3255 ../libnm-core/nm-setting-8021x.c:3265
+#: ../libnm-core/nm-setting-8021x.c:3275 ../libnm-core/nm-setting-8021x.c:3294
+#: ../libnm-core/nm-setting-8021x.c:3304 ../libnm-core/nm-setting-adsl.c:208
 #: ../libnm-core/nm-setting-adsl.c:220 ../libnm-core/nm-setting-bluetooth.c:151
-#: ../libnm-core/nm-setting-wireless-security.c:909
-#: ../libnm-util/nm-setting-8021x.c:2714 ../libnm-util/nm-setting-8021x.c:2724
-#: ../libnm-util/nm-setting-8021x.c:2734 ../libnm-util/nm-setting-8021x.c:2744
-#: ../libnm-util/nm-setting-8021x.c:2754 ../libnm-util/nm-setting-adsl.c:228
-#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:168
-#: ../libnm-util/nm-setting-wireless-security.c:900
+#: ../libnm-core/nm-setting-wireless-security.c:929
+#: ../libnm-util/nm-setting-8021x.c:2711 ../libnm-util/nm-setting-8021x.c:2721
+#: ../libnm-util/nm-setting-8021x.c:2731 ../libnm-util/nm-setting-8021x.c:2741
+#: ../libnm-util/nm-setting-8021x.c:2751 ../libnm-util/nm-setting-adsl.c:228
+#: ../libnm-util/nm-setting-adsl.c:240 ../libnm-util/nm-setting-bluetooth.c:167
+#: ../libnm-util/nm-setting-wireless-security.c:899
 #, c-format
 msgid "'%s' is not a valid value for the property"
-msgstr "'%s' �有効�プロパティ�値���り��ん"
+msgstr "'%s' �プロパティー�有効�値���り��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:3299
+#: ../libnm-core/nm-setting-8021x.c:3285
 msgid "invalid auth flags"
 msgstr "無効� auth フラグ"
 
@@ -10762,27 +11017,27 @@ msgstr "'%s' 接続�� '%s' ��� '%s' 設定�必���"
 msgid "'%s' connection requires '%s' setting"
 msgstr "'%s' 接続�� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:517
+#: ../libnm-core/nm-setting-bond.c:566 ../libnm-util/nm-setting-bond.c:516
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "無効�オプション '%s'������値 '%s' ��"
 
-#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:536
+#: ../libnm-core/nm-setting-bond.c:591 ../libnm-util/nm-setting-bond.c:535
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "設定��る�� '%s' � '%s' �一�����"
 
-#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:547
+#: ../libnm-core/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:546
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "必須オプション� '%s' ��り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:556
+#: ../libnm-core/nm-setting-bond.c:614 ../libnm-util/nm-setting-bond.c:555
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "'%s' �有効� '%s' �値���り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:569
+#: ../libnm-core/nm-setting-bond.c:628 ../libnm-util/nm-setting-bond.c:568
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "'%s=%s' � '%s > 0' ��互�性��り��ん"
@@ -10792,36 +11047,36 @@ msgstr "'%s=%s' � '%s > 0' ��互�性��り��ん"
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "'%s' � '%s' オプション�無効��: %s"
 
-#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:592
+#: ../libnm-core/nm-setting-bond.c:654 ../libnm-util/nm-setting-bond.c:591
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "'%s' オプション� '%s=%s' �場���り有効��"
 
-#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:605
+#: ../libnm-core/nm-setting-bond.c:667 ../libnm-util/nm-setting-bond.c:604
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "'%s=%s' � '%s' �有効�設定���り��ん"
 
 #: ../libnm-core/nm-setting-bond.c:680 ../libnm-core/nm-setting-bond.c:689
 #: ../libnm-core/nm-setting-bond.c:709 ../libnm-core/nm-setting-bond.c:745
-#: ../libnm-util/nm-setting-bond.c:618 ../libnm-util/nm-setting-bond.c:627
-#: ../libnm-util/nm-setting-bond.c:647 ../libnm-util/nm-setting-bond.c:683
+#: ../libnm-util/nm-setting-bond.c:617 ../libnm-util/nm-setting-bond.c:626
+#: ../libnm-util/nm-setting-bond.c:646 ../libnm-util/nm-setting-bond.c:682
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr ""
 "'%s' オプションを使用�る場���'%s' オプションを設定�る必���り��"
 
-#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:658
+#: ../libnm-core/nm-setting-bond.c:720 ../libnm-util/nm-setting-bond.c:657
 #, c-format
 msgid "'%s' option is empty"
 msgstr "'%s' オプション�空白��"
 
-#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:670
+#: ../libnm-core/nm-setting-bond.c:732 ../libnm-util/nm-setting-bond.c:669
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' � '%s' オプション用�有効� IPv4 アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:697
+#: ../libnm-core/nm-setting-bond.c:760 ../libnm-util/nm-setting-bond.c:696
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "'%s' オプション�モード '%s' ���有効��"
@@ -10842,18 +11097,18 @@ msgid "'%s' option is not valid with mode '%s'"
 msgstr "'%s' オプション��'%s' モード��有効���り��ん。"
 
 #: ../libnm-core/nm-setting-bridge-port.c:127
-#: ../libnm-core/nm-setting-ovs-interface.c:262
+#: ../libnm-core/nm-setting-ovs-interface.c:261
 #: ../libnm-core/nm-setting-ovs-port.c:189
 #: ../libnm-core/nm-setting-ovs-bridge.c:152
-#: ../libnm-core/nm-setting-team-port.c:358
+#: ../libnm-core/nm-setting-team-port.c:357
 #, c-format
 msgid "missing setting"
 msgstr "�明�設定"
 
 #: ../libnm-core/nm-setting-bridge-port.c:138
-#: ../libnm-core/nm-setting-ovs-interface.c:283
+#: ../libnm-core/nm-setting-ovs-interface.c:282
 #: ../libnm-core/nm-setting-ovs-port.c:210
-#: ../libnm-core/nm-setting-team-port.c:369
+#: ../libnm-core/nm-setting-team-port.c:368
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
@@ -10862,15 +11117,15 @@ msgstr ""
 "'%s' 設定�接続���スレーブタイプ� '%s' �設定�る必���り����'%s' "
 "�設定�れ����。"
 
-#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:269
+#: ../libnm-core/nm-setting-bridge.c:231 ../libnm-util/nm-setting-bridge.c:268
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "値 '%d' � <%d-%d> �範囲外��"
 
 #: ../libnm-core/nm-setting-bridge.c:248 ../libnm-core/nm-setting-wired.c:652
 #: ../libnm-core/nm-setting-wired.c:714 ../libnm-core/nm-setting-wired.c:756
-#: ../libnm-util/nm-setting-bridge.c:286 ../libnm-util/nm-setting-wired.c:633
-#: ../libnm-util/nm-setting-wired.c:691
+#: ../libnm-util/nm-setting-bridge.c:285 ../libnm-util/nm-setting-wired.c:632
+#: ../libnm-util/nm-setting-wired.c:690
 msgid "is not a valid MAC address"
 msgstr "�有効� MAC アドレス���り��ん"
 
@@ -10878,61 +11133,66 @@ msgstr "�有効� MAC アドレス���り��ん"
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "マスク���ビット 0 (STP)�1 (MAC)���� 2 (LACP) を設定����ん"
 
-#: ../libnm-core/nm-setting-connection.c:871
+#: ../libnm-core/nm-setting-connection.c:889
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "タイプ '%s' �接続��設定�必���"
 
-#: ../libnm-core/nm-setting-connection.c:910
-#: ../libnm-util/nm-setting-connection.c:791
+#: ../libnm-core/nm-setting-connection.c:928
+#: ../libnm-util/nm-setting-connection.c:788
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' �有効� UUID ���り��ん"
 
-#: ../libnm-core/nm-setting-connection.c:960
+#: ../libnm-core/nm-setting-connection.c:978
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "接続タイプ '%s' �無効��"
 
-#: ../libnm-core/nm-setting-connection.c:996
-#: ../libnm-util/nm-setting-connection.c:877
+#: ../libnm-core/nm-setting-connection.c:1014
+#: ../libnm-util/nm-setting-connection.c:874
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "�明�スレーブタイプ '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1007
-#: ../libnm-util/nm-setting-connection.c:887
+#: ../libnm-core/nm-setting-connection.c:1025
+#: ../libnm-util/nm-setting-connection.c:884
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "スレーブ接続��有効� '%s' プロパティー�必���"
 
-#: ../libnm-core/nm-setting-connection.c:1028
-#: ../libnm-util/nm-setting-connection.c:897
+#: ../libnm-core/nm-setting-connection.c:1046
+#: ../libnm-util/nm-setting-connection.c:894
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "'%s' を '%s' ���設定����ん"
 
-#: ../libnm-core/nm-setting-connection.c:1041
-#, c-format
-msgid "Only '%s' connections can be enslaved to '%s'"
+#: ../libnm-core/nm-setting-connection.c:1060
+#, fuzzy, c-format
+msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "'%s' 接続����'%s' �スレーブ化����"
 
-#: ../libnm-core/nm-setting-connection.c:1054
+#: ../libnm-core/nm-setting-connection.c:1074
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "測定値 %d �無効��"
 
-#: ../libnm-core/nm-setting-connection.c:1075
+#: ../libnm-core/nm-setting-connection.c:1083
+#, c-format
+msgid "mdns value %d is not valid"
+msgstr "mdns value %d �無効��"
+
+#: ../libnm-core/nm-setting-connection.c:1106
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "プロパティータイプ� '%s' �設定�る必���り��"
 
-#: ../libnm-core/nm-setting-connection.c:1090
+#: ../libnm-core/nm-setting-connection.c:1121
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "スレーブタイプ '%s' �接続�� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-connection.c:1100
+#: ../libnm-core/nm-setting-connection.c:1131
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
@@ -10941,56 +11201,61 @@ msgstr ""
 "'%s' �設定�れ��ートタイプ� '%s' �スレーブ接続を検出���。'%s' � "
 "'%s' �設定�る必���り��"
 
-#: ../libnm-core/nm-setting-connection.c:1117
+#: ../libnm-core/nm-setting-connection.c:1148
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr "'%s' �設定�れ��る '%s' ��スレーブ接続���'%s' 設定�����ん"
 
-#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:594
+#: ../libnm-core/nm-setting-dcb.c:522 ../libnm-util/nm-setting-dcb.c:593
 msgid "flags invalid"
 msgstr "フラグ�無効��"
 
-#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:603
+#: ../libnm-core/nm-setting-dcb.c:531 ../libnm-util/nm-setting-dcb.c:602
 msgid "flags invalid - disabled"
 msgstr "フラグ�無効�� - 無効"
 
 #: ../libnm-core/nm-setting-dcb.c:557 ../libnm-core/nm-setting-dcb.c:606
-#: ../libnm-util/nm-setting-dcb.c:629 ../libnm-util/nm-setting-dcb.c:678
+#: ../libnm-util/nm-setting-dcb.c:628 ../libnm-util/nm-setting-dcb.c:677
 msgid "property invalid (not enabled)"
-msgstr "プロパティ�無効�� (有効�������ん)"
+msgstr "プロパティー�無効�� (有効�������ん)"
 
-#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:638
+#: ../libnm-core/nm-setting-dcb.c:566 ../libnm-util/nm-setting-dcb.c:637
 msgid "element invalid"
 msgstr "エレメント�無効��"
 
-#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:653
+#: ../libnm-core/nm-setting-dcb.c:581 ../libnm-util/nm-setting-dcb.c:652
 msgid "sum not 100%"
 msgstr "�計� 100% ���り��ん"
 
 #: ../libnm-core/nm-setting-dcb.c:615 ../libnm-core/nm-setting-dcb.c:647
-#: ../libnm-util/nm-setting-dcb.c:687 ../libnm-util/nm-setting-dcb.c:719
+#: ../libnm-util/nm-setting-dcb.c:686 ../libnm-util/nm-setting-dcb.c:718
 msgid "property invalid"
-msgstr "プロパティ�無効��"
+msgstr "プロパティー�無効��"
 
-#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:709
+#: ../libnm-core/nm-setting-dcb.c:637 ../libnm-util/nm-setting-dcb.c:708
 msgid "property missing"
-msgstr "プロパティ��り��ん"
+msgstr "プロパティー��り��ん"
 
-#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:295
+#: ../libnm-core/nm-setting-gsm.c:312 ../libnm-util/nm-setting-gsm.c:294
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
-msgstr "プロパティ値 '%s' �空白����長���� (>64)"
+msgstr "プロパティー値 '%s' �空白����長���� (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:327
+#: ../libnm-core/nm-setting-gsm.c:344 ../libnm-util/nm-setting-gsm.c:326
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "'%s' �無効�文字���れ���� ([A-Za-z._-] を使用������)"
 
-#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:353
+#: ../libnm-core/nm-setting-gsm.c:370 ../libnm-util/nm-setting-gsm.c:352
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' �長��無効�� (5 ���� 6 ��������)"
 
+#: ../libnm-core/nm-setting-gsm.c:381 ../libnm-util/nm-setting-gsm.c:363
+#, c-format
+msgid "'%s' is not a number"
+msgstr "'%s' �数字���り��ん"
+
 #: ../libnm-core/nm-setting-gsm.c:415
 msgid "property is empty or wrong size"
 msgstr "プロパティー�空����間���サイズ��"
@@ -11061,89 +11326,89 @@ msgstr "無効� IPv6 アドレスプレフィックス '%u'"
 msgid "Invalid routing metric '%s'"
 msgstr "無効�ルーティングメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1317
+#: ../libnm-core/nm-setting-ip-config.c:1287
 msgid "unknown attribute"
 msgstr "�明�属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:1327
+#: ../libnm-core/nm-setting-ip-config.c:1297
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "無効�属性タイプ '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1338
+#: ../libnm-core/nm-setting-ip-config.c:1308
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "属性� IPv4 ルート��無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:1339
+#: ../libnm-core/nm-setting-ip-config.c:1309
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "属性� IPv6 ルート��無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:1355
-#: ../libnm-core/nm-setting-ip-config.c:1379
+#: ../libnm-core/nm-setting-ip-config.c:1325
+#: ../libnm-core/nm-setting-ip-config.c:1349
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "'%s' �有効� IPv4 アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:1356
-#: ../libnm-core/nm-setting-ip-config.c:1380
+#: ../libnm-core/nm-setting-ip-config.c:1326
+#: ../libnm-core/nm-setting-ip-config.c:1350
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "'%s' �有効� IPv6 アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:1370
+#: ../libnm-core/nm-setting-ip-config.c:1340
 #, c-format
 msgid "invalid prefix %s"
 msgstr "無効�プレフィックス %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2534
+#: ../libnm-core/nm-setting-ip-config.c:2504
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS サー�ーアドレス�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2550
+#: ../libnm-core/nm-setting-ip-config.c:2520
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP アドレス�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2562
+#: ../libnm-core/nm-setting-ip-config.c:2532
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP アドレス���無効�タイプ� 'label' プロパティー��り��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2571
+#: ../libnm-core/nm-setting-ip-config.c:2541
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP アドレス���無効�ラベル '%s' ��り��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2585
+#: ../libnm-core/nm-setting-ip-config.c:2555
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "アドレス�設定�れ��場���ゲートウェイを設定����ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2594
+#: ../libnm-core/nm-setting-ip-config.c:2564
 msgid "gateway is invalid"
 msgstr "ゲートウェイ�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2578
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルート�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2617
+#: ../libnm-core/nm-setting-ip-config.c:2587
 #, c-format
 msgid "%d. route cannot be a default route"
 msgstr "%d. ルートをデフォルトルート��る�������ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2628
+#: ../libnm-core/nm-setting-ip-config.c:2598
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "ゲートウェイ� '%s' �互�性��り��ん"
 
 #: ../libnm-core/nm-setting-ip4-config.c:143
-#: ../libnm-core/nm-setting-ip6-config.c:167
+#: ../libnm-core/nm-setting-ip6-config.c:189
 #: ../libnm-util/nm-setting-ip4-config.c:879
-#: ../libnm-util/nm-setting-ip6-config.c:843
+#: ../libnm-util/nm-setting-ip6-config.c:841
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "'%s=%s' ���プロパティーを空��る�������ん"
@@ -11151,18 +11416,18 @@ msgstr "'%s=%s' ã�®ã�“ã�®ãƒ—ロパティーを空ã�«ã�™ã‚‹ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã
 #: ../libnm-core/nm-setting-ip4-config.c:155
 #: ../libnm-core/nm-setting-ip4-config.c:165
 #: ../libnm-core/nm-setting-ip4-config.c:177
-#: ../libnm-core/nm-setting-ip6-config.c:182
-#: ../libnm-core/nm-setting-ip6-config.c:192
-#: ../libnm-core/nm-setting-ip6-config.c:202
+#: ../libnm-core/nm-setting-ip6-config.c:204
+#: ../libnm-core/nm-setting-ip6-config.c:214
+#: ../libnm-core/nm-setting-ip6-config.c:224
 #: ../libnm-util/nm-setting-ip4-config.c:891
 #: ../libnm-util/nm-setting-ip4-config.c:901
 #: ../libnm-util/nm-setting-ip4-config.c:913
-#: ../libnm-util/nm-setting-ip6-config.c:855
-#: ../libnm-util/nm-setting-ip6-config.c:865
-#: ../libnm-util/nm-setting-ip6-config.c:877
+#: ../libnm-util/nm-setting-ip6-config.c:853
+#: ../libnm-util/nm-setting-ip6-config.c:863
+#: ../libnm-util/nm-setting-ip6-config.c:875
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
-msgstr "��プロパティ� '%s=%s' ��許��れ����ん"
+msgstr "��プロパティー� '%s=%s' ��許��れ����ん"
 
 #: ../libnm-core/nm-setting-ip4-config.c:214
 #, c-format
@@ -11182,105 +11447,114 @@ msgstr "'%s=%s' ��複数�アドレス�許��れ����ん"
 msgid "property should be TRUE when method is set to disabled"
 msgstr "メソッド�無効�設定�れ��る場���プロパティー� TRUE ����"
 
-#: ../libnm-core/nm-setting-ip6-config.c:241
+#: ../libnm-core/nm-setting-ip6-config.c:263
 msgid "value is not a valid token"
 msgstr "値 �有効�トークン���り��ん"
 
-#: ../libnm-core/nm-setting-ip6-config.c:252
+#: ../libnm-core/nm-setting-ip6-config.c:274
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "EUI64 アドレス生�モード�����味�通���"
 
-#: ../libnm-core/nm-setting-ip6-config.c:264
+#: ../libnm-core/nm-setting-ip6-config.c:285
+msgid "invalid DUID"
+msgstr "無効� DUID"
+
+#: ../libnm-core/nm-setting-ip6-config.c:297
 msgid "token is not in canonical form"
 msgstr "トークン�正�形����り��ん"
 
-#: ../libnm-core/nm-setting-ip6-config.c:276
+#: ../libnm-core/nm-setting-ip6-config.c:309
 msgid "property should be TRUE when method is set to ignore"
 msgstr "メソッド� ignore �設定�れ��る場���プロパティー� TRUE ����"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:318
+#: ../libnm-core/nm-setting-ip-tunnel.c:339
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr "'%d' �有効�トン�ルモード���り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:330
-#: ../libnm-core/nm-setting-macsec.c:302 ../libnm-core/nm-setting-macvlan.c:167
+#: ../libnm-core/nm-setting-ip-tunnel.c:351
+#: ../libnm-core/nm-setting-macsec.c:319 ../libnm-core/nm-setting-macvlan.c:163
 #: ../libnm-core/nm-setting-vlan.c:645 ../libnm-core/nm-setting-vxlan.c:403
 #: ../libnm-util/nm-setting-vlan.c:567
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "'%s' � UUID�インターフェース����れ�も�り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:341
-#: ../libnm-core/nm-setting-ip-tunnel.c:361
+#: ../libnm-core/nm-setting-ip-tunnel.c:362
+#: ../libnm-core/nm-setting-ip-tunnel.c:382
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "'%s' �有効� IPv%c アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:375
+#: ../libnm-core/nm-setting-ip-tunnel.c:396
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "トン�ルキー� GRE トン�ル�対����指定����"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:388
-#: ../libnm-core/nm-setting-ip-tunnel.c:404
+#: ../libnm-core/nm-setting-ip-tunnel.c:409
+#: ../libnm-core/nm-setting-ip-tunnel.c:425
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "'%s' �有効�トン�ルキー���り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:416
+#: ../libnm-core/nm-setting-ip-tunnel.c:437
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "固定 TTL ��パス MTU 検出�有効�場���許��れ��"
 
-#: ../libnm-core/nm-setting-macsec.c:235
+#: ../libnm-core/nm-setting-ip-tunnel.c:450
+#, c-format
+msgid "some flags are invalid for the select mode: %s"
+msgstr "�択�れ�モード�対��一部�フラグ�無効��: %s"
+
+#: ../libnm-core/nm-setting-macsec.c:252
 msgid "the key is empty"
 msgstr "キー�空��"
 
-#: ../libnm-core/nm-setting-macsec.c:246
+#: ../libnm-core/nm-setting-macsec.c:263
 #, c-format
 msgid "the key must be %d characters"
 msgstr "キー� %d 文字��る必���り��"
 
-#: ../libnm-core/nm-setting-macsec.c:254
+#: ../libnm-core/nm-setting-macsec.c:271
 msgid "the key contains non-hexadecimal characters"
 msgstr "キー� 16 進数���文字���れ����"
 
-#: ../libnm-core/nm-setting-macsec.c:291 ../libnm-core/nm-setting-vlan.c:634
+#: ../libnm-core/nm-setting-macsec.c:308 ../libnm-core/nm-setting-vlan.c:634
 #: ../libnm-util/nm-setting-vlan.c:556
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
 msgstr "'%s' �値� '%s=%s' �一致���ん"
 
-#: ../libnm-core/nm-setting-macsec.c:316 ../libnm-core/nm-setting-macvlan.c:181
+#: ../libnm-core/nm-setting-macsec.c:333 ../libnm-core/nm-setting-macvlan.c:177
 #: ../libnm-core/nm-setting-vlan.c:659 ../libnm-util/nm-setting-vlan.c:580
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
-msgstr "プロパティ�'%s:%s' ��れも指定�れ����ん"
+msgstr "プロパティー�よ� '%s:%s' ���れも指定�れ����ん"
 
-#: ../libnm-core/nm-setting-macsec.c:333
+#: ../libnm-core/nm-setting-macsec.c:350
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "EAP キー管��� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-macsec.c:344
+#: ../libnm-core/nm-setting-macsec.c:361
 #, c-format
 msgid "invalid port %d"
 msgstr "無効��ート %d"
 
-#: ../libnm-core/nm-setting-macvlan.c:192
+#: ../libnm-core/nm-setting-macvlan.c:188
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "�プロミスキャス�作�パススルーモード���許��れ��"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:130
-#: ../libnm-core/nm-setting-wireless.c:760
+#: ../libnm-core/nm-setting-wireless.c:762
 #: ../libnm-util/nm-setting-olpc-mesh.c:132
-#: ../libnm-util/nm-setting-wireless.c:778
+#: ../libnm-util/nm-setting-wireless.c:777
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "SSID �長��範囲外 <1-32> �イト��"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:139
-#: ../libnm-core/nm-setting-wireless.c:800
+#: ../libnm-core/nm-setting-wireless.c:802
 #: ../libnm-util/nm-setting-olpc-mesh.c:141
-#: ../libnm-util/nm-setting-wireless.c:818
+#: ../libnm-util/nm-setting-wireless.c:817
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "'%d' �無効��ャン�ル��"
@@ -11340,13 +11614,13 @@ msgstr "�明� ovs インターフェース設定"
 msgid "Missing ovs interface type"
 msgstr "�明� ovs インターフェース�タイプ"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:271
+#: ../libnm-core/nm-setting-ovs-interface.c:270
 #: ../libnm-core/nm-setting-ovs-port.c:198
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
 msgstr "'%s' 設定�接続��マスター�必���。"
 
-#: ../libnm-core/nm-setting-ovs-patch.c:110
+#: ../libnm-core/nm-setting-ovs-patch.c:106
 #: ../libnm-core/nm-setting-vxlan.c:375
 #, c-format
 msgid "'%s' is not a valid IP address"
@@ -11382,15 +11656,15 @@ msgstr "'%s' 設定�接続���マスター�必��り��ん。"
 msgid "'%s' is not allowed in fail_mode"
 msgstr "'%s' ��fail_mode ��利用����ん。"
 
-#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:387
+#: ../libnm-core/nm-setting-ppp.c:365 ../libnm-util/nm-setting-ppp.c:386
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "'%d' �有効�範囲 <128-16384> �外��り��"
 
-#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:400
+#: ../libnm-core/nm-setting-ppp.c:378 ../libnm-util/nm-setting-ppp.c:399
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
-msgstr "��プロパティを設定�る��ゼロ以外� '%s' プロパティー�必���"
+msgstr "��プロパティーを設定�る��ゼロ以外� '%s' プロパティー�必���"
 
 #: ../libnm-core/nm-setting-proxy.c:163
 #, c-format
@@ -11418,74 +11692,81 @@ msgid "the script lacks FindProxyForURL function"
 msgstr "スクリプト�� FindProxyForURL 関数��り��ん"
 
 #: ../libnm-core/nm-setting-tc-config.c:68
-#: ../libnm-core/nm-setting-tc-config.c:283
-#: ../libnm-core/nm-setting-tc-config.c:547
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-tc-config.c:296
+#: ../libnm-core/nm-setting-tc-config.c:550
+#, c-format
 msgid "'%s' is not a valid kind"
-msgstr "'%s' �有効��ンド���り��ん"
+msgstr "'%s' �有効���り��ん。"
 
 #: ../libnm-core/nm-setting-tc-config.c:76
-#: ../libnm-core/nm-setting-tc-config.c:555
-#, fuzzy
+#: ../libnm-core/nm-setting-tc-config.c:558
 msgid "parent handle missing"
-msgstr "データ��り��ん"
+msgstr "親�ンドラー��り��ん。"
+
+#: ../libnm-core/nm-setting-tc-config.c:1201
+msgid "there are duplicate TC qdiscs"
+msgstr "複製 TC qdiscs ��り��"
+
+#: ../libnm-core/nm-setting-tc-config.c:1221
+msgid "there are duplicate TC filters"
+msgstr "複製 TC フィルター��り��"
 
 #: ../libnm-core/nm-setting-team.c:134 ../libnm-core/nm-setting-team.c:193
 #: ../libnm-core/nm-setting-team.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "%s is out of range [0, %d]"
-msgstr "'%s' ��[0, %u] �範囲外��"
+msgstr "%s � [0, %d] �範囲外��"
 
 #: ../libnm-core/nm-setting-team.c:175
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
-msgstr ""
+msgstr "nsna_ping リンクウォッ�ャー� target-host ��り��ん"
 
 #: ../libnm-core/nm-setting-team.c:181 ../libnm-core/nm-setting-team.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "target-host '%s' contains invalid characters"
-msgstr "キー�無効�文字���れ����"
+msgstr "target-host '%s' ��無効�文字���れ����。"
 
 #: ../libnm-core/nm-setting-team.c:241
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
-msgstr ""
+msgstr "arp_ping リンクウォッ�ャー� %s ��り��ん"
 
 #: ../libnm-core/nm-setting-team.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "source-host '%s' contains invalid characters"
-msgstr "キー�無効�文字���れ����"
+msgstr "source-host '%s' �無効�文字���れ����"
 
 #: ../libnm-core/nm-setting-team.c:1153
-#: ../libnm-core/nm-setting-team-port.c:381
+#: ../libnm-core/nm-setting-team-port.c:380
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "team 設定�制�サイズを超�����"
 
-#: ../libnm-core/nm-setting-team.c:1178
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1179
+#, c-format
 msgid "invalid runner \"%s\""
-msgstr "無効�プレフィックス %s"
+msgstr "無効�ランナー \"%s\""
 
-#: ../libnm-core/nm-setting-team.c:1191
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1192
+#, c-format
 msgid "missing link watcher name"
-msgstr "�明�ファイル�"
+msgstr "リンクウォッ�ャー���り��ん"
 
-#: ../libnm-core/nm-setting-team.c:1201
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1202
+#, c-format
 msgid "unknown link watcher \"%s\""
-msgstr "�明� VPNプラグイン '%s'"
+msgstr "�明�リンクウォッ�ャー \"%s\""
 
-#: ../libnm-core/nm-setting-team.c:1212
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1213
+#, c-format
 msgid "missing target host"
-msgstr "�明�設定"
+msgstr "ターゲットホスト��り��ん"
 
-#: ../libnm-core/nm-setting-team.c:1220
-#, fuzzy, c-format
+#: ../libnm-core/nm-setting-team.c:1221
+#, c-format
 msgid "missing source address"
-msgstr "�明� IPv4 アドレス"
+msgstr "ソースアドレス��り��ん"
 
 #: ../libnm-core/nm-setting-tun.c:187
 #, c-format
@@ -11538,21 +11819,21 @@ msgstr "値�長����"
 msgid "value is not valid UTF8"
 msgstr "値�有効� UTF-8 ���り��ん"
 
-#: ../libnm-core/nm-setting-user.c:338
+#: ../libnm-core/nm-setting-user.c:331
 msgid "maximum number of user data entries reached"
 msgstr "ユーザーデータエントリー�最大数������"
 
-#: ../libnm-core/nm-setting-user.c:379
+#: ../libnm-core/nm-setting-user.c:372
 #, c-format
 msgid "invalid key \"%s\": %s"
 msgstr "無効�キー '%s': %s"
 
-#: ../libnm-core/nm-setting-user.c:383
+#: ../libnm-core/nm-setting-user.c:376
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "'%s' �無効�値: %s"
 
-#: ../libnm-core/nm-setting-user.c:398
+#: ../libnm-core/nm-setting-user.c:391
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr "ユーザーデータエントリー�最大数������ (%u ���� %u)"
@@ -11570,29 +11851,29 @@ msgstr "フラグ�無効��"
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "vlan 設定�� Ethernet 設定も必���"
 
-#: ../libnm-core/nm-setting-vpn.c:559
+#: ../libnm-core/nm-setting-vpn.c:530
 #, c-format
 msgid "secret was empty"
 msgstr "シークレット�空��"
 
-#: ../libnm-core/nm-setting-vpn.c:589
+#: ../libnm-core/nm-setting-vpn.c:560
 msgid "setting contained a secret with an empty name"
 msgstr "設定�空����シークレット���れ�����"
 
-#: ../libnm-core/nm-setting-vpn.c:597
+#: ../libnm-core/nm-setting-vpn.c:568
 #, c-format
 msgid "secret value was empty"
 msgstr "シークレット値�空���"
 
-#: ../libnm-core/nm-setting-vpn.c:644 ../libnm-core/nm-setting.c:1788
+#: ../libnm-core/nm-setting-vpn.c:615 ../libnm-core/nm-setting.c:1786
 msgid "not a secret property"
 msgstr "シークレットプロパティー���り��ん"
 
-#: ../libnm-core/nm-setting-vpn.c:650
+#: ../libnm-core/nm-setting-vpn.c:621
 msgid "secret is not of correct type"
 msgstr "シークレット�タイプ�正���り��ん"
 
-#: ../libnm-core/nm-setting-vpn.c:681
+#: ../libnm-core/nm-setting-vpn.c:652
 #, c-format
 msgid "failed to convert value '%s' to uint"
 msgstr "値 '%s' を uint �変��る��失敗����"
@@ -11607,17 +11888,17 @@ msgstr "'%s' �有効� IP%c アドレス���り��ん"
 msgid "%d is greater than local port max %d"
 msgstr "%d �ローカル�ート�最大 %d よりも大����"
 
-#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:613
+#: ../libnm-core/nm-setting-wired.c:632 ../libnm-util/nm-setting-wired.c:612
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' �有効� Ethernet �ート値���り��ん"
 
-#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:623
+#: ../libnm-core/nm-setting-wired.c:642 ../libnm-util/nm-setting-wired.c:622
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "'%s' �有効�二�値���り��ん"
 
-#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:680
+#: ../libnm-core/nm-setting-wired.c:701 ../libnm-util/nm-setting-wired.c:679
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "無効� '%s' �����値 '%s' ��"
@@ -11630,289 +11911,292 @@ msgstr "Wake-on-LAN モード� 'default' � 'ignore' �排他的�フラグ
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "Wake-on-LAN パスワード��マジックパケットモード���使用����"
 
-#: ../libnm-core/nm-setting-wired.c:770
-msgid "when link autonegotiation is enabled no duplex value is accepted"
-msgstr "リンク autonegotiation �有効�����る��二�値�承��れ��ん"
-
-#: ../libnm-core/nm-setting-wired.c:778
-msgid "when link autonegotiation is enabled speed should be 0"
-msgstr "リンク autonegotiation �有効�����る場���スピード� 0 ����"
+#: ../libnm-core/nm-setting-wired.c:772
+msgid "both speed and duplex should have a valid value or both should be unset"
+msgstr ""
+"速度�二��両方�値�有効��る���������れ��両方�も未設定���"
+"れ��り��ん"
 
-#: ../libnm-core/nm-setting-wired.c:788
+#: ../libnm-core/nm-setting-wired.c:773
 msgid "both speed and duplex are required for static link configuration"
-msgstr "スピード�二��両方��的リンク設定�必���"
+msgstr "速度�二��両方��的リンク設定�必���"
 
-#: ../libnm-core/nm-setting-wireless-security.c:921
-#: ../libnm-util/nm-setting-wireless-security.c:912
+#: ../libnm-core/nm-setting-wireless-security.c:941
+#: ../libnm-util/nm-setting-wireless-security.c:911
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "'%s' セキュリティー���'%s=%s' �必���"
 
-#: ../libnm-core/nm-setting-wireless-security.c:942
-#: ../libnm-util/nm-setting-wireless-security.c:933
+#: ../libnm-core/nm-setting-wireless-security.c:962
+#: ../libnm-util/nm-setting-wireless-security.c:932
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "'%s' セキュリティー���'%s' �設定�必���り��"
 
-#: ../libnm-core/nm-setting-wireless-security.c:963
-#: ../libnm-util/nm-setting-wireless-security.c:954
+#: ../libnm-core/nm-setting-wireless-security.c:983
+#: ../libnm-util/nm-setting-wireless-security.c:953
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "'%d' �値� <0-3> �範囲外��り��"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1018
-#: ../libnm-util/nm-setting-wireless-security.c:1009
+#: ../libnm-core/nm-setting-wireless-security.c:1038
+#: ../libnm-util/nm-setting-wireless-security.c:1008
 #, c-format
 msgid "'%s' connections require '%s' in this property"
-msgstr "'%s' �接続�場����プロパティ� '%s' �必���り��"
+msgstr "'%s' �接続�場����プロパティー� '%s' �必���り��"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1048
-#: ../libnm-util/nm-setting-wireless-security.c:1039
+#: ../libnm-core/nm-setting-wireless-security.c:1068
+#: ../libnm-util/nm-setting-wireless-security.c:1038
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "'%s' � '%s=%s' (WEP) ���使用����ん"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1072
+#: ../libnm-core/nm-setting-wireless-security.c:1092
 #, c-format
 msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
 msgstr "'%s' ��'%s=%s' ��� '%s=%s' ���使用����ん"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1094
+#: ../libnm-core/nm-setting-wireless-security.c:1114
 msgid "can't be simultaneously disabled and enabled"
 msgstr "�時�無効���有効��る�������ん"
 
-#: ../libnm-core/nm-setting-wireless.c:769
-#: ../libnm-util/nm-setting-wireless.c:787
+#: ../libnm-core/nm-setting-wireless.c:771
+#: ../libnm-util/nm-setting-wireless.c:786
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "'%s' �有効� Wi-Fi モード���り��ん"
 
-#: ../libnm-core/nm-setting-wireless.c:779
-#: ../libnm-util/nm-setting-wireless.c:797
+#: ../libnm-core/nm-setting-wireless.c:781
+#: ../libnm-util/nm-setting-wireless.c:796
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "'%s' �有効��ンド���り��ん"
 
-#: ../libnm-core/nm-setting-wireless.c:789
+#: ../libnm-core/nm-setting-wireless.c:791
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "'%s' �場���'%s' プロパティーを設定�る必���り��"
 
-#: ../libnm-core/nm-setting-wireless.c:883
+#: ../libnm-core/nm-setting-wireless.c:885
 #, c-format
 msgid "invalid value"
 msgstr "無効�値"
 
+#: ../libnm-core/nm-setting-wireless.c:895
+msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
+msgstr "Wake-on-WLAN モード� 'default' � 'ignore' �排他的�フラグ��"
+
 #: ../libnm-core/nm-setting-wireless.c:904
+msgid "Wake-on-WLAN trying to set unknown flag"
+msgstr "Wake-on-WLAN ��未知�フラグ�設定を試�����"
+
+#: ../libnm-core/nm-setting-wireless.c:926
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "mac-address-randomization � cloned-mac-address �値�競�"
 
-#: ../libnm-core/nm-setting.c:821
+#: ../libnm-core/nm-setting.c:819
 #, c-format
 msgid "duplicate property"
 msgstr "�複�るプロパティー"
 
-#: ../libnm-core/nm-setting.c:849 ../libnm-core/nm-setting.c:896
+#: ../libnm-core/nm-setting.c:847 ../libnm-core/nm-setting.c:894
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "タイプ '%s' �プロパティーをタイプ '%s' �値�ら設定����ん"
 
-#: ../libnm-core/nm-setting.c:868 ../libnm-core/nm-setting.c:882
+#: ../libnm-core/nm-setting.c:866 ../libnm-core/nm-setting.c:880
 #, c-format
 msgid "failed to set property: %s"
 msgstr "プロパティー�設定�失敗����: %s"
 
-#: ../libnm-core/nm-setting.c:910
+#: ../libnm-core/nm-setting.c:908
 #, c-format
 msgid "can not set property: %s"
 msgstr "プロパティーを設定����ん: %s"
 
-#: ../libnm-core/nm-setting.c:926
+#: ../libnm-core/nm-setting.c:924
 #, c-format
 msgid "unknown property"
 msgstr "�明�プロパティー"
 
-#: ../libnm-core/nm-setting.c:1686
+#: ../libnm-core/nm-setting.c:1684
 msgid "secret not found"
 msgstr "シークレット�見��り��ん"
 
-#: ../libnm-core/nm-setting.c:1778
+#: ../libnm-core/nm-setting.c:1776
 msgid "secret is not set"
 msgstr "シークレット�設定�れ����ん"
 
-#: ../libnm-core/nm-utils.c:2123
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2168
+#, c-format
 msgid "'%s' is not a valid handle."
-msgstr "'%s' �有効��ンド���り��ん"
+msgstr "'%s' �有効��ンドラー��り��ん。"
 
-#: ../libnm-core/nm-utils.c:2220
+#: ../libnm-core/nm-utils.c:2264
 #, c-format
 msgid "'%s' unexpected: parent already specified."
-msgstr ""
+msgstr "予期�� '%s': 親�����択�れ����。"
 
-#: ../libnm-core/nm-utils.c:2236
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2280
+#, c-format
 msgid "invalid handle: '%s'"
-msgstr "無効�オプション '%s'"
+msgstr "無効��ンドラー: '%s'"
 
-#: ../libnm-core/nm-utils.c:2258
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2302
 msgid "parent not specified."
-msgstr "サービス��指定�れ����ん"
+msgstr "親�指定�れ����ん。"
 
-#: ../libnm-core/nm-utils.c:2305
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2349
+#, c-format
 msgid "unsupported qdisc option: '%s'."
-msgstr "タイプ '%s' �サ�ート�れ����属性 '%s'"
+msgstr "サ�ート�れ���� qdisc オプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2421
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2465
 msgid "action name missing."
-msgstr "データ��り��ん"
+msgstr "アクション���り��ん。"
 
-#: ../libnm-core/nm-utils.c:2445
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2489
+#, c-format
 msgid "unsupported action option: '%s'."
-msgstr "タイプ '%s' �サ�ート�れ����属性 '%s'"
+msgstr "サ�ート�れ����アクション�オプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2583
-#, fuzzy
+#: ../libnm-core/nm-utils.c:2627
 msgid "invalid action: "
-msgstr "無効�オプション '%s'"
+msgstr "無効�アクション: "
 
-#: ../libnm-core/nm-utils.c:2587
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:2631
+#, c-format
 msgid "unsupported tfilter option: '%s'."
-msgstr "タイプ '%s' �サ�ート�れ����属性 '%s'"
+msgstr "サ�ート�れ���� tfilter オプション: '%s'."
 
-#: ../libnm-core/nm-utils.c:2946
+#: ../libnm-core/nm-utils.c:2990
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "ファイル %s �対�る stat �実行�失敗����: %s"
 
-#: ../libnm-core/nm-utils.c:2955
+#: ../libnm-core/nm-utils.c:2999
 #, c-format
 msgid "not a file (%s)"
 msgstr "ファイル���り��ん (%s)"
 
-#: ../libnm-core/nm-utils.c:2966
+#: ../libnm-core/nm-utils.c:3010
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "%2$s �無効�ファイル所有者 %1$d"
 
-#: ../libnm-core/nm-utils.c:2977
+#: ../libnm-core/nm-utils.c:3021
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s �ファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:2987
+#: ../libnm-core/nm-utils.c:3031
 #, c-format
 msgid "reject %s"
 msgstr "%s �拒�"
 
-#: ../libnm-core/nm-utils.c:3007
+#: ../libnm-core/nm-utils.c:3050
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "パス�絶対パス���り��ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3021
+#: ../libnm-core/nm-utils.c:3064
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "プラグインファイル�存在���ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3029
+#: ../libnm-core/nm-utils.c:3072
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "プラグイン�有効�ファイル���り��ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3039
+#: ../libnm-core/nm-utils.c:3082
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool アーカイブ�サ�ート�れ����ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3121 ../libnm-util/nm-utils.c:1798
+#: ../libnm-core/nm-utils.c:3164 ../libnm-util/nm-utils.c:1794
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "\"%s\" �イナリーを見��る�������ん���"
 
-#: ../libnm-core/nm-utils.c:4167
+#: ../libnm-core/nm-utils.c:4181
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "%lld �場所��マスク�有効� Ethernet  MAC アドレス���り��ん"
 
-#: ../libnm-core/nm-utils.c:4182
+#: ../libnm-core/nm-utils.c:4196
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "%2$lld �場所��有効� Ethernet MAC アドレス #%1$u ���り��ん"
 
-#: ../libnm-core/nm-utils.c:4218
+#: ../libnm-core/nm-utils.c:4232
 msgid "interface name is too short"
 msgstr "インターフェース��短����"
 
-#: ../libnm-core/nm-utils.c:4227
+#: ../libnm-core/nm-utils.c:4241
 msgid "interface name is reserved"
 msgstr "インターフェース��予約�れ����"
 
-#: ../libnm-core/nm-utils.c:4239
+#: ../libnm-core/nm-utils.c:4253
 msgid "interface name contains an invalid character"
 msgstr "インターフェース��無効�文字���れ����"
 
-#: ../libnm-core/nm-utils.c:4245
+#: ../libnm-core/nm-utils.c:4259
 msgid "interface name is longer than 15 characters"
 msgstr "インターフェース�� 15 文字を超�����"
 
-#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
+#: ../libnm-core/nm-utils.c:4905
+msgid "not valid utf-8"
+msgstr "utf-8 ���り��ん"
+
+#: ../libnm-core/nm-utils.c:4927 ../libnm-core/nm-utils.c:5395
+msgid "is not a JSON object"
+msgstr "JSON オブジェクト���り��ん"
+
+#: ../libnm-core/nm-utils.c:5371 ../libnm-core/nm-utils.c:5711
 msgid "value is NULL"
 msgstr "値� NULL ��"
 
-#: ../libnm-core/nm-utils.c:5283 ../libnm-core/nm-utils.c:5626
+#: ../libnm-core/nm-utils.c:5371 ../libnm-core/nm-utils.c:5711
 msgid "value is empty"
 msgstr "値�空��"
 
-#: ../libnm-core/nm-utils.c:5292
+#: ../libnm-core/nm-utils.c:5383
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "%d (%s) �無効� JSON"
 
-#: ../libnm-core/nm-utils.c:5304 ../libnm-core/nm-utils.c:5645
-msgid "is not a JSON object"
-msgstr "JSON オブジェクト���り��ん"
-
-#: ../libnm-core/nm-utils.c:5615
-msgid "not valid utf-8"
-msgstr "utf-8 ���り��ん"
-
-#: ../libnm-core/nm-utils.c:5958 ../libnm-core/nm-utils.c:5978
+#: ../libnm-core/nm-utils.c:6028 ../libnm-core/nm-utils.c:6048
 msgid "unterminated escape sequence"
 msgstr "未終了�エスケープシーケンス"
 
-#: ../libnm-core/nm-utils.c:6003
+#: ../libnm-core/nm-utils.c:6073
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "�明�属性 '%s'"
 
-#: ../libnm-core/nm-utils.c:6018
-#, fuzzy, c-format
+#: ../libnm-core/nm-utils.c:6088
+#, c-format
 msgid "missing key-value separator '%c' after '%s'"
-msgstr "キー/値�セパレーター '%c' ��り��ん"
+msgstr "'%s' �後��キー/値�セパレーター '%c' ��り��ん"
 
-#: ../libnm-core/nm-utils.c:6034
+#: ../libnm-core/nm-utils.c:6104
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "属性 '%s' �無効� uint32 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6043
+#: ../libnm-core/nm-utils.c:6113
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "属性 '%s' �無効� uint8 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6053
+#: ../libnm-core/nm-utils.c:6123
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "属性 '%s' �無効�ブール値 '%s'"
 
-#: ../libnm-core/nm-utils.c:6063
+#: ../libnm-core/nm-utils.c:6133
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "タイプ '%s' �サ�ート�れ����属性 '%s'"
@@ -11977,73 +12261,73 @@ msgstr "競��るプラグイン (%s) �存在��� (�� %s.%s 値を
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "���� (%s) �競��るプラグイン�存在���"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1071
+#: ../libnm-core/nm-vpn-plugin-info.c:1070
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "�明� \"plugin\" 設定"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1081
+#: ../libnm-core/nm-vpn-plugin-info.c:1080
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s: 以��失敗��プラグイン�ロード��試行��������"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1175
+#: ../libnm-core/nm-vpn-plugin-info.c:1174
 msgid "missing filename to load VPN plugin info"
 msgstr "VPN プラグイン情報をロード�る�明�ファイル�"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1187
+#: ../libnm-core/nm-vpn-plugin-info.c:1186
 msgid "missing name for VPN plugin info"
 msgstr "VPN プラグイン情報��明���"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1196
+#: ../libnm-core/nm-vpn-plugin-info.c:1195
 msgid "missing service for VPN plugin info"
 msgstr "VPN プラグイン情報��明�サービス"
 
-#: ../libnm-glib/nm-device.c:1825 ../libnm/nm-device.c:1525
+#: ../libnm-glib/nm-device.c:1824 ../libnm/nm-device.c:1307
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm-glib/nm-device.c:1827 ../libnm/nm-device.c:1527
+#: ../libnm-glib/nm-device.c:1826 ../libnm/nm-device.c:1309
 msgid "OLPC Mesh"
 msgstr "OLPC メッシュ"
 
-#: ../libnm-glib/nm-device.c:1829 ../libnm/nm-device.c:1535
+#: ../libnm-glib/nm-device.c:1828 ../libnm/nm-device.c:1317
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm-glib/nm-device.c:1843 ../libnm/nm-device.c:1549
+#: ../libnm-glib/nm-device.c:1842 ../libnm/nm-device.c:1331
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm-glib/nm-device.c:1845 ../libnm/nm-device.c:1551
+#: ../libnm-glib/nm-device.c:1844 ../libnm/nm-device.c:1333
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm-glib/nm-device.c:1847 ../libnm/nm-device.c:1553
+#: ../libnm-glib/nm-device.c:1846 ../libnm/nm-device.c:1335
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1555
+#: ../libnm-glib/nm-device.c:1848 ../libnm/nm-device.c:1337
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1557
+#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1339
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1559
+#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1341
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm-glib/nm-device.c:1885 ../libnm/nm-device.c:1597
+#: ../libnm-glib/nm-device.c:1884 ../libnm/nm-device.c:1379
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm-glib/nm-device.c:1916 ../libnm/nm-device.c:1628
+#: ../libnm-glib/nm-device.c:1915 ../libnm/nm-device.c:1410
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm-glib/nm-device.c:1918 ../libnm/nm-device.c:1630
+#: ../libnm-glib/nm-device.c:1917 ../libnm/nm-device.c:1412
 msgid "USB"
 msgstr "USB"
 
@@ -12053,14 +12337,14 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../libnm-glib/nm-device.c:2015 ../libnm-glib/nm-device.c:2034
+#: ../libnm-glib/nm-device.c:2014 ../libnm-glib/nm-device.c:2033
 #: ../libnm/nm-device.c:1725 ../libnm/nm-device.c:1744
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm-glib/nm-remote-connection.c:149
+#: ../libnm-glib/nm-remote-connection.c:148
 msgid "Disconnected by D-Bus"
 msgstr "D-Bus �より切断"
 
@@ -12084,23 +12368,23 @@ msgstr "MD5 コンテキスト��期化�失敗����: %d。"
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "パスワードを UCS2 �変�����ん: %d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:186
+#: ../libnm-util/nm-setting-bluetooth.c:185
 #, c-format
 msgid "requires '%s' or '%s' setting"
 msgstr "'%s' ��� '%s' �設定�必���"
 
-#: ../libnm-util/nm-setting-bond.c:582
+#: ../libnm-util/nm-setting-bond.c:581
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
 msgstr "'%s' ��'%s' オプション�有効�インターフェース����り��ん"
 
-#: ../libnm-util/nm-setting-connection.c:834
+#: ../libnm-util/nm-setting-connection.c:831
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
 msgstr "'%s' �有効�インターフェース����り��ん"
 
-#: ../libnm-util/nm-setting-connection.c:862
+#: ../libnm-util/nm-setting-connection.c:859
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
 msgstr "接続�� '%s' 設定�必���"
@@ -12120,37 +12404,37 @@ msgid "%d. IPv4 address has invalid prefix"
 msgstr "%d. IPv4 �無効�プレフィックス��り��"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:939
+#: ../libnm-util/nm-setting-ip6-config.c:937
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d. ルート�無効�プレフィックス��り��"
 
-#: ../libnm-util/nm-setting-ip6-config.c:913
+#: ../libnm-util/nm-setting-ip6-config.c:911
 #, c-format
 msgid "%d. IPv6 address is invalid"
 msgstr "%d. IPv6 アドレス�無効��"
 
-#: ../libnm-util/nm-setting-ip6-config.c:923
+#: ../libnm-util/nm-setting-ip6-config.c:921
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
 msgstr "%d. IPv6 アドレス�プレフィックス�無効��"
 
-#: ../libnm-util/nm-setting-vpn.c:582
+#: ../libnm-util/nm-setting-vpn.c:581
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
 msgstr "'%s' 値 '%s' を uint �変��る��失敗����"
 
-#: ../libnm-util/nm-setting-vpn.c:589
+#: ../libnm-util/nm-setting-vpn.c:588
 #, c-format
 msgid "Secret flags property '%s' not found"
 msgstr "シークレットフラグプロパティー '%s' �見��り��ん"
 
-#: ../libnm-util/nm-setting-wireless.c:807
+#: ../libnm-util/nm-setting-wireless.c:806
 #, c-format
 msgid "requires setting '%s' property"
-msgstr "'%s' プロパティ�設定�必���"
+msgstr "'%s' プロパティー�設定�必���"
 
-#: ../libnm/nm-device-adsl.c:73
+#: ../libnm/nm-device-adsl.c:72
 msgid "The connection was not an ADSL connection."
 msgstr "接続��ADSL 接続���り��ん���。"
 
@@ -12190,8 +12474,8 @@ msgid "The connection was not a dummy connection."
 msgstr "接続��ダミー接続���り��ん���。"
 
 #: ../libnm/nm-device-dummy.c:83 ../libnm/nm-device-generic.c:97
-#: ../libnm/nm-device-ovs-bridge.c:68 ../libnm/nm-device-ovs-interface.c:68
-#: ../libnm/nm-device-ovs-port.c:67
+#: ../libnm/nm-device-ovs-bridge.c:97 ../libnm/nm-device-ovs-interface.c:68
+#: ../libnm/nm-device-ovs-port.c:96
 msgid "The connection did not specify an interface name."
 msgstr "接続��インターフェース��指定�れ��ん���。"
 
@@ -12238,21 +12522,21 @@ msgstr "デ�イス�接続�モード�一致���ん���"
 msgid "The connection was not an InfiniBand connection."
 msgstr "接続� InfiniBand 接続���り��ん���。"
 
-#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:599
+#: ../libnm/nm-device-infiniband.c:101 ../libnm/nm-device-wifi.c:625
 #: ../libnm/nm-device-wimax.c:324
 msgid "Invalid device MAC address."
 msgstr "無効�デ�イス MAC アドレス��。"
 
-#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:606
+#: ../libnm/nm-device-infiniband.c:109 ../libnm/nm-device-wifi.c:632
 #: ../libnm/nm-device-wimax.c:331
 msgid "The MACs of the device and the connection didn't match."
 msgstr "デ�イス�接続� MAC アドレス�一致���ん���。"
 
-#: ../libnm/nm-device-ip-tunnel.c:253
+#: ../libnm/nm-device-ip-tunnel.c:271
 msgid "The connection was not an IP tunnel connection."
 msgstr "接続� IP トン�ル接続���り��ん���。"
 
-#: ../libnm/nm-device-macvlan.c:158
+#: ../libnm/nm-device-macvlan.c:157
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "接続� MAC-VLAN 接続���り��ん���。"
 
@@ -12272,7 +12556,7 @@ msgstr "デ�イス��接続�必��機能��り��ん。"
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "接続� OLPC メッシュ接続���り��ん���。"
 
-#: ../libnm/nm-device-ovs-bridge.c:61
+#: ../libnm/nm-device-ovs-bridge.c:90
 msgid "The connection was not a ovs_bridge connection."
 msgstr "接続��ovs_bridge 接続���り��ん���。"
 
@@ -12280,7 +12564,7 @@ msgstr "接続��ovs_bridge 接続���り��ん���。"
 msgid "The connection was not a ovs_interface connection."
 msgstr "接続��ovs_interface 接続���り��ん���。"
 
-#: ../libnm/nm-device-ovs-port.c:60
+#: ../libnm/nm-device-ovs-port.c:89
 msgid "The connection was not a ovs_port connection."
 msgstr "接続��ovs_port 接続���り��ん���。"
 
@@ -12308,15 +12592,15 @@ msgstr "接続� VXLAN 接続���り��ん���。"
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "デ�イス�接続� VXLAN ID �一致���ん���。"
 
-#: ../libnm/nm-device-wifi.c:590
+#: ../libnm/nm-device-wifi.c:616
 msgid "The connection was not a Wi-Fi connection."
 msgstr "接続� Wi-Fi 接続���り��ん���。"
 
-#: ../libnm/nm-device-wifi.c:626
+#: ../libnm/nm-device-wifi.c:652
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "デ�イス��接続�必�� WPA 機能��り��ん。"
 
-#: ../libnm/nm-device-wifi.c:633
+#: ../libnm/nm-device-wifi.c:659
 msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "デ�イス��接続�必�� WPA2/RSN 機能��り��ん。"
 
@@ -12324,46 +12608,45 @@ msgstr "デãƒ�イスã�«ã�¯æŽ¥ç¶šã�«å¿…è¦�ã�ª WPA2/RSN 機能ã�Œã�‚ã‚Šã�¾ã�›ã‚“ã€
 msgid "The connection was not a WiMAX connection."
 msgstr "接続� WiMAX 接続���り��ん���。"
 
-#: ../libnm/nm-device.c:1529
-msgid "OpenVSwitch Interface"
-msgstr "OpenVSwitch インターフェース"
+#: ../libnm/nm-device.c:1311
+msgid "Open vSwitch Interface"
+msgstr "Open vSwitch インターフェース"
 
-#: ../libnm/nm-device.c:1531
-msgid "OpenVSwitch Port"
-msgstr "OpenVSwitch �ート"
+#: ../libnm/nm-device.c:1313
+msgid "Open vSwitch Port"
+msgstr "Open vSwitch �ート"
 
-#: ../libnm/nm-device.c:1533
-msgid "OpenVSwitch Bridge"
-msgstr "OpenVSwitch ブリッジ"
+#: ../libnm/nm-device.c:1315
+msgid "Open vSwitch Bridge"
+msgstr "Open vSwitch ブリッジ"
 
-#: ../libnm/nm-device.c:1561
+#: ../libnm/nm-device.c:1343
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1563
+#: ../libnm/nm-device.c:1345
 msgid "Dummy"
 msgstr "ダミー"
 
-#: ../libnm/nm-device.c:1565
+#: ../libnm/nm-device.c:1347
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:2456
+#: ../libnm/nm-device.c:2466
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "接続�有効���り��ん���: %s"
 
-#: ../libnm/nm-device.c:2465
+#: ../libnm/nm-device.c:2475
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "デ�イス�接続�インターフェース��一致���ん���。"
 
 #: ../libnm/nm-manager.c:274
-#, fuzzy
 msgid "Checkpoint was removed before it was initialized"
-msgstr "接続��期化��削除�れ���"
+msgstr "�ェック�イント��期化��削除�れ���"
 
-#: ../libnm/nm-manager.c:941
+#: ../libnm/nm-manager.c:955
 msgid "Active connection removed before it was initialized"
 msgstr "アクティブ�接続��期化��削除�れ���"
 
@@ -12371,7 +12654,7 @@ msgstr "アクティブ�接続��期化��削除�れ���"
 msgid "Connection removed before it was initialized"
 msgstr "接続��期化��削除�れ���"
 
-#: ../libnm/nm-vpn-plugin-old.c:840 ../libnm/nm-vpn-service-plugin.c:957
+#: ../libnm/nm-vpn-plugin-old.c:847 ../libnm/nm-vpn-service-plugin.c:1012
 msgid "No service name specified"
 msgstr "サービス��指定�れ����ん"
 
@@ -12525,19 +12808,19 @@ msgstr "接続確�を有効���無効��る"
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr "システム�リシー�より�接続確�を有効化���無効化����ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: ../shared/nm-utils/nm-shared-utils.c:946
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 "オブジェクトクラス '%s' ���'%s' ������プロパティー��り��ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: ../shared/nm-utils/nm-shared-utils.c:953
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "プロパティー '%s' (オブジェクトクラス '%s') �書�込��能���り��ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: ../shared/nm-utils/nm-shared-utils.c:960
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -12545,19 +12828,19 @@ msgstr ""
 "コンストラクトプロパティー \"%s\" (オブジェクト '%s') �構築後�設定����"
 "ã‚“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: ../shared/nm-utils/nm-shared-utils.c:968
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "'%s::%s' �有効�プロパティー����り��ん。'%s' � GObject サブタイプ��"
 "�り��ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: ../shared/nm-utils/nm-shared-utils.c:977
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' �値�ら設定����ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: ../shared/nm-utils/nm-shared-utils.c:988
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -12570,49 +12853,49 @@ msgstr ""
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:112
+#: ../src/NetworkManagerUtils.c:119
 #, c-format
 msgctxt "connection id fallback"
-msgid "%s %d"
-msgstr "%s %d"
+msgid "%s %u"
+msgstr "%s %u"
 
-#: ../src/main.c:179 ../src/main.c:318
+#: ../src/main.c:181 ../src/main.c:315
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定�読�込��失敗����: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:193 ../src/nm-iface-helper.c:292
+#: ../src/main.c:195 ../src/nm-iface-helper.c:297
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager ��ージョンを表示��終了�る"
 
-#: ../src/main.c:194 ../src/nm-iface-helper.c:293
+#: ../src/main.c:196 ../src/nm-iface-helper.c:298
 msgid "Don't become a daemon"
 msgstr "デーモン����"
 
-#: ../src/main.c:195 ../src/nm-iface-helper.c:295
+#: ../src/main.c:197 ../src/nm-iface-helper.c:300
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] ���れ�"
 
-#: ../src/main.c:197 ../src/nm-iface-helper.c:297
+#: ../src/main.c:199 ../src/nm-iface-helper.c:302
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
-msgstr "「,��区切��ログドメイン: [%s] �組����"
+msgstr "',' �区切��ログドメイン: [%s] �組����"
 
-#: ../src/main.c:199 ../src/nm-iface-helper.c:299
+#: ../src/main.c:201 ../src/nm-iface-helper.c:304
 msgid "Make all warnings fatal"
 msgstr "����警告を致命的��る"
 
-#: ../src/main.c:200
+#: ../src/main.c:202
 msgid "Specify the location of a PID file"
 msgstr "PID ファイル�場所を指定�る"
 
-#: ../src/main.c:202
+#: ../src/main.c:204
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager �設定を表示��終了�る"
 
-#: ../src/main.c:212
+#: ../src/main.c:214
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -12624,27 +12907,12 @@ msgstr ""
 "ワイヤレスカードを関連付�る��ワイヤレスアクセス�イント�\n"
 "ユーザー�よる指定も許��れ��。"
 
-#: ../src/main.c:303 ../src/main-utils.c:286 ../src/nm-iface-helper.c:398
+#: ../src/main.c:305 ../src/main-utils.c:286 ../src/nm-iface-helper.c:442
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用��有効�オプション�一覧を確�������。\n"
 
-#: ../src/main.c:308 ../src/nm-iface-helper.c:403
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr "コマンドライン�渡�れ�未�識�ログドメイン '%s' を無視���。\n"
-
-#: ../src/main.c:333
-#, c-format
-msgid "Error in configuration file: %s.\n"
-msgstr "設定ファイル�エラー�発生����: %s\n"
-
-#: ../src/main.c:338
-#, c-format
-msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr "設定ファイル��る未�識�ログドメイン '%s' を無視���。\n"
-
-#: ../src/main.c:349 ../src/nm-iface-helper.c:413
+#: ../src/main.c:340 ../src/nm-iface-helper.c:457
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化����ん���: %s [エラー %u]\n"
@@ -12679,11 +12947,11 @@ msgstr "%s ����実行中�� (pid %ld)\n"
 msgid "You must be root to run %s!\n"
 msgstr "%s を実行�る�� root ��る必���り��!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:280
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:313
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager �作��れ����\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:290
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:323
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -12697,64 +12965,64 @@ msgstr ""
 msgid "%s Network"
 msgstr "%s �ットワーク"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:264
+#: ../src/devices/bluetooth/nm-device-bt.c:262
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN ��求�れ�����Bluetooth デ�イス� NAP をサ�ート���ん"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:274
+#: ../src/devices/bluetooth/nm-device-bt.c:272
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr "PAN 接続��GSM�CDMA����シリアル設定を指定����ん"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:287
+#: ../src/devices/bluetooth/nm-device-bt.c:285
 msgid "PAN connection"
 msgstr "PAN 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:294
+#: ../src/devices/bluetooth/nm-device-bt.c:292
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN ��求�れ�����Bluetooth デ�イス� DUN をサ�ート���ん"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:304
+#: ../src/devices/bluetooth/nm-device-bt.c:302
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 接続���GSM ��� CDMA 設定���れる必���り��"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:314
+#: ../src/devices/bluetooth/nm-device-bt.c:312
 #: ../src/devices/wwan/nm-modem-broadband.c:709
 msgid "GSM connection"
 msgstr "GSM 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:318
+#: ../src/devices/bluetooth/nm-device-bt.c:316
 #: ../src/devices/wwan/nm-modem-broadband.c:733
 msgid "CDMA connection"
 msgstr "CDMA 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:326
+#: ../src/devices/bluetooth/nm-device-bt.c:324
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "�明�/未処�� Bluetooth 接続タイプ"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:347
-#: ../src/devices/nm-device-ethernet.c:1408
-#: ../src/devices/nm-device-infiniband.c:210
-#: ../src/devices/wifi/nm-device-wifi.c:952
+#: ../src/devices/bluetooth/nm-device-bt.c:345
+#: ../src/devices/nm-device-ethernet.c:1413
+#: ../src/devices/nm-device-infiniband.c:190
+#: ../src/devices/wifi/nm-device-wifi.c:872
 msgid "connection does not match device"
 msgstr "接続�デ�イス�一致���ん"
 
-#: ../src/devices/nm-device-bond.c:91
+#: ../src/devices/nm-device-bond.c:89
 msgid "Bond connection"
 msgstr "ボンド接続"
 
-#: ../src/devices/nm-device-bridge.c:130
+#: ../src/devices/nm-device-bridge.c:128
 msgid "Bridge connection"
 msgstr "ブリッジ接続"
 
-#: ../src/devices/nm-device-dummy.c:70
+#: ../src/devices/nm-device-dummy.c:68
 msgid "Dummy connection"
 msgstr "ダミー接続"
 
-#: ../src/devices/nm-device-ethernet.c:1389
+#: ../src/devices/nm-device-ethernet.c:1394
 msgid "PPPoE connection"
 msgstr "PPPoE 接続"
 
-#: ../src/devices/nm-device-ethernet.c:1389
+#: ../src/devices/nm-device-ethernet.c:1394
 msgid "Wired connection"
 msgstr "有線接続"
 
@@ -12763,27 +13031,27 @@ msgstr "有線接続"
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:340
+#: ../src/devices/nm-device-ip-tunnel.c:371
 msgid "IP tunnel connection"
 msgstr "IP トン�ル接続"
 
-#: ../src/devices/nm-device-macvlan.c:344
+#: ../src/devices/nm-device-macvlan.c:347
 msgid "MACVLAN connection"
 msgstr "MACVLAN 接続"
 
-#: ../src/devices/nm-device-tun.c:146
+#: ../src/devices/nm-device-tun.c:158
 msgid "TUN connection"
 msgstr "TUN 接続"
 
-#: ../src/devices/team/nm-device-team.c:119
+#: ../src/devices/team/nm-device-team.c:117
 msgid "Team connection"
 msgstr "team 接続"
 
-#: ../src/devices/wifi/nm-device-olpc-mesh.c:152
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:147
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: ../src/devices/wifi/nm-device-wifi.c:919
+#: ../src/devices/wifi/nm-device-wifi.c:839
 msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr "WPA アドホック�カー�ル�グ���無効��り���"
 
@@ -12948,133 +13216,133 @@ msgstr "AP セキュリティー情報�決定�失敗����。"
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
 msgstr "GSM モ�イルブロード�ンド接続�� 'gsm' 設定�必���"
 
-#: ../src/nm-config.c:486
+#: ../src/nm-config.c:521
 msgid "Config file location"
 msgstr "設定ファイル�場所"
 
-#: ../src/nm-config.c:487
+#: ../src/nm-config.c:522
 msgid "Config directory location"
 msgstr "設定ディレクトリ�場所"
 
-#: ../src/nm-config.c:488
+#: ../src/nm-config.c:523
 msgid "System config directory location"
 msgstr "システム設定ディレクトリー�場所"
 
-#: ../src/nm-config.c:489
+#: ../src/nm-config.c:524
 msgid "Internal config file location"
 msgstr "内部設定ファイル�場所"
 
-#: ../src/nm-config.c:490
+#: ../src/nm-config.c:525
 msgid "State file location"
 msgstr "状態ファイル�場所"
 
-#: ../src/nm-config.c:491
+#: ../src/nm-config.c:526
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default デ�イス�状態ファイル"
 
-#: ../src/nm-config.c:492
+#: ../src/nm-config.c:527
 msgid "List of plugins separated by ','"
-msgstr "複数�プラグインを「,��区切��一覧"
+msgstr "複数�プラグインを ',' �区切��一覧"
 
-#: ../src/nm-config.c:493
+#: ../src/nm-config.c:528
 msgid "Quit after initial configuration"
 msgstr "�期設定後�終了�る"
 
-#: ../src/nm-config.c:494 ../src/nm-iface-helper.c:294
+#: ../src/nm-config.c:529 ../src/nm-iface-helper.c:299
 msgid "Don't become a daemon, and log to stderr"
 msgstr "デーモン����stderr �ログ記録�る"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:497
+#: ../src/nm-config.c:532
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インター�ット�接続性を確��る��� http(s) アドレス"
 
-#: ../src/nm-config.c:498
+#: ../src/nm-config.c:533
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性�ェック�間隔 (秒��)"
 
-#: ../src/nm-config.c:499
+#: ../src/nm-config.c:534
 msgid "The expected start of the response"
 msgstr "期待�れ��る応答�開始点"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:274
+#: ../src/nm-iface-helper.c:279
 msgid "The interface to manage"
 msgstr "管��るインターフェース"
 
-#: ../src/nm-iface-helper.c:275
+#: ../src/nm-iface-helper.c:280
 msgid "Connection UUID"
 msgstr "接続 UUID"
 
-#: ../src/nm-iface-helper.c:276
+#: ../src/nm-iface-helper.c:281
 msgid "Connection Token for Stable IDs"
 msgstr "安定 ID �接続トークン"
 
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:282
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "IPv6 SLAAC を管��る����"
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:283
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC ��功�る必���る����"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:284
 msgid "Use an IPv6 temporary privacy address"
 msgstr "IPv6 一時プライ�シーアドレス�使用"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:285
 msgid "Current DHCPv4 address"
 msgstr "�在� DHCPv4 アドレス"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:286
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 ��功�る必���る����"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:287
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "16 進エンコード�れ� DHCPv4 クライアント ID"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:288
 msgid "Hostname to send to DHCP server"
 msgstr "DHCP サー�ー��信�るホスト�"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:288
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:289
 msgid "FQDN to send to DHCP server"
 msgstr "DHCP サー�ー��信�る FQDN"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:289
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:290
 msgid "Route priority for IPv4"
 msgstr "IPv4 �ルート優先度"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:290
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:291
 msgid "Route priority for IPv6"
 msgstr "IPv6 �ルート優先度"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:291
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:292
 msgid "Hex-encoded Interface Identifier"
 msgstr "16 進エンコード�れ�インターフェース ID"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:293
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC アドレス生�モード"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:294
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
@@ -13082,7 +13350,7 @@ msgstr ""
 "ロギング�ックエンド設定値。NetworkManager.conf � logging.backend を�照��"
 "����"
 
-#: ../src/nm-iface-helper.c:309
+#: ../src/nm-iface-helper.c:314
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
@@ -13090,27 +13358,37 @@ msgstr ""
 "nm-iface-helper ���一��ットワークインターフェースを管��る���スタン"
 "ドアロンプロセス��。"
 
-#: ../src/nm-iface-helper.c:379
+#: ../src/nm-iface-helper.c:423
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "インターフェース�� UUID �’必���\n"
 
-#: ../src/nm-iface-helper.c:385
+#: ../src/nm-iface-helper.c:429
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "%s (%s) �インターフェースインデックス�検出�失敗����\n"
 
-#: ../src/nm-iface-helper.c:446
+#: ../src/nm-iface-helper.c:447
+#, c-format
+msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
+msgstr "コマンドライン�渡�れ�未�識�ログドメイン '%s' を無視���。\n"
+
+#: ../src/nm-iface-helper.c:486
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): 無効� IID %s\n"
 
-#: ../src/nm-logging.c:267
+#: ../src/nm-iface-helper.c:497
+#, c-format
+msgid "(%s): Invalid DHCP client-id %s\n"
+msgstr "(%s): 無効� DHCP client-id %s\n"
+
+#: ../src/nm-logging.c:273
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "�明�ログレベル '%s'"
 
-#: ../src/nm-logging.c:369
+#: ../src/nm-logging.c:375
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "�明�ログドメイン '%s'"
diff --git a/po/ru.po b/po/ru.po
index 1cc52e5e..29403e10 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7142,7 +7142,7 @@ msgid ""
 "hardware-address client ID and the 'type' field is set to 0. The special "
 "values \"mac\" and \"perm-mac\" are supported, which use the current or "
 "permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
 "type of links. The special value \"stable\" is supported to generate a type "
 "0 client identifier based on the stable-id (see connection.stable-id). If "
 "unset, a globally configured default is used. If still unset, the client-id "
diff --git a/po/uk.po b/po/uk.po
index f41f1569..be59c6b6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8348,7 +8348,7 @@ msgid ""
 "hardware-address client ID and the 'type' field is set to 0. The special "
 "values \"mac\" and \"perm-mac\" are supported, which use the current or "
 "permanent MAC address of the device to generate a client identifier with "
-"type ethernet type (01). Currently, these options only work for ethernet "
+"type ethernet (01). Currently, these options only work for ethernet "
 "type of links. The special value \"stable\" is supported to generate a type "
 "0 client identifier based on the stable-id (see connection.stable-id). If "
 "unset, a globally configured default is used. If still unset, the client-id "
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index 743893f0..d29e9ae7 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
 #endif
 	} else {
 		/* We were called not to set logging levels. This means, that the user
-		 * expects to assert against (all) messages. Any uncought message is fatal. */
-		g_log_set_always_fatal (G_LOG_LEVEL_MASK);
+		 * expects to assert against (all) messages.
+		 * Any uncaught message on >debug level is fatal. */
+		g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG);
 	}
 
 	if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h
index 350858e2..c4b139f8 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 (2)
+#define NM_MICRO_VERSION (4)
 
 /**
  * NM_CHECK_VERSION:
@@ -74,6 +74,7 @@
 #define NM_VERSION_1_10   (NM_ENCODE_VERSION (1, 10, 0))
 #define NM_VERSION_1_12   (NM_ENCODE_VERSION (1, 12, 0))
 #define NM_VERSION_1_12_2 (NM_ENCODE_VERSION (1, 12, 2))
+#define NM_VERSION_1_12_4 (NM_ENCODE_VERSION (1, 12, 4))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in
index 0d8fa87a..792070ac 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -74,6 +74,7 @@
 #define NM_VERSION_1_10   (NM_ENCODE_VERSION (1, 10, 0))
 #define NM_VERSION_1_12   (NM_ENCODE_VERSION (1, 12, 0))
 #define NM_VERSION_1_12_2 (NM_ENCODE_VERSION (1, 12, 2))
+#define NM_VERSION_1_12_4 (NM_ENCODE_VERSION (1, 12, 4))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 19e43762..33dd5e50 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -2615,7 +2615,6 @@ static void
 concheck_cb (NMConnectivity *connectivity,
              NMConnectivityCheckHandle *c_handle,
              NMConnectivityState state,
-             GError *error,
              gpointer user_data)
 {
 	_nm_unused gs_unref_object NMDevice *self_keep_alive = NULL;
@@ -2636,7 +2635,7 @@ concheck_cb (NMConnectivity *connectivity,
 	handle->c_handle = NULL;
 	self = handle->self;
 
-	if (nm_utils_error_is_cancelled (error, FALSE)) {
+	if (state == NM_CONNECTIVITY_CANCELLED) {
 		/* the only place where we nm_connectivity_check_cancel(@c_handle), is
 		 * from inside concheck_handle_complete(). This is a recursive call,
 		 * nothing to do. */
@@ -2645,15 +2644,14 @@ concheck_cb (NMConnectivity *connectivity,
 		return;
 	}
 
+	/* we keep NMConnectivity instance alive. It cannot be disposing. */
+	nm_assert (state != NM_CONNECTIVITY_DISPOSING);
+
 	self_keep_alive = g_object_ref (self);
 
-	_LOGT (LOGD_CONCHECK, "connectivity: complete check (seq:%llu, state:%s%s%s%s)",
+	_LOGT (LOGD_CONCHECK, "connectivity: complete check (seq:%llu, state:%s)",
 	       (long long unsigned) handle->seq,
-	       nm_connectivity_state_to_string (state),
-	       NM_PRINT_FMT_QUOTED (error, ", error: ", error->message, "", ""));
-
-	/* we keep NMConnectivity instance alive. It cannot be disposing. */
-	nm_assert (!nm_utils_error_is_cancelled (error, TRUE));
+	       nm_connectivity_state_to_string (state));
 
 	/* keep @self alive, while we invoke callbacks. */
 	priv = NM_DEVICE_GET_PRIVATE (self);
@@ -4236,6 +4234,9 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error)
 		}
 	}
 
+	nm_clear_g_source (&priv->queued_ip_config_id_4);
+	nm_clear_g_source (&priv->queued_ip_config_id_6);
+
 	g_object_freeze_notify (G_OBJECT (self));
 	NM_DEVICE_GET_CLASS (self)->unrealize_notify (self);
 
@@ -10337,10 +10338,37 @@ nm_device_reactivate_ip4_config (NMDevice *self,
 			_set_ip_state (self, AF_INET, IP_WAIT);
 			if (!nm_device_activate_stage3_ip4_start (self))
 				_LOGW (LOGD_IP4, "Failed to apply IPv4 configuration");
-		} else {
-			if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
-				_LOGW (LOGD_IP4, "Failed to reapply IPv4 configuration");
+			return;
+		}
+
+		if (s_ip4_old && s_ip4_new) {
+			gint64 metric_old, metric_new;
+
+			/* For dynamic IP methods (DHCP, IPv4LL, WWAN) the route metric is
+			 * set at activation/renewal time using the value from static
+			 * configuration. To support runtime change we need to update the
+			 * dynamic configuration in place and tell the DHCP client the new
+			 * value to use for future renewals.
+			 */
+			metric_old = nm_setting_ip_config_get_route_metric (s_ip4_old);
+			metric_new = nm_setting_ip_config_get_route_metric (s_ip4_new);
+
+			if (metric_old != metric_new) {
+				if (priv->dev_ip4_config.orig) {
+					nm_ip4_config_update_routes_metric ((NMIP4Config *) priv->dev_ip4_config.orig,
+					                                    nm_device_get_route_metric (self, AF_INET));
+				}
+				if (priv->wwan_ip_config_4.orig) {
+					nm_ip4_config_update_routes_metric ((NMIP4Config *) priv->wwan_ip_config_4.orig,
+					                                    nm_device_get_route_metric (self, AF_INET));
+				}
+				if (priv->dhcp4.client)
+					nm_dhcp_client_set_route_metric (priv->dhcp4.client, metric_new);
+			}
 		}
+
+		if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
+			_LOGW (LOGD_IP4, "Failed to reapply IPv4 configuration");
 	}
 }
 
@@ -10382,10 +10410,36 @@ nm_device_reactivate_ip6_config (NMDevice *self,
 			_set_ip_state (self, AF_INET6, IP_WAIT);
 			if (!nm_device_activate_stage3_ip6_start (self))
 				_LOGW (LOGD_IP6, "Failed to apply IPv6 configuration");
-		} else {
-			if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
-				_LOGW (LOGD_IP4, "Failed to reapply IPv6 configuration");
+			return;
+		}
+
+		if (s_ip6_old && s_ip6_new) {
+			gint64 metric_old, metric_new;
+
+			/* See comment in nm_device_reactivate_ip6_config() */
+			metric_old = nm_setting_ip_config_get_route_metric (s_ip6_old);
+			metric_new = nm_setting_ip_config_get_route_metric (s_ip6_new);
+
+			if (metric_old != metric_new) {
+				if (priv->ac_ip6_config.orig) {
+					nm_ip6_config_update_routes_metric ((NMIP6Config *) priv->ac_ip6_config.orig,
+					                                    nm_device_get_route_metric (self, AF_INET6));
+				}
+				if (priv->dhcp6.ip6_config.orig) {
+					nm_ip6_config_update_routes_metric ((NMIP6Config *) priv->dhcp6.ip6_config.orig,
+					                                    nm_device_get_route_metric (self, AF_INET6));
+				}
+				if (priv->wwan_ip_config_6.orig) {
+					nm_ip6_config_update_routes_metric ((NMIP6Config *) priv->wwan_ip_config_6.orig,
+					                                    nm_device_get_route_metric (self, AF_INET6));
+				}
+				if (priv->dhcp6.client)
+					nm_dhcp_client_set_route_metric (priv->dhcp6.client, metric_new);
+			}
 		}
+
+		if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
+			_LOGW (LOGD_IP4, "Failed to reapply IPv6 configuration");
 	}
 }
 
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 6bd06524..0dd6fa74 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -2557,6 +2557,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason)
 	set_current_ap (self, ap, FALSE);
 	nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req),
 	                                          nm_dbus_object_get_path (NM_DBUS_OBJECT (ap)));
+	g_object_unref (ap);
 	return NM_ACT_STAGE_RETURN_SUCCESS;
 
 done:
diff --git a/src/devices/wifi/nm-wifi-common.c b/src/devices/wifi/nm-wifi-common.c
index 8e079d11..c95620e7 100644
--- a/src/devices/wifi/nm-wifi-common.c
+++ b/src/devices/wifi/nm-wifi-common.c
@@ -196,7 +196,7 @@ const NMDBusInterfaceInfoExtended nm_interface_info_device_wireless = {
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("HwAddress",            "s",  NM_DEVICE_HW_ADDRESS),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("PermHwAddress",        "s",  NM_DEVICE_PERM_HW_ADDRESS),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Mode",                 "u",  NM_DEVICE_WIFI_MODE),
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("BitRate",              "u",  NM_DEVICE_WIFI_BITRATE),
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Bitrate",              "u",  NM_DEVICE_WIFI_BITRATE),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("AccessPoints",         "ao", NM_DEVICE_WIFI_ACCESS_POINTS),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("ActiveAccessPoint",    "o",  NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("WirelessCapabilities", "u",  NM_DEVICE_WIFI_CAPABILITIES),
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 360bd367..e53c8d87 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -51,7 +51,7 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient,
 	PROP_ADDR_FAMILY,
 	PROP_FLAGS,
 	PROP_HWADDR,
@@ -163,6 +163,17 @@ nm_dhcp_client_get_route_table (NMDhcpClient *self)
 	return NM_DHCP_CLIENT_GET_PRIVATE (self)->route_table;
 }
 
+void
+nm_dhcp_client_set_route_table (NMDhcpClient *self, guint32 route_table)
+{
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+
+	if (route_table != priv->route_table) {
+		priv->route_table = route_table;
+		_notify (self, PROP_ROUTE_TABLE);
+	}
+}
+
 guint32
 nm_dhcp_client_get_route_metric (NMDhcpClient *self)
 {
@@ -171,6 +182,17 @@ nm_dhcp_client_get_route_metric (NMDhcpClient *self)
 	return NM_DHCP_CLIENT_GET_PRIVATE (self)->route_metric;
 }
 
+void
+nm_dhcp_client_set_route_metric (NMDhcpClient *self, guint32 route_metric)
+{
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+
+	if (route_metric != priv->route_metric) {
+		priv->route_metric = route_metric;
+		_notify (self, PROP_ROUTE_METRIC);
+	}
+}
+
 guint32
 nm_dhcp_client_get_timeout (NMDhcpClient *self)
 {
@@ -834,6 +856,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_ROUTE_METRIC:
 		g_value_set_uint (value, priv->route_metric);
 		break;
+	case PROP_ROUTE_TABLE:
+		g_value_set_uint (value, priv->route_table);
+		break;
 	case PROP_TIMEOUT:
 		g_value_set_uint (value, priv->timeout);
 		break;
@@ -889,11 +914,9 @@ set_property (GObject *object, guint prop_id,
 		priv->uuid = g_value_dup_string (value);
 		break;
 	case PROP_ROUTE_TABLE:
-		/* construct-only */
 		priv->route_table = g_value_get_uint (value);
 		break;
 	case PROP_ROUTE_METRIC:
-		/* construct-only */
 		priv->route_metric = g_value_get_uint (value);
 		break;
 	case PROP_TIMEOUT:
@@ -1002,13 +1025,13 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	obj_properties[PROP_ROUTE_TABLE] =
 	    g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_TABLE, "", "",
 	                       0, G_MAXUINT32, RT_TABLE_MAIN,
-	                       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+	                       G_PARAM_READWRITE |
 	                       G_PARAM_STATIC_STRINGS);
 
 	obj_properties[PROP_ROUTE_METRIC] =
 	    g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_METRIC, "", "",
 	                       0, G_MAXUINT32, 0,
-	                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+	                       G_PARAM_READWRITE |
 	                       G_PARAM_STATIC_STRINGS);
 
 	obj_properties[PROP_TIMEOUT] =
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index f3d0b7d1..4c196045 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -131,8 +131,12 @@ GBytes *nm_dhcp_client_get_hw_addr (NMDhcpClient *self);
 
 guint32 nm_dhcp_client_get_route_table (NMDhcpClient *self);
 
+void nm_dhcp_client_set_route_table (NMDhcpClient *self, guint32 route_table);
+
 guint32 nm_dhcp_client_get_route_metric (NMDhcpClient *self);
 
+void nm_dhcp_client_set_route_metric (NMDhcpClient *self, guint32 route_metric);
+
 guint32 nm_dhcp_client_get_timeout (NMDhcpClient *self);
 
 GBytes *nm_dhcp_client_get_client_id (NMDhcpClient *self);
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 3bd14ebe..bf93c831 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -374,11 +374,15 @@ dhclient_start (NMDhcpClient *client,
 		if (g_file_copy (src, dst, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error)) {
 			/* Success; use the preferred leasefile path */
 			g_free (priv->lease_file);
-			priv->lease_file = g_strdup (g_file_get_path (dst));
+			priv->lease_file = g_file_get_path (dst);
 		} else {
+			gs_free char *s_path = NULL;
+			gs_free char *d_path = NULL;
+
 			/* Failure; just use the existing leasefile */
 			_LOGW ("failed to copy leasefile %s to %s: %s",
-			       g_file_get_path (src), g_file_get_path (dst),
+			       (s_path = g_file_get_path (src)),
+			       (d_path = g_file_get_path (dst)),
 			       error->message);
 			g_clear_error (&error);
 		}
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index b5b93280..91f4c55b 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -183,10 +183,12 @@ add_ip_config (NMDnsDnsmasq *self, GVariantBuilder *servers, const NMDnsIPConfig
 			                        domain[0] ? domain : NULL);
 		}
 
-		for (j = 0; ip_data->domains.reverse[j]; j++) {
-			add_dnsmasq_nameserver (self, servers,
-			                        ip_addr_to_string_buf,
-			                        ip_data->domains.reverse[j]);
+		if (ip_data->domains.reverse) {
+			for (j = 0; ip_data->domains.reverse[j]; j++) {
+				add_dnsmasq_nameserver (self, servers,
+				                        ip_addr_to_string_buf,
+				                        ip_data->domains.reverse[j]);
+			}
 		}
 	}
 }
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 1ce6d3cf..db26218b 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -46,8 +46,10 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_state_to_string, int /*NMConnectivityState*/
 	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_PORTAL,   "PORTAL"),
 	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FULL,     "FULL"),
 
-	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_ERROR,    "ERROR"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FAKE,     "FAKE"),
+	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_ERROR,     "ERROR"),
+	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FAKE,      "FAKE"),
+	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_CANCELLED, "CANCELLED"),
+	NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_DISPOSING, "DISPOSING"),
 );
 
 const char *
@@ -77,6 +79,10 @@ struct _NMConnectivityCheckHandle {
 	} concheck;
 #endif
 
+	const char *completed_log_message;
+	char *completed_log_message_free;
+	NMConnectivityState completed_state;
+
 	guint timeout_id;
 };
 
@@ -90,6 +96,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 typedef struct {
 	CList handles_lst_head;
+	CList completed_handles_lst_head;
 	char *uri;
 	char *response;
 	gboolean enabled;
@@ -142,60 +149,37 @@ NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECT
 /*****************************************************************************/
 
 static void
-cb_data_invoke_callback (NMConnectivityCheckHandle *cb_data,
-                         NMConnectivityState state,
-                         GError *error,
-                         const char *log_message)
+cb_data_complete (NMConnectivityCheckHandle *cb_data,
+                  NMConnectivityState state,
+                  const char *log_message)
 {
-	NMConnectivityCheckCallback callback;
+	NMConnectivity *self;
 
 	nm_assert (cb_data);
 	nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
-
-	callback = cb_data->callback;
-	if (!callback)
-		return;
-
-	cb_data->callback = NULL;
-
+	nm_assert (cb_data->callback);
+	nm_assert (state != NM_CONNECTIVITY_UNKNOWN);
 	nm_assert (log_message);
 
-	_LOG2D ("check completed: %s; %s",
-	        nm_connectivity_state_to_string (state),
-	        log_message);
-
-	callback (cb_data->self,
-	          cb_data,
-	          state,
-	          error,
-	          cb_data->user_data);
-}
-
-static void
-cb_data_free (NMConnectivityCheckHandle *cb_data,
-              NMConnectivityState state,
-              GError *error,
-              const char *log_message)
-{
-	NMConnectivity *self;
-
-	nm_assert (cb_data);
-
 	self = cb_data->self;
 
-	nm_assert (NM_IS_CONNECTIVITY (self));
+	/* mark the handle as completing. After this point, nm_connectivity_check_cancel()
+	 * is no longer possible. */
+	cb_data->self = NULL;
 
-	c_list_unlink (&cb_data->handles_lst);
+	c_list_unlink_stale (&cb_data->handles_lst);
 
 #if WITH_CONCHECK
 	if (cb_data->concheck.curl_ehandle) {
 		NMConnectivityPrivate *priv;
 
 		/* Contrary to what cURL manual claim it is *not* safe to remove
-		 * the easy handle "at any moment"; specifically not from the
-		 * write function. Thus here we just dissociate the cb_data from
-		 * the easy handle and the easy handle will be cleaned up when the
-		 * message goes to CURLMSG_DONE in _con_curl_check_connectivity(). */
+		 * the easy handle "at any moment"; specifically it's not safe to
+		 * remove *any* handle from within a libcurl callback. That is
+		 * why we queue completed handles in this case.
+		 *
+		 * cb_data_complete() is however only called *not* from within a
+		 * libcurl callback. So, this is fine. */
 		curl_easy_setopt (cb_data->concheck.curl_ehandle, CURLOPT_WRITEFUNCTION, NULL);
 		curl_easy_setopt (cb_data->concheck.curl_ehandle, CURLOPT_WRITEDATA, NULL);
 		curl_easy_setopt (cb_data->concheck.curl_ehandle, CURLOPT_HEADERFUNCTION, NULL);
@@ -214,7 +198,18 @@ cb_data_free (NMConnectivityCheckHandle *cb_data,
 
 	nm_clear_g_source (&cb_data->timeout_id);
 
-	cb_data_invoke_callback (cb_data, state, error, log_message);
+	_LOG2D ("check completed: %s; %s",
+	        nm_connectivity_state_to_string (state),
+	        log_message);
+
+	cb_data->callback (self,
+	                   cb_data,
+	                   state,
+	                   cb_data->user_data);
+
+	/* Note: self might be a danling pointer at this point. It must not be used
+	 * after this point, and all callers must either take a reference first, or
+	 * not use the self pointer too. */
 
 #if WITH_CONCHECK
 	g_free (cb_data->concheck.response);
@@ -222,12 +217,54 @@ cb_data_free (NMConnectivityCheckHandle *cb_data,
 		g_string_free (cb_data->concheck.recv_msg, TRUE);
 #endif
 	g_free (cb_data->ifspec);
+	if (cb_data->completed_log_message_free)
+		g_free (cb_data->completed_log_message_free);
 	g_slice_free (NMConnectivityCheckHandle, cb_data);
 }
 
 /*****************************************************************************/
 
 #if WITH_CONCHECK
+
+static void
+cb_data_queue_completed (NMConnectivityCheckHandle *cb_data,
+                         NMConnectivityState state,
+                         const char *log_message_static,
+                         char *log_message_take /* take */)
+{
+	nm_assert (cb_data);
+	nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
+	nm_assert (state != NM_CONNECTIVITY_UNKNOWN);
+	nm_assert (log_message_static || log_message_take);
+	nm_assert (cb_data->completed_state == NM_CONNECTIVITY_UNKNOWN);
+	nm_assert (!cb_data->completed_log_message);
+	nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->handles_lst_head, &cb_data->handles_lst));
+
+	cb_data->completed_state = state;
+	cb_data->completed_log_message = log_message_static ?: log_message_take;
+	cb_data->completed_log_message_free = log_message_take;
+
+	c_list_unlink_stale (&cb_data->handles_lst);
+	c_list_link_tail (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->completed_handles_lst_head, &cb_data->handles_lst);
+}
+
+static void
+_complete_queued (NMConnectivity *self)
+{
+	NMConnectivity *self_keep_alive = NULL;
+	NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
+	NMConnectivityCheckHandle *cb_data;
+
+	while ((cb_data = c_list_first_entry (&priv->completed_handles_lst_head, NMConnectivityCheckHandle, handles_lst))) {
+		if (!self_keep_alive)
+			self_keep_alive = g_object_ref (self);
+		cb_data_complete (cb_data,
+		                  cb_data->completed_state,
+		                  cb_data->completed_log_message);
+	}
+	nm_g_object_unref (self_keep_alive);
+}
+
 static const char *
 _check_handle_get_response (NMConnectivityCheckHandle *cb_data)
 {
@@ -265,29 +302,37 @@ _con_curl_check_connectivity (CURLM *mhandle, int sockfd, int ev_bitmask)
 			continue;
 		}
 
-		if (!cb_data->callback) {
-			/* callback was already invoked earlier. */
-			cb_data_free (cb_data, NM_CONNECTIVITY_UNKNOWN, NULL, NULL);
-		} else if (msg->data.result != CURLE_OK) {
-			gs_free char *log_message = NULL;
+		nm_assert (cb_data);
+		nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
 
-			log_message = g_strdup_printf ("check failed with curl status %d", msg->data.result);
-			cb_data_free (cb_data, NM_CONNECTIVITY_LIMITED, NULL,
-			              log_message);
+		if (cb_data->completed_state != NM_CONNECTIVITY_UNKNOWN) {
+			/* callback was already invoked earlier. Nothing to do. */
+			continue;
+		}
+
+		if (msg->data.result != CURLE_OK) {
+			cb_data_queue_completed (cb_data,
+			                         NM_CONNECTIVITY_LIMITED,
+			                         NULL,
+			                         g_strdup_printf ("check failed with curl status %d", msg->data.result));
 		} else if (   !((_check_handle_get_response (cb_data))[0])
 		           && (curl_easy_getinfo (msg->easy_handle, CURLINFO_RESPONSE_CODE, &response_code) == CURLE_OK)
 		           && response_code == 204) {
 			/* If we got a 204 response code (no content) and we actually
 			 * requested no content, report full connectivity. */
-			cb_data_free (cb_data, NM_CONNECTIVITY_FULL, NULL,
-			              "no content, as expected");
+			cb_data_queue_completed (cb_data,
+			                         NM_CONNECTIVITY_FULL,
+			                         "no content, as expected",
+			                         NULL);
 		} else {
 			/* If we get here, it means that easy_write_cb() didn't read enough
 			 * bytes to be able to do a match, or that we were asking for no content
 			 * (204 response code) and we actually got some. Either way, that is
 			 * an indication of a captive portal */
-			cb_data_free (cb_data, NM_CONNECTIVITY_PORTAL, NULL,
-			              "unexpected short response");
+			cb_data_queue_completed (cb_data,
+			                         NM_CONNECTIVITY_PORTAL,
+			                         "unexpected short response",
+			                         NULL);
 		}
 	}
 
@@ -306,6 +351,7 @@ _con_curl_timeout_cb (gpointer user_data)
 
 	priv->concheck.curl_timer = 0;
 	_con_curl_check_connectivity (priv->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0);
+	_complete_queued (self);
 	return G_SOURCE_REMOVE;
 }
 
@@ -368,6 +414,8 @@ _con_curl_socketevent_cb (GIOChannel *ch, GIOCondition condition, gpointer user_
 			fdp->ev = 0;
 	}
 
+	_complete_queued (self);
+
 	return success ? G_SOURCE_CONTINUE : G_SOURCE_REMOVE;
 }
 
@@ -419,10 +467,17 @@ easy_header_cb (char *buffer, size_t size, size_t nitems, void *userdata)
 	NMConnectivityCheckHandle *cb_data = userdata;
 	size_t len = size * nitems;
 
+	if (cb_data->completed_state != NM_CONNECTIVITY_UNKNOWN) {
+		/* already completed. */
+		return 0;
+	}
+
 	if (   len >= sizeof (HEADER_STATUS_ONLINE) - 1
 	    && !g_ascii_strncasecmp (buffer, HEADER_STATUS_ONLINE, sizeof (HEADER_STATUS_ONLINE) - 1)) {
-		cb_data_invoke_callback (cb_data, NM_CONNECTIVITY_FULL,
-		                         NULL, "status header found");
+		cb_data_queue_completed (cb_data,
+		                         NM_CONNECTIVITY_FULL,
+		                         "status header found",
+		                         NULL);
 		return 0;
 	}
 
@@ -434,24 +489,33 @@ easy_write_cb (void *buffer, size_t size, size_t nmemb, void *userdata)
 {
 	NMConnectivityCheckHandle *cb_data = userdata;
 	size_t len = size * nmemb;
-	const char *response = _check_handle_get_response (cb_data);;
+	const char *response;
+
+	if (cb_data->completed_state != NM_CONNECTIVITY_UNKNOWN) {
+		/* already completed. */
+		return 0;
+	}
 
 	if (!cb_data->concheck.recv_msg)
 		cb_data->concheck.recv_msg = g_string_sized_new (len + 10);
 
 	g_string_append_len (cb_data->concheck.recv_msg, buffer, len);
 
+	response = _check_handle_get_response (cb_data);;
 	if (   response
 	    && cb_data->concheck.recv_msg->len >= strlen (response)) {
 		/* We already have enough data -- check response */
 		if (g_str_has_prefix (cb_data->concheck.recv_msg->str, response)) {
-			cb_data_invoke_callback (cb_data, NM_CONNECTIVITY_FULL, NULL,
-			                         "expected response");
+			cb_data_queue_completed (cb_data,
+			                         NM_CONNECTIVITY_FULL,
+			                         "expected response",
+			                         NULL);
 		} else {
-			cb_data_invoke_callback (cb_data, NM_CONNECTIVITY_PORTAL, NULL,
-			                         "unexpected response");
+			cb_data_queue_completed (cb_data,
+			                         NM_CONNECTIVITY_PORTAL,
+			                         "unexpected response",
+			                         NULL);
 		}
-
 		return 0;
 	}
 
@@ -462,15 +526,11 @@ static gboolean
 _timeout_cb (gpointer user_data)
 {
 	NMConnectivityCheckHandle *cb_data = user_data;
-	NMConnectivity *self;
 
 	nm_assert (NM_IS_CONNECTIVITY (cb_data->self));
+	nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->handles_lst_head, &cb_data->handles_lst));
 
-	self = cb_data->self;
-
-	nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (self)->handles_lst_head, &cb_data->handles_lst));
-
-	cb_data_free (cb_data, NM_CONNECTIVITY_LIMITED, NULL, "timeout");
+	cb_data_complete (cb_data, NM_CONNECTIVITY_LIMITED, "timeout");
 	return G_SOURCE_REMOVE;
 }
 #endif
@@ -490,9 +550,9 @@ _idle_cb (gpointer user_data)
 		/* the invocation was with an invalid ifname. It is a fail. */
 		g_set_error (&error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
 		             "no interface specified for connectivity check");
-		cb_data_free (cb_data, NM_CONNECTIVITY_ERROR, NULL, "missing interface");
+		cb_data_complete (cb_data, NM_CONNECTIVITY_ERROR, "missing interface");
 	} else
-		cb_data_free (cb_data, NM_CONNECTIVITY_FAKE, NULL, "fake result");
+		cb_data_complete (cb_data, NM_CONNECTIVITY_FAKE, "fake result");
 	return G_SOURCE_REMOVE;
 }
 
@@ -516,6 +576,7 @@ nm_connectivity_check_start (NMConnectivity *self,
 	c_list_link_tail (&priv->handles_lst_head, &cb_data->handles_lst);
 	cb_data->callback = callback;
 	cb_data->user_data = user_data;
+	cb_data->completed_state = NM_CONNECTIVITY_UNKNOWN;
 
 	if (iface)
 		cb_data->ifspec = g_strdup_printf ("if!%s", iface);
@@ -556,22 +617,13 @@ nm_connectivity_check_start (NMConnectivity *self,
 void
 nm_connectivity_check_cancel (NMConnectivityCheckHandle *cb_data)
 {
-	NMConnectivity *self;
-	gs_free_error GError *error = NULL;
-
 	g_return_if_fail (cb_data);
+	g_return_if_fail (NM_IS_CONNECTIVITY (cb_data->self));
 
-	self = cb_data->self;
-
-	g_return_if_fail (NM_IS_CONNECTIVITY (self));
-	g_return_if_fail (!c_list_is_empty (&cb_data->handles_lst));
-	g_return_if_fail (cb_data->callback);
-
-	nm_assert (c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (self)->handles_lst_head, &cb_data->handles_lst));
+	nm_assert (   c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->handles_lst_head,           &cb_data->handles_lst)
+	           || c_list_contains (&NM_CONNECTIVITY_GET_PRIVATE (cb_data->self)->completed_handles_lst_head, &cb_data->handles_lst));
 
-	nm_utils_error_set_cancelled (&error, FALSE, "NMConnectivity");
-
-	cb_data_free (cb_data, NM_CONNECTIVITY_ERROR, error, "cancelled");
+	cb_data_complete (cb_data, NM_CONNECTIVITY_CANCELLED, "cancelled");
 }
 
 /*****************************************************************************/
@@ -684,6 +736,7 @@ nm_connectivity_init (NMConnectivity *self)
 	NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
 
 	c_list_init (&priv->handles_lst_head);
+	c_list_init (&priv->completed_handles_lst_head);
 
 	priv->config = g_object_ref (nm_config_get ());
 	g_signal_connect (G_OBJECT (priv->config),
@@ -715,16 +768,13 @@ dispose (GObject *object)
 	NMConnectivity *self = NM_CONNECTIVITY (object);
 	NMConnectivityPrivate *priv = NM_CONNECTIVITY_GET_PRIVATE (self);
 	NMConnectivityCheckHandle *cb_data;
-	GError *error = NULL;
-
-again:
-	c_list_for_each_entry (cb_data, &priv->handles_lst_head, handles_lst) {
-		if (!error)
-			nm_utils_error_set_cancelled (&error, TRUE, "NMConnectivity");
-		cb_data_free (cb_data, NM_CONNECTIVITY_ERROR, error, "shutting down");
-		goto again;
-	}
-	g_clear_error (&error);
+
+	nm_assert (c_list_is_empty (&priv->completed_handles_lst_head));
+
+	while ((cb_data = c_list_first_entry (&priv->handles_lst_head,
+	                                      NMConnectivityCheckHandle,
+	                                      handles_lst)))
+		cb_data_complete (cb_data, NM_CONNECTIVITY_DISPOSING, "shutting down");
 
 	g_clear_pointer (&priv->uri, g_free);
 	g_clear_pointer (&priv->response, g_free);
diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index df9295e0..178f27ad 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -24,8 +24,10 @@
 
 #include "nm-dbus-interface.h"
 
-#define NM_CONNECTIVITY_ERROR ((NMConnectivityState) -1)
-#define NM_CONNECTIVITY_FAKE  ((NMConnectivityState) -2)
+#define NM_CONNECTIVITY_ERROR     ((NMConnectivityState) -1)
+#define NM_CONNECTIVITY_FAKE      ((NMConnectivityState) -2)
+#define NM_CONNECTIVITY_CANCELLED ((NMConnectivityState) -3)
+#define NM_CONNECTIVITY_DISPOSING ((NMConnectivityState) -4)
 
 #define NM_TYPE_CONNECTIVITY            (nm_connectivity_get_type ())
 #define NM_CONNECTIVITY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity))
@@ -53,7 +55,6 @@ typedef struct _NMConnectivityCheckHandle NMConnectivityCheckHandle;
 typedef void (*NMConnectivityCheckCallback) (NMConnectivity *self,
                                              NMConnectivityCheckHandle *handle,
                                              NMConnectivityState state,
-                                             GError *error,
                                              gpointer user_data);
 
 NMConnectivityCheckHandle *nm_connectivity_check_start (NMConnectivity *self,
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 6ae81b57..657ebfc0 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -646,6 +646,37 @@ nm_ip4_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i
 }
 
 void
+nm_ip4_config_update_routes_metric (NMIP4Config *self, gint64 metric)
+{
+	gs_free NMPlatformIP4Route *routes = NULL;
+	gboolean need_update = FALSE;
+	const NMPlatformIP4Route *r;
+	NMDedupMultiIter iter;
+	guint num = 0, i = 0;
+
+	nm_ip_config_iter_ip4_route_for_each (&iter, self, &r) {
+		if (r->metric != metric)
+			need_update = TRUE;
+		num++;
+	}
+	if (!need_update)
+		return;
+
+	routes = g_new (NMPlatformIP4Route, num);
+	nm_ip_config_iter_ip4_route_for_each (&iter, self, &r) {
+		routes[i] = *r;
+		routes[i].metric = metric;
+		i++;
+	}
+
+	g_object_freeze_notify (G_OBJECT (self));
+	nm_ip4_config_reset_routes (self);
+	for (i = 0; i < num; i++)
+		nm_ip4_config_add_route (self, &routes[i], NULL);
+	g_object_thaw_notify (G_OBJECT (self));
+}
+
+void
 nm_ip4_config_add_dependent_routes (NMIP4Config *self,
                                     guint32 route_table,
                                     guint32 route_metric,
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index 78aca14e..45c1fa3f 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -223,6 +223,7 @@ const NMPlatformIP4Route *_nmtst_ip4_config_get_route (const NMIP4Config *self,
 const NMPlatformIP4Route *nm_ip4_config_get_direct_route_for_host (const NMIP4Config *self,
                                                                    in_addr_t host,
                                                                    guint32 route_table);
+void nm_ip4_config_update_routes_metric (NMIP4Config *self, gint64 metric);
 
 void nm_ip4_config_reset_nameservers (NMIP4Config *self);
 void nm_ip4_config_add_nameserver (NMIP4Config *self, guint32 nameserver);
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 9807d388..3869fee8 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -428,6 +428,37 @@ nm_ip6_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i
 }
 
 void
+nm_ip6_config_update_routes_metric (NMIP6Config *self, gint64 metric)
+{
+	gs_free NMPlatformIP6Route *routes = NULL;
+	gboolean need_update = FALSE;
+	const NMPlatformIP6Route *r;
+	NMDedupMultiIter iter;
+	guint num = 0, i = 0;
+
+	nm_ip_config_iter_ip6_route_for_each (&iter, self, &r) {
+		if (r->metric != metric)
+			need_update = TRUE;
+		num++;
+	}
+	if (!need_update)
+		return;
+
+	routes = g_new (NMPlatformIP6Route, num);
+	nm_ip_config_iter_ip6_route_for_each (&iter, self, &r) {
+		routes[i] = *r;
+		routes[i].metric = metric;
+		i++;
+	}
+
+	g_object_freeze_notify (G_OBJECT (self));
+	nm_ip6_config_reset_routes (self);
+	for (i = 0; i < num; i++)
+		nm_ip6_config_add_route (self, &routes[i], NULL);
+	g_object_thaw_notify (G_OBJECT (self));
+}
+
+void
 nm_ip6_config_add_dependent_routes (NMIP6Config *self,
                                     guint32 route_table,
                                     guint32 route_metric)
diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index 9762ef48..b8e80410 100644
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -224,4 +224,6 @@ void nm_ip6_config_reset_routes_ndisc (NMIP6Config *self,
                                        guint32 route_metric,
                                        gboolean kernel_support_rta_pref);
 
+void nm_ip6_config_update_routes_metric (NMIP6Config *self, gint64 metric);
+
 #endif /* __NETWORKMANAGER_IP6_CONFIG_H__ */
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 289dcf83..ad906169 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -3008,10 +3008,21 @@ platform_link_added (NMManager *self,
 			continue;
 
 		if (nm_device_is_real (candidate)) {
-			/* Ignore the link added event since there's already a realized
-			 * device with the link's name.
+			/* There's already a realized device with the link's name
+			 * and a different ifindex.
 			 */
-			nm_device_update_from_platform_link (candidate, plink);
+			if (nm_device_get_ifindex (candidate) <= 0)
+				nm_device_update_from_platform_link (candidate, plink);
+			else {
+				/* The ifindex of a device can't be changed after
+				 * initialization because it is used as a key by
+				 * the dns-manager.
+				 */
+				_LOGD (LOGD_DEVICE, "(%s): removing old device %p after ifindex change from %d to %d",
+				       plink->name, candidate, nm_device_get_ifindex (candidate), ifindex);
+				remove_device (self, candidate, FALSE, TRUE);
+				goto add;
+			}
 			return;
 		} else if (nm_device_realize_start (candidate,
 		                                    plink,
@@ -3031,6 +3042,7 @@ platform_link_added (NMManager *self,
 		/* Try next unrealized device */
 	}
 
+add:
 	/* Try registered device factories */
 	factory = nm_device_factory_manager_find_factory_for_link_type (plink->type);
 	if (factory) {
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
index 5e893c85..40bdea64 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/ppp/nm-ppp-manager.c
@@ -442,7 +442,7 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj,
 
 	if (priv->ifindex >= 0) {
 		_LOGW ("can't change the ifindex from %d to %d", priv->ifindex, (int) ifindex);
-		return;
+		goto out;
 	}
 
 	if (ifindex > 0) {
@@ -462,7 +462,13 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj,
 
 	obj_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (plink));
 
-	g_signal_emit (self, signals[IFINDEX_SET], 0, ifindex, plink->name);
+	g_signal_emit (self,
+	               signals[IFINDEX_SET],
+	               0,
+	               ifindex,
+	               plink ? plink->name : NULL);
+
+out:
 	g_dbus_method_invocation_return_value (invocation, NULL);
 }
 
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 71e6a35a..e16e3130 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -111,7 +111,7 @@ typedef struct {
 	NMSupplicantInterfaceState state;
 	int            disconnect_reason;
 
-	gboolean       scanning:1;
+	bool           scanning:1;
 
 	bool           scan_done_pending:1;
 	bool           scan_done_success:1;
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index ad752c4c..91acf07e 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -2686,12 +2686,16 @@ plugin_interactive_secrets_required (NMVpnConnection *self,
 	gs_free const char **hints = NULL;
 	gs_free char *message_hint = NULL;
 
+	if (!NM_IN_SET (priv->vpn_state, STATE_CONNECT,
+	                                 STATE_NEED_AUTH)) {
+		_LOGD ("VPN plugin: requested secrets; state %s (%d); ignore request in current state",
+		       vpn_state_to_string (priv->vpn_state), priv->vpn_state);
+		return;
+	}
+
 	_LOGI ("VPN plugin: requested secrets; state %s (%d)",
 	       vpn_state_to_string (priv->vpn_state), priv->vpn_state);
 
-	g_return_if_fail (priv->vpn_state == STATE_CONNECT ||
-	                  priv->vpn_state == STATE_NEED_AUTH);
-
 	priv->secrets_idx = SECRETS_REQ_INTERACTIVE;
 	_set_vpn_state (self, STATE_NEED_AUTH, NM_ACTIVE_CONNECTION_STATE_REASON_NONE, FALSE);
 
@@ -2758,6 +2762,9 @@ dispose (GObject *object)
 	NMVpnConnection *self = NM_VPN_CONNECTION (object);
 	NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
 
+	if (priv->proxy)
+		g_signal_handlers_disconnect_by_data (priv->proxy, self);
+
 	nm_clear_g_source (&priv->start_timeout);
 
 	g_clear_pointer (&priv->connect_hash, g_variant_unref);
diff --git a/vapi/meson.build b/vapi/meson.build
index 835a0b9a..37e5090c 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -18,12 +18,11 @@ if enable_libnm_glib
     install: true
   )
 
-  packages += libnm_util_vapi
-
   gnome.generate_vapi(
     libnm_glib_name,
     sources: libnm_glib_gir[0],
-    packages: packages,
+    packages: packages + [libnm_util_vapi],
+    gir_dirs: [join_paths(meson.current_build_dir(), '..', 'libnm-util')],
     install: true
   )
 endif