Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master

145 files changed, 13523 insertions, 14560 deletions

diff --git a/Makefile.am b/Makefile.am
index 089af417..d5cbcf54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1008,6 +1008,7 @@ libnm_core_libnm_core_la_CPPFLAGS = \
 
 if WITH_JSON_VALIDATION
 libnm_core_libnm_core_la_CPPFLAGS += $(JANSSON_CFLAGS)
+libnm_core_libnm_core_la_CFLAGS = -fcommon
 endif
 
 libnm_core_libnm_core_la_SOURCES = \
diff --git a/Makefile.in b/Makefile.in
index 9b70f3d5..ef8c8816 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -832,8 +832,8 @@ libnm_core_libnm_core_la_OBJECTS =  \
 	$(nodist_libnm_core_libnm_core_la_OBJECTS)
 libnm_core_libnm_core_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libnm_core_libnm_core_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) \
+	$(libnm_core_libnm_core_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_CRYPTO_GNUTLS_TRUE@libnm_core_libnm_crypto_gnutls_la_DEPENDENCIES =  \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1)
@@ -5487,6 +5487,7 @@ libnm_core_libnm_core_la_CPPFLAGS = $(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
 	$(NULL) $(am__append_7)
+@WITH_JSON_VALIDATION_TRUE@libnm_core_libnm_core_la_CFLAGS = -fcommon
 libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_h_pub_real) \
 	$(libnm_core_lib_h_priv) \
@@ -11950,452 +11951,452 @@ introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo: introspection/org.
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/libnmdbus_la-org.freedesktop.NetworkManager.lo `test -f 'introspection/org.freedesktop.NetworkManager.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.c
 
 libnm-core/libnm_core_la-nm-setting-6lowpan.lo: libnm-core/nm-setting-6lowpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-6lowpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-6lowpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-6lowpan.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-6lowpan.c' object='libnm-core/libnm_core_la-nm-setting-6lowpan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-6lowpan.lo `test -f 'libnm-core/nm-setting-6lowpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-6lowpan.c
 
 libnm-core/libnm_core_la-nm-setting-8021x.lo: libnm-core/nm-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-8021x.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Tpo -c -o libnm-core/libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-8021x.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Tpo -c -o libnm-core/libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-8021x.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-8021x.c' object='libnm-core/libnm_core_la-nm-setting-8021x.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c
 
 libnm-core/libnm_core_la-nm-setting-adsl.lo: libnm-core/nm-setting-adsl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-adsl.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-adsl.Tpo -c -o libnm-core/libnm_core_la-nm-setting-adsl.lo `test -f 'libnm-core/nm-setting-adsl.c' || echo '$(srcdir)/'`libnm-core/nm-setting-adsl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-adsl.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-adsl.Tpo -c -o libnm-core/libnm_core_la-nm-setting-adsl.lo `test -f 'libnm-core/nm-setting-adsl.c' || echo '$(srcdir)/'`libnm-core/nm-setting-adsl.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-adsl.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-adsl.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-adsl.c' object='libnm-core/libnm_core_la-nm-setting-adsl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-adsl.lo `test -f 'libnm-core/nm-setting-adsl.c' || echo '$(srcdir)/'`libnm-core/nm-setting-adsl.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-adsl.lo `test -f 'libnm-core/nm-setting-adsl.c' || echo '$(srcdir)/'`libnm-core/nm-setting-adsl.c
 
 libnm-core/libnm_core_la-nm-setting-bluetooth.lo: libnm-core/nm-setting-bluetooth.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bluetooth.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bluetooth.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bluetooth.lo `test -f 'libnm-core/nm-setting-bluetooth.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bluetooth.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bluetooth.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bluetooth.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bluetooth.lo `test -f 'libnm-core/nm-setting-bluetooth.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bluetooth.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bluetooth.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bluetooth.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-bluetooth.c' object='libnm-core/libnm_core_la-nm-setting-bluetooth.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bluetooth.lo `test -f 'libnm-core/nm-setting-bluetooth.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bluetooth.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bluetooth.lo `test -f 'libnm-core/nm-setting-bluetooth.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bluetooth.c
 
 libnm-core/libnm_core_la-nm-setting-bond.lo: libnm-core/nm-setting-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bond.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bond.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bond.lo `test -f 'libnm-core/nm-setting-bond.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bond.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bond.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bond.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bond.lo `test -f 'libnm-core/nm-setting-bond.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bond.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bond.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bond.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-bond.c' object='libnm-core/libnm_core_la-nm-setting-bond.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bond.lo `test -f 'libnm-core/nm-setting-bond.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bond.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bond.lo `test -f 'libnm-core/nm-setting-bond.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bond.c
 
 libnm-core/libnm_core_la-nm-setting-bridge-port.lo: libnm-core/nm-setting-bridge-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bridge-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge-port.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bridge-port.lo `test -f 'libnm-core/nm-setting-bridge-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bridge-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge-port.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bridge-port.lo `test -f 'libnm-core/nm-setting-bridge-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge-port.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge-port.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge-port.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-bridge-port.c' object='libnm-core/libnm_core_la-nm-setting-bridge-port.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bridge-port.lo `test -f 'libnm-core/nm-setting-bridge-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge-port.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bridge-port.lo `test -f 'libnm-core/nm-setting-bridge-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge-port.c
 
 libnm-core/libnm_core_la-nm-setting-bridge.lo: libnm-core/nm-setting-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bridge.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bridge.lo `test -f 'libnm-core/nm-setting-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-bridge.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge.Tpo -c -o libnm-core/libnm_core_la-nm-setting-bridge.lo `test -f 'libnm-core/nm-setting-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-bridge.c' object='libnm-core/libnm_core_la-nm-setting-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bridge.lo `test -f 'libnm-core/nm-setting-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-bridge.lo `test -f 'libnm-core/nm-setting-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-bridge.c
 
 libnm-core/libnm_core_la-nm-setting-cdma.lo: libnm-core/nm-setting-cdma.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-cdma.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-cdma.Tpo -c -o libnm-core/libnm_core_la-nm-setting-cdma.lo `test -f 'libnm-core/nm-setting-cdma.c' || echo '$(srcdir)/'`libnm-core/nm-setting-cdma.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-cdma.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-cdma.Tpo -c -o libnm-core/libnm_core_la-nm-setting-cdma.lo `test -f 'libnm-core/nm-setting-cdma.c' || echo '$(srcdir)/'`libnm-core/nm-setting-cdma.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-cdma.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-cdma.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-cdma.c' object='libnm-core/libnm_core_la-nm-setting-cdma.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-cdma.lo `test -f 'libnm-core/nm-setting-cdma.c' || echo '$(srcdir)/'`libnm-core/nm-setting-cdma.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-cdma.lo `test -f 'libnm-core/nm-setting-cdma.c' || echo '$(srcdir)/'`libnm-core/nm-setting-cdma.c
 
 libnm-core/libnm_core_la-nm-setting-connection.lo: libnm-core/nm-setting-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-connection.Tpo -c -o libnm-core/libnm_core_la-nm-setting-connection.lo `test -f 'libnm-core/nm-setting-connection.c' || echo '$(srcdir)/'`libnm-core/nm-setting-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-connection.Tpo -c -o libnm-core/libnm_core_la-nm-setting-connection.lo `test -f 'libnm-core/nm-setting-connection.c' || echo '$(srcdir)/'`libnm-core/nm-setting-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-connection.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-connection.c' object='libnm-core/libnm_core_la-nm-setting-connection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-connection.lo `test -f 'libnm-core/nm-setting-connection.c' || echo '$(srcdir)/'`libnm-core/nm-setting-connection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-connection.lo `test -f 'libnm-core/nm-setting-connection.c' || echo '$(srcdir)/'`libnm-core/nm-setting-connection.c
 
 libnm-core/libnm_core_la-nm-setting-dcb.lo: libnm-core/nm-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-dcb.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dcb.Tpo -c -o libnm-core/libnm_core_la-nm-setting-dcb.lo `test -f 'libnm-core/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dcb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-dcb.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dcb.Tpo -c -o libnm-core/libnm_core_la-nm-setting-dcb.lo `test -f 'libnm-core/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dcb.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dcb.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dcb.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-dcb.c' object='libnm-core/libnm_core_la-nm-setting-dcb.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-dcb.lo `test -f 'libnm-core/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dcb.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-dcb.lo `test -f 'libnm-core/nm-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dcb.c
 
 libnm-core/libnm_core_la-nm-setting-dummy.lo: libnm-core/nm-setting-dummy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-dummy.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dummy.Tpo -c -o libnm-core/libnm_core_la-nm-setting-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-dummy.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dummy.Tpo -c -o libnm-core/libnm_core_la-nm-setting-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dummy.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-dummy.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-dummy.c' object='libnm-core/libnm_core_la-nm-setting-dummy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-dummy.lo `test -f 'libnm-core/nm-setting-dummy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-dummy.c
 
 libnm-core/libnm_core_la-nm-setting-ethtool.lo: libnm-core/nm-setting-ethtool.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ethtool.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ethtool.lo `test -f 'libnm-core/nm-setting-ethtool.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ethtool.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ethtool.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ethtool.lo `test -f 'libnm-core/nm-setting-ethtool.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ethtool.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ethtool.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ethtool.c' object='libnm-core/libnm_core_la-nm-setting-ethtool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ethtool.lo `test -f 'libnm-core/nm-setting-ethtool.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ethtool.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ethtool.lo `test -f 'libnm-core/nm-setting-ethtool.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ethtool.c
 
 libnm-core/libnm_core_la-nm-setting-generic.lo: libnm-core/nm-setting-generic.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-generic.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Tpo -c -o libnm-core/libnm_core_la-nm-setting-generic.lo `test -f 'libnm-core/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-core/nm-setting-generic.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-generic.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Tpo -c -o libnm-core/libnm_core_la-nm-setting-generic.lo `test -f 'libnm-core/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-core/nm-setting-generic.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-generic.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-generic.c' object='libnm-core/libnm_core_la-nm-setting-generic.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-generic.lo `test -f 'libnm-core/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-core/nm-setting-generic.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-generic.lo `test -f 'libnm-core/nm-setting-generic.c' || echo '$(srcdir)/'`libnm-core/nm-setting-generic.c
 
 libnm-core/libnm_core_la-nm-setting-gsm.lo: libnm-core/nm-setting-gsm.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-gsm.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Tpo -c -o libnm-core/libnm_core_la-nm-setting-gsm.lo `test -f 'libnm-core/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-core/nm-setting-gsm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-gsm.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Tpo -c -o libnm-core/libnm_core_la-nm-setting-gsm.lo `test -f 'libnm-core/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-core/nm-setting-gsm.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-gsm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-gsm.c' object='libnm-core/libnm_core_la-nm-setting-gsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-gsm.lo `test -f 'libnm-core/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-core/nm-setting-gsm.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-gsm.lo `test -f 'libnm-core/nm-setting-gsm.c' || echo '$(srcdir)/'`libnm-core/nm-setting-gsm.c
 
 libnm-core/libnm_core_la-nm-setting-infiniband.lo: libnm-core/nm-setting-infiniband.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-infiniband.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Tpo -c -o libnm-core/libnm_core_la-nm-setting-infiniband.lo `test -f 'libnm-core/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-core/nm-setting-infiniband.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-infiniband.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Tpo -c -o libnm-core/libnm_core_la-nm-setting-infiniband.lo `test -f 'libnm-core/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-core/nm-setting-infiniband.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-infiniband.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-infiniband.c' object='libnm-core/libnm_core_la-nm-setting-infiniband.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-infiniband.lo `test -f 'libnm-core/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-core/nm-setting-infiniband.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-infiniband.lo `test -f 'libnm-core/nm-setting-infiniband.c' || echo '$(srcdir)/'`libnm-core/nm-setting-infiniband.c
 
 libnm-core/libnm_core_la-nm-setting-ip-config.lo: libnm-core/nm-setting-ip-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip-config.lo `test -f 'libnm-core/nm-setting-ip-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip-config.lo `test -f 'libnm-core/nm-setting-ip-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-config.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-config.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ip-config.c' object='libnm-core/libnm_core_la-nm-setting-ip-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip-config.lo `test -f 'libnm-core/nm-setting-ip-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip-config.lo `test -f 'libnm-core/nm-setting-ip-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-config.c
 
 libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo: libnm-core/nm-setting-ip-tunnel.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo `test -f 'libnm-core/nm-setting-ip-tunnel.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-tunnel.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo `test -f 'libnm-core/nm-setting-ip-tunnel.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-tunnel.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip-tunnel.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ip-tunnel.c' object='libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo `test -f 'libnm-core/nm-setting-ip-tunnel.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-tunnel.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip-tunnel.lo `test -f 'libnm-core/nm-setting-ip-tunnel.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip-tunnel.c
 
 libnm-core/libnm_core_la-nm-setting-ip4-config.lo: libnm-core/nm-setting-ip4-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip4-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip4-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip4-config.lo `test -f 'libnm-core/nm-setting-ip4-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip4-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip4-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip4-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip4-config.lo `test -f 'libnm-core/nm-setting-ip4-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip4-config.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip4-config.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip4-config.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ip4-config.c' object='libnm-core/libnm_core_la-nm-setting-ip4-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip4-config.lo `test -f 'libnm-core/nm-setting-ip4-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip4-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip4-config.lo `test -f 'libnm-core/nm-setting-ip4-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip4-config.c
 
 libnm-core/libnm_core_la-nm-setting-ip6-config.lo: libnm-core/nm-setting-ip6-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip6-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip6-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip6-config.lo `test -f 'libnm-core/nm-setting-ip6-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip6-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ip6-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip6-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ip6-config.lo `test -f 'libnm-core/nm-setting-ip6-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip6-config.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip6-config.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ip6-config.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ip6-config.c' object='libnm-core/libnm_core_la-nm-setting-ip6-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip6-config.lo `test -f 'libnm-core/nm-setting-ip6-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip6-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ip6-config.lo `test -f 'libnm-core/nm-setting-ip6-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ip6-config.c
 
 libnm-core/libnm_core_la-nm-setting-macsec.lo: libnm-core/nm-setting-macsec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-macsec.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macsec.Tpo -c -o libnm-core/libnm_core_la-nm-setting-macsec.lo `test -f 'libnm-core/nm-setting-macsec.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macsec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-macsec.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macsec.Tpo -c -o libnm-core/libnm_core_la-nm-setting-macsec.lo `test -f 'libnm-core/nm-setting-macsec.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macsec.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macsec.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macsec.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-macsec.c' object='libnm-core/libnm_core_la-nm-setting-macsec.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-macsec.lo `test -f 'libnm-core/nm-setting-macsec.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macsec.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-macsec.lo `test -f 'libnm-core/nm-setting-macsec.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macsec.c
 
 libnm-core/libnm_core_la-nm-setting-macvlan.lo: libnm-core/nm-setting-macvlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-macvlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macvlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-macvlan.lo `test -f 'libnm-core/nm-setting-macvlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macvlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-macvlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macvlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-macvlan.lo `test -f 'libnm-core/nm-setting-macvlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macvlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macvlan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-macvlan.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-macvlan.c' object='libnm-core/libnm_core_la-nm-setting-macvlan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-macvlan.lo `test -f 'libnm-core/nm-setting-macvlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macvlan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-macvlan.lo `test -f 'libnm-core/nm-setting-macvlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-macvlan.c
 
 libnm-core/libnm_core_la-nm-setting-match.lo: libnm-core/nm-setting-match.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-match.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Tpo -c -o libnm-core/libnm_core_la-nm-setting-match.lo `test -f 'libnm-core/nm-setting-match.c' || echo '$(srcdir)/'`libnm-core/nm-setting-match.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-match.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Tpo -c -o libnm-core/libnm_core_la-nm-setting-match.lo `test -f 'libnm-core/nm-setting-match.c' || echo '$(srcdir)/'`libnm-core/nm-setting-match.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-match.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-match.c' object='libnm-core/libnm_core_la-nm-setting-match.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-match.lo `test -f 'libnm-core/nm-setting-match.c' || echo '$(srcdir)/'`libnm-core/nm-setting-match.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-match.lo `test -f 'libnm-core/nm-setting-match.c' || echo '$(srcdir)/'`libnm-core/nm-setting-match.c
 
 libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo: libnm-core/nm-setting-olpc-mesh.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Tpo -c -o libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo `test -f 'libnm-core/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-core/nm-setting-olpc-mesh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Tpo -c -o libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo `test -f 'libnm-core/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-core/nm-setting-olpc-mesh.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-olpc-mesh.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-olpc-mesh.c' object='libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo `test -f 'libnm-core/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-core/nm-setting-olpc-mesh.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-olpc-mesh.lo `test -f 'libnm-core/nm-setting-olpc-mesh.c' || echo '$(srcdir)/'`libnm-core/nm-setting-olpc-mesh.c
 
 libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo: libnm-core/nm-setting-ovs-bridge.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo `test -f 'libnm-core/nm-setting-ovs-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo `test -f 'libnm-core/nm-setting-ovs-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-bridge.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-bridge.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-bridge.c' object='libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo `test -f 'libnm-core/nm-setting-ovs-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-bridge.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-bridge.lo `test -f 'libnm-core/nm-setting-ovs-bridge.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-bridge.c
 
 libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo: libnm-core/nm-setting-ovs-dpdk.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo `test -f 'libnm-core/nm-setting-ovs-dpdk.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-dpdk.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo `test -f 'libnm-core/nm-setting-ovs-dpdk.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-dpdk.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-dpdk.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-dpdk.c' object='libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo `test -f 'libnm-core/nm-setting-ovs-dpdk.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-dpdk.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-dpdk.lo `test -f 'libnm-core/nm-setting-ovs-dpdk.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-dpdk.c
 
 libnm-core/libnm_core_la-nm-setting-ovs-interface.lo: libnm-core/nm-setting-ovs-interface.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-interface.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-interface.lo `test -f 'libnm-core/nm-setting-ovs-interface.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-interface.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-interface.lo `test -f 'libnm-core/nm-setting-ovs-interface.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-interface.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-interface.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-interface.c' object='libnm-core/libnm_core_la-nm-setting-ovs-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-interface.lo `test -f 'libnm-core/nm-setting-ovs-interface.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-interface.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-interface.lo `test -f 'libnm-core/nm-setting-ovs-interface.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-interface.c
 
 libnm-core/libnm_core_la-nm-setting-ovs-patch.lo: libnm-core/nm-setting-ovs-patch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-patch.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-patch.lo `test -f 'libnm-core/nm-setting-ovs-patch.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-patch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-patch.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-patch.lo `test -f 'libnm-core/nm-setting-ovs-patch.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-patch.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-patch.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-patch.c' object='libnm-core/libnm_core_la-nm-setting-ovs-patch.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-patch.lo `test -f 'libnm-core/nm-setting-ovs-patch.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-patch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-patch.lo `test -f 'libnm-core/nm-setting-ovs-patch.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-patch.c
 
 libnm-core/libnm_core_la-nm-setting-ovs-port.lo: libnm-core/nm-setting-ovs-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-port.lo `test -f 'libnm-core/nm-setting-ovs-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ovs-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ovs-port.lo `test -f 'libnm-core/nm-setting-ovs-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-port.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ovs-port.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ovs-port.c' object='libnm-core/libnm_core_la-nm-setting-ovs-port.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-port.lo `test -f 'libnm-core/nm-setting-ovs-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-port.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ovs-port.lo `test -f 'libnm-core/nm-setting-ovs-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ovs-port.c
 
 libnm-core/libnm_core_la-nm-setting-ppp.lo: libnm-core/nm-setting-ppp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ppp.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ppp.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ppp.lo `test -f 'libnm-core/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ppp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-ppp.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ppp.Tpo -c -o libnm-core/libnm_core_la-nm-setting-ppp.lo `test -f 'libnm-core/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ppp.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ppp.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-ppp.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-ppp.c' object='libnm-core/libnm_core_la-nm-setting-ppp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ppp.lo `test -f 'libnm-core/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ppp.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-ppp.lo `test -f 'libnm-core/nm-setting-ppp.c' || echo '$(srcdir)/'`libnm-core/nm-setting-ppp.c
 
 libnm-core/libnm_core_la-nm-setting-pppoe.lo: libnm-core/nm-setting-pppoe.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-pppoe.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-pppoe.Tpo -c -o libnm-core/libnm_core_la-nm-setting-pppoe.lo `test -f 'libnm-core/nm-setting-pppoe.c' || echo '$(srcdir)/'`libnm-core/nm-setting-pppoe.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-pppoe.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-pppoe.Tpo -c -o libnm-core/libnm_core_la-nm-setting-pppoe.lo `test -f 'libnm-core/nm-setting-pppoe.c' || echo '$(srcdir)/'`libnm-core/nm-setting-pppoe.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-pppoe.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-pppoe.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-pppoe.c' object='libnm-core/libnm_core_la-nm-setting-pppoe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-pppoe.lo `test -f 'libnm-core/nm-setting-pppoe.c' || echo '$(srcdir)/'`libnm-core/nm-setting-pppoe.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-pppoe.lo `test -f 'libnm-core/nm-setting-pppoe.c' || echo '$(srcdir)/'`libnm-core/nm-setting-pppoe.c
 
 libnm-core/libnm_core_la-nm-setting-proxy.lo: libnm-core/nm-setting-proxy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-proxy.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-proxy.Tpo -c -o libnm-core/libnm_core_la-nm-setting-proxy.lo `test -f 'libnm-core/nm-setting-proxy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-proxy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-proxy.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-proxy.Tpo -c -o libnm-core/libnm_core_la-nm-setting-proxy.lo `test -f 'libnm-core/nm-setting-proxy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-proxy.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-proxy.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-proxy.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-proxy.c' object='libnm-core/libnm_core_la-nm-setting-proxy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-proxy.lo `test -f 'libnm-core/nm-setting-proxy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-proxy.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-proxy.lo `test -f 'libnm-core/nm-setting-proxy.c' || echo '$(srcdir)/'`libnm-core/nm-setting-proxy.c
 
 libnm-core/libnm_core_la-nm-setting-serial.lo: libnm-core/nm-setting-serial.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-serial.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-serial.Tpo -c -o libnm-core/libnm_core_la-nm-setting-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-serial.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-serial.Tpo -c -o libnm-core/libnm_core_la-nm-setting-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-serial.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-serial.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-serial.c' object='libnm-core/libnm_core_la-nm-setting-serial.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
 
 libnm-core/libnm_core_la-nm-setting-sriov.lo: libnm-core/nm-setting-sriov.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-sriov.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-sriov.Tpo -c -o libnm-core/libnm_core_la-nm-setting-sriov.lo `test -f 'libnm-core/nm-setting-sriov.c' || echo '$(srcdir)/'`libnm-core/nm-setting-sriov.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-sriov.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-sriov.Tpo -c -o libnm-core/libnm_core_la-nm-setting-sriov.lo `test -f 'libnm-core/nm-setting-sriov.c' || echo '$(srcdir)/'`libnm-core/nm-setting-sriov.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-sriov.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-sriov.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-sriov.c' object='libnm-core/libnm_core_la-nm-setting-sriov.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-sriov.lo `test -f 'libnm-core/nm-setting-sriov.c' || echo '$(srcdir)/'`libnm-core/nm-setting-sriov.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-sriov.lo `test -f 'libnm-core/nm-setting-sriov.c' || echo '$(srcdir)/'`libnm-core/nm-setting-sriov.c
 
 libnm-core/libnm_core_la-nm-setting-tc-config.lo: libnm-core/nm-setting-tc-config.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-tc-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tc-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-tc-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tc-config.Tpo -c -o libnm-core/libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tc-config.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tc-config.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-tc-config.c' object='libnm-core/libnm_core_la-nm-setting-tc-config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
 
 libnm-core/libnm_core_la-nm-setting-team-port.lo: libnm-core/nm-setting-team-port.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-team-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team-port.Tpo -c -o libnm-core/libnm_core_la-nm-setting-team-port.lo `test -f 'libnm-core/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team-port.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-team-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team-port.Tpo -c -o libnm-core/libnm_core_la-nm-setting-team-port.lo `test -f 'libnm-core/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team-port.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team-port.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team-port.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-team-port.c' object='libnm-core/libnm_core_la-nm-setting-team-port.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-team-port.lo `test -f 'libnm-core/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team-port.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-team-port.lo `test -f 'libnm-core/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team-port.c
 
 libnm-core/libnm_core_la-nm-setting-team.lo: libnm-core/nm-setting-team.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-team.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Tpo -c -o libnm-core/libnm_core_la-nm-setting-team.lo `test -f 'libnm-core/nm-setting-team.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-team.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Tpo -c -o libnm-core/libnm_core_la-nm-setting-team.lo `test -f 'libnm-core/nm-setting-team.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-team.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-team.c' object='libnm-core/libnm_core_la-nm-setting-team.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-team.lo `test -f 'libnm-core/nm-setting-team.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-team.lo `test -f 'libnm-core/nm-setting-team.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team.c
 
 libnm-core/libnm_core_la-nm-setting-tun.lo: libnm-core/nm-setting-tun.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-tun.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Tpo -c -o libnm-core/libnm_core_la-nm-setting-tun.lo `test -f 'libnm-core/nm-setting-tun.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tun.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-tun.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Tpo -c -o libnm-core/libnm_core_la-nm-setting-tun.lo `test -f 'libnm-core/nm-setting-tun.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tun.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-tun.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-tun.c' object='libnm-core/libnm_core_la-nm-setting-tun.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-tun.lo `test -f 'libnm-core/nm-setting-tun.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tun.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-tun.lo `test -f 'libnm-core/nm-setting-tun.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tun.c
 
 libnm-core/libnm_core_la-nm-setting-user.lo: libnm-core/nm-setting-user.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-user.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Tpo -c -o libnm-core/libnm_core_la-nm-setting-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-user.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Tpo -c -o libnm-core/libnm_core_la-nm-setting-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-user.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-user.c' object='libnm-core/libnm_core_la-nm-setting-user.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-user.lo `test -f 'libnm-core/nm-setting-user.c' || echo '$(srcdir)/'`libnm-core/nm-setting-user.c
 
 libnm-core/libnm_core_la-nm-setting-vlan.lo: libnm-core/nm-setting-vlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vlan.lo `test -f 'libnm-core/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vlan.lo `test -f 'libnm-core/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vlan.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-vlan.c' object='libnm-core/libnm_core_la-nm-setting-vlan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vlan.lo `test -f 'libnm-core/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vlan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vlan.lo `test -f 'libnm-core/nm-setting-vlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vlan.c
 
 libnm-core/libnm_core_la-nm-setting-vpn.lo: libnm-core/nm-setting-vpn.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vpn.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vpn.lo `test -f 'libnm-core/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vpn.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vpn.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vpn.lo `test -f 'libnm-core/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vpn.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vpn.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-vpn.c' object='libnm-core/libnm_core_la-nm-setting-vpn.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vpn.lo `test -f 'libnm-core/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vpn.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vpn.lo `test -f 'libnm-core/nm-setting-vpn.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vpn.c
 
 libnm-core/libnm_core_la-nm-setting-vxlan.lo: libnm-core/nm-setting-vxlan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vxlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vxlan.lo `test -f 'libnm-core/nm-setting-vxlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vxlan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-vxlan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-vxlan.lo `test -f 'libnm-core/nm-setting-vxlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vxlan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-vxlan.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-vxlan.c' object='libnm-core/libnm_core_la-nm-setting-vxlan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vxlan.lo `test -f 'libnm-core/nm-setting-vxlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vxlan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-vxlan.lo `test -f 'libnm-core/nm-setting-vxlan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-vxlan.c
 
 libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo: libnm-core/nm-setting-wifi-p2p.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo `test -f 'libnm-core/nm-setting-wifi-p2p.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wifi-p2p.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo `test -f 'libnm-core/nm-setting-wifi-p2p.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wifi-p2p.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wifi-p2p.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wifi-p2p.c' object='libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo `test -f 'libnm-core/nm-setting-wifi-p2p.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wifi-p2p.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wifi-p2p.lo `test -f 'libnm-core/nm-setting-wifi-p2p.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wifi-p2p.c
 
 libnm-core/libnm_core_la-nm-setting-wimax.lo: libnm-core/nm-setting-wimax.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wimax.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wimax.lo `test -f 'libnm-core/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wimax.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wimax.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wimax.lo `test -f 'libnm-core/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wimax.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wimax.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wimax.c' object='libnm-core/libnm_core_la-nm-setting-wimax.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wimax.lo `test -f 'libnm-core/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wimax.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wimax.lo `test -f 'libnm-core/nm-setting-wimax.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wimax.c
 
 libnm-core/libnm_core_la-nm-setting-wired.lo: libnm-core/nm-setting-wired.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wired.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wired.lo `test -f 'libnm-core/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wired.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wired.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wired.lo `test -f 'libnm-core/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wired.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wired.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wired.c' object='libnm-core/libnm_core_la-nm-setting-wired.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wired.lo `test -f 'libnm-core/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wired.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wired.lo `test -f 'libnm-core/nm-setting-wired.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wired.c
 
 libnm-core/libnm_core_la-nm-setting-wireguard.lo: libnm-core/nm-setting-wireguard.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireguard.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireguard.lo `test -f 'libnm-core/nm-setting-wireguard.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireguard.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireguard.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireguard.lo `test -f 'libnm-core/nm-setting-wireguard.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireguard.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireguard.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wireguard.c' object='libnm-core/libnm_core_la-nm-setting-wireguard.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireguard.lo `test -f 'libnm-core/nm-setting-wireguard.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireguard.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireguard.lo `test -f 'libnm-core/nm-setting-wireguard.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireguard.c
 
 libnm-core/libnm_core_la-nm-setting-wireless-security.lo: libnm-core/nm-setting-wireless-security.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireless-security.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireless-security.lo `test -f 'libnm-core/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless-security.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireless-security.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireless-security.lo `test -f 'libnm-core/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless-security.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless-security.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wireless-security.c' object='libnm-core/libnm_core_la-nm-setting-wireless-security.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireless-security.lo `test -f 'libnm-core/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless-security.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireless-security.lo `test -f 'libnm-core/nm-setting-wireless-security.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless-security.c
 
 libnm-core/libnm_core_la-nm-setting-wireless.lo: libnm-core/nm-setting-wireless.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireless.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wireless.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wireless.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wireless.c' object='libnm-core/libnm_core_la-nm-setting-wireless.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c
 
 libnm-core/libnm_core_la-nm-setting-wpan.lo: libnm-core/nm-setting-wpan.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting-wpan.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Tpo -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting-wpan.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-wpan.c' object='libnm-core/libnm_core_la-nm-setting-wpan.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c
 
 shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c
 
 libnm-core/libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-connection.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_la-nm-connection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c
 
 libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/nm-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-crypto.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-crypto.c' object='libnm-core/libnm_core_la-nm-crypto.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-crypto.lo `test -f 'libnm-core/nm-crypto.c' || echo '$(srcdir)/'`libnm-core/nm-crypto.c
 
 libnm-core/libnm_core_la-nm-dbus-utils.lo: libnm-core/nm-dbus-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-dbus-utils.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_la-nm-dbus-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c
 
 libnm-core/libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-errors.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_la-nm-errors.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c
 
 libnm-core/libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile-utils.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c
 
 libnm-core/libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-keyfile.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_la-nm-keyfile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c
 
 libnm-core/libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-property-compare.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_la-nm-property-compare.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c
 
 libnm-core/libnm_core_la-nm-setting.lo: libnm-core/nm-setting.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Tpo -c -o libnm-core/libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-setting.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Tpo -c -o libnm-core/libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-setting.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting.c' object='libnm-core/libnm_core_la-nm-setting.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c
 
 libnm-core/libnm_core_la-nm-simple-connection.lo: libnm-core/nm-simple-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-simple-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Tpo -c -o libnm-core/libnm_core_la-nm-simple-connection.lo `test -f 'libnm-core/nm-simple-connection.c' || echo '$(srcdir)/'`libnm-core/nm-simple-connection.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-simple-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Tpo -c -o libnm-core/libnm_core_la-nm-simple-connection.lo `test -f 'libnm-core/nm-simple-connection.c' || echo '$(srcdir)/'`libnm-core/nm-simple-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-simple-connection.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-simple-connection.c' object='libnm-core/libnm_core_la-nm-simple-connection.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-simple-connection.lo `test -f 'libnm-core/nm-simple-connection.c' || echo '$(srcdir)/'`libnm-core/nm-simple-connection.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-simple-connection.lo `test -f 'libnm-core/nm-simple-connection.c' || echo '$(srcdir)/'`libnm-core/nm-simple-connection.c
 
 libnm-core/libnm_core_la-nm-team-utils.lo: libnm-core/nm-team-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-team-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Tpo -c -o libnm-core/libnm_core_la-nm-team-utils.lo `test -f 'libnm-core/nm-team-utils.c' || echo '$(srcdir)/'`libnm-core/nm-team-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-team-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Tpo -c -o libnm-core/libnm_core_la-nm-team-utils.lo `test -f 'libnm-core/nm-team-utils.c' || echo '$(srcdir)/'`libnm-core/nm-team-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-team-utils.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-team-utils.c' object='libnm-core/libnm_core_la-nm-team-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-team-utils.lo `test -f 'libnm-core/nm-team-utils.c' || echo '$(srcdir)/'`libnm-core/nm-team-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-team-utils.lo `test -f 'libnm-core/nm-team-utils.c' || echo '$(srcdir)/'`libnm-core/nm-team-utils.c
 
 libnm-core/libnm_core_la-nm-utils.lo: libnm-core/nm-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Tpo -c -o libnm-core/libnm_core_la-nm-utils.lo `test -f 'libnm-core/nm-utils.c' || echo '$(srcdir)/'`libnm-core/nm-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Tpo -c -o libnm-core/libnm_core_la-nm-utils.lo `test -f 'libnm-core/nm-utils.c' || echo '$(srcdir)/'`libnm-core/nm-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-utils.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-utils.c' object='libnm-core/libnm_core_la-nm-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-utils.lo `test -f 'libnm-core/nm-utils.c' || echo '$(srcdir)/'`libnm-core/nm-utils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-utils.lo `test -f 'libnm-core/nm-utils.c' || echo '$(srcdir)/'`libnm-core/nm-utils.c
 
 libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo: libnm-core/nm-vpn-editor-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Tpo -c -o libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo `test -f 'libnm-core/nm-vpn-editor-plugin.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-editor-plugin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Tpo -c -o libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo `test -f 'libnm-core/nm-vpn-editor-plugin.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-editor-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-editor-plugin.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-vpn-editor-plugin.c' object='libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo `test -f 'libnm-core/nm-vpn-editor-plugin.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-editor-plugin.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-vpn-editor-plugin.lo `test -f 'libnm-core/nm-vpn-editor-plugin.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-editor-plugin.c
 
 libnm-core/libnm_core_la-nm-vpn-plugin-info.lo: libnm-core/nm-vpn-plugin-info.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-vpn-plugin-info.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Tpo -c -o libnm-core/libnm_core_la-nm-vpn-plugin-info.lo `test -f 'libnm-core/nm-vpn-plugin-info.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-plugin-info.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-vpn-plugin-info.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Tpo -c -o libnm-core/libnm_core_la-nm-vpn-plugin-info.lo `test -f 'libnm-core/nm-vpn-plugin-info.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-plugin-info.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-vpn-plugin-info.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-vpn-plugin-info.c' object='libnm-core/libnm_core_la-nm-vpn-plugin-info.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-vpn-plugin-info.lo `test -f 'libnm-core/nm-vpn-plugin-info.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-plugin-info.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-vpn-plugin-info.lo `test -f 'libnm-core/nm-vpn-plugin-info.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-plugin-info.c
 
 libnm-core/libnm_core_la-nm-json.lo: libnm-core/nm-json.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-json.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Tpo -c -o libnm-core/libnm_core_la-nm-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-json.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Tpo -c -o libnm-core/libnm_core_la-nm-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-json.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-json.c' object='libnm-core/libnm_core_la-nm-json.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c
 
 libnm-core/libnm_core_la-nm-core-enum-types.lo: libnm-core/nm-core-enum-types.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-core-enum-types.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Tpo -c -o libnm-core/libnm_core_la-nm-core-enum-types.lo `test -f 'libnm-core/nm-core-enum-types.c' || echo '$(srcdir)/'`libnm-core/nm-core-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_la-nm-core-enum-types.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Tpo -c -o libnm-core/libnm_core_la-nm-core-enum-types.lo `test -f 'libnm-core/nm-core-enum-types.c' || echo '$(srcdir)/'`libnm-core/nm-core-enum-types.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Tpo libnm-core/$(DEPDIR)/libnm_core_la-nm-core-enum-types.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-core-enum-types.c' object='libnm-core/libnm_core_la-nm-core-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-core-enum-types.lo `test -f 'libnm-core/nm-core-enum-types.c' || echo '$(srcdir)/'`libnm-core/nm-core-enum-types.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(libnm_core_libnm_core_la_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-core-enum-types.lo `test -f 'libnm-core/nm-core-enum-types.c' || echo '$(srcdir)/'`libnm-core/nm-core-enum-types.c
 
 libnm-core/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo: libnm-core/nm-crypto-gnutls.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo -c -o libnm-core/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'libnm-core/nm-crypto-gnutls.c' || echo '$(srcdir)/'`libnm-core/nm-crypto-gnutls.c
diff --git a/NEWS b/NEWS
index 086a563d..27535446 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,31 @@
 ===============================================
+NetworkManager-1.22.8
+Overview of changes since NetworkManager-1.22.6
+===============================================
+
+This is a new stable release of NetworkManager.  Notable changes include:
+
+* Added configuration option to customize IPv6 RA timeout
+* Internal DHCP client will now request a lease renewal using the previously obtained IP address when expired
+* Removed length limitation for OVS Bridge, Patches and Interfaces (only Patch types) names
+* Fixed initialization of 'secs' DHCP header field, this caused some DHCP relays to drop packets
+* Fixed failure when creating team interfaces using 'nmstate'
+* Various bug fixes and improvements
+
+===============================================
+NetworkManager-1.22.6
+Overview of changes since NetworkManager-1.22.4
+===============================================
+
+This is a new stable release of NetworkManager.  Notable changes include:
+
+* Various fixes for the internal DHCP client
+* Updated translations (fr,ja,zh-CN)
+* Slave devices now do not get created/activated if master is missing
+* Fixed 'startup-complete' bug where NetworkManager would reach the network-online.target
+  even when not all the connections had been tried.
+
+===============================================
 NetworkManager-1.22.4
 Overview of changes since NetworkManager-1.22.2
 ===============================================
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index a77c2482..e13ae9ac 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -4252,18 +4252,10 @@ set_connection_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, co
 static gboolean
 set_connection_iface (NmCli *nmc, NMConnection *con, const OptionInfo *option, const char *value, GError **error)
 {
-	GError *tmp_error = NULL;
-
 	if (value) {
 		/* Special value of '*' means no specific interface name */
 		if (strcmp (value, "*") == 0)
 			value = NULL;
-		else if (!nm_utils_is_valid_iface_name (value, &tmp_error)) {
-			g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
-			             _("Error: '%s': %s"), value, tmp_error->message);
-			g_error_free (tmp_error);
-			return FALSE;
-		}
 	}
 
 	return set_property (nmc->client,
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c
index 94331095..17c6fcdf 100644
--- a/clients/cloud-setup/nm-http-client.c
+++ b/clients/cloud-setup/nm-http-client.c
@@ -693,8 +693,6 @@ constructed (GObject *object)
 		curl_multi_setopt (priv->mhandle, CURLMOPT_SOCKETDATA, self);
 		curl_multi_setopt (priv->mhandle, CURLMOPT_TIMERFUNCTION, _mhandle_timerfunction_cb);
 		curl_multi_setopt (priv->mhandle, CURLMOPT_TIMERDATA, self);
-		if (NM_CURL_DEBUG)
-			curl_multi_setopt (priv->mhandle, CURLOPT_VERBOSE, 1);
 	}
 
 	G_OBJECT_CLASS (nm_http_client_parent_class)->constructed (object);
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 8e05c9bc..d9ccada9 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -2089,8 +2089,6 @@ _set_fcn_gobject_ifname (ARGS_SET_FCN)
 	if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value))
 		return _gobject_property_reset_default (setting, property_info->property_name);
 
-	if (!nm_utils_is_valid_iface_name (value, error))
-		return FALSE;
 	g_object_set (setting, property_info->property_name, value, NULL);
 	return TRUE;
 }
@@ -2567,24 +2565,6 @@ _multilist_remove_by_value_fcn_connection_permissions (NMSetting *setting,
 	return TRUE;
 }
 
-static gboolean
-_set_fcn_connection_master (ARGS_SET_FCN)
-{
-	if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value))
-		value = NULL;
-	else if (!*value)
-		value = NULL;
-	else if (   !nm_utils_is_valid_iface_name (value, NULL)
-	         && !nm_utils_is_uuid (value)) {
-		g_set_error (error, 1, 0,
-		             _("'%s' is not valid master; use ifname or connection UUID"),
-		             value);
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
 static const char *const*
 _complete_fcn_connection_master (ARGS_COMPLETE_FCN)
 {
@@ -4487,6 +4467,22 @@ static const NMMetaPropertyType _pt_objlist = {
         ), \
     ),
 
+static const NMMetaPropertyTypData _ptd_gobject_int_timeout = {
+    PROPERTY_TYP_DATA_SUBTYPE (
+        gobject_int,
+        .value_infos = INT_VALUE_INFOS (
+            {
+                .value.i64 = 0,
+                .nick = "default",
+            },
+            {
+                .value.i64 = G_MAXINT32,
+                .nick = "infinity",
+            },
+        ),
+    ),
+};
+
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
 static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
@@ -5113,7 +5109,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	    .prompt =                       NM_META_TEXT_PROMPT_MASTER,
 	    .property_type = DEFINE_PROPERTY_TYPE (
 	        .get_fcn =                  _get_fcn_gobject,
-	        .set_fcn =                  _set_fcn_connection_master,
+	        .set_fcn =                  _set_fcn_gobject_string,
 	        .complete_fcn =             _complete_fcn_connection_master,
 	    ),
 	),
@@ -5644,18 +5640,7 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT,
 	    .property_type =                &_pt_gobject_int,
-	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-	        .value_infos =              INT_VALUE_INFOS (
-	            {
-	                .value.i64 = 0,
-	                .nick = "default",
-	            },
-	            {
-	                .value.i64 = G_MAXINT32,
-	                .nick = "infinity",
-	            },
-	        ),
-	    ),
+	    .property_typ_data =            &_ptd_gobject_int_timeout,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME,
 	    .property_type =                &_pt_gobject_bool,
@@ -5892,12 +5877,20 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
 	    ),
 	),
+	PROPERTY_INFO (NM_SETTING_IP6_CONFIG_RA_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_RA_TIMEOUT,
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data =            &_ptd_gobject_int_timeout,
+	),
 	PROPERTY_INFO (NM_SETTING_IP6_CONFIG_DHCP_DUID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID,
 	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_IAID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID,
 	    .property_type =                &_pt_gobject_string,
 	),
+	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT,
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data =            &_ptd_gobject_int_timeout,
+	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME,
 	    .property_type =                &_pt_gobject_bool,
 	),
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index f06dd3db..c728a150 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -516,7 +516,7 @@ struct _NMMetaPropertyTypDataNested  {
 	guint nested_len;
 };
 
-const NMMetaPropertyTypDataNested nm_meta_property_typ_data_bond;
+extern const NMMetaPropertyTypDataNested nm_meta_property_typ_data_bond;
 
 /*****************************************************************************/
 
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index ffae5f55..e1d83551 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -368,7 +368,7 @@ nm_vpn_wireguard_import (const char *filename,
 			memcpy (ifname, cstr, len);
 			ifname[len] = '\0';
 
-			if (nm_utils_is_valid_iface_name (ifname, NULL))
+			if (nm_utils_ifname_valid_kernel (ifname, NULL))
 				ifname_valid = TRUE;
 		}
 	}
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index f696ca82..22d537e4 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -140,9 +140,9 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ID N_("A human readable unique identifier for the connection, like \"Work Wi-Fi\" or \"T-Mobile 3G\".")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("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 (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable LLMNR for the interface, \"resolve\" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"yes\"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("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 connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.")
@@ -210,10 +210,10 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #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.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("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 use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -232,10 +232,10 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_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.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("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 use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -244,6 +244,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_NEVER_DEFAULT N_("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.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_RA_TIMEOUT N_("A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_METRIC N_("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 device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTES N_("Array of IP routes.")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index f696ca82..22d537e4 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -140,9 +140,9 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ID N_("A human readable unique identifier for the connection, like \"Work Wi-Fi\" or \"T-Mobile 3G\".")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("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 (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable LLMNR for the interface, \"resolve\" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"yes\"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("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 connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.")
@@ -210,10 +210,10 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #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.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("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 use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -232,10 +232,10 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_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.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("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 use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
@@ -244,6 +244,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_NEVER_DEFAULT N_("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.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_RA_TIMEOUT N_("A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_METRIC N_("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 device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTES N_("Array of IP routes.")
diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
index a4e43025..9517e81f 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -150,12 +150,12 @@ id
 path
 uuid
 <<<
-size: 4343
+size: 4447
 location: clients/tests/test-client.py:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 4213 bytes
+stdout: 4317 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -221,8 +221,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -252,12 +254,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4373
+size: 4477
 location: clients/tests/test-client.py:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4233 bytes
+stdout: 4337 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -323,8 +325,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -486,12 +490,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 4118
+size: 4222
 location: clients/tests/test-client.py:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 3981 bytes
+stdout: 4085 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -571,8 +575,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -583,12 +589,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4146
+size: 4250
 location: clients/tests/test-client.py:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3999 bytes
+stdout: 4103 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -668,8 +674,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -700,12 +708,12 @@ stdout: 51 bytes
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 4818
+size: 4922
 location: clients/tests/test-client.py:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 4688 bytes
+stdout: 4792 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -785,8 +793,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -810,12 +820,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4850
+size: 4954
 location: clients/tests/test-client.py:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4710 bytes
+stdout: 4814 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -895,8 +905,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1390,12 +1402,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 4118
+size: 4222
 location: clients/tests/test-client.py:test_003()/50
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 3981 bytes
+stdout: 4085 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1475,8 +1487,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1487,12 +1501,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4146
+size: 4250
 location: clients/tests/test-client.py:test_003()/51
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3999 bytes
+stdout: 4103 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1572,8 +1586,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1608,12 +1624,12 @@ GENERAL.STATE:                          aktywowano
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 5526
+size: 5630
 location: clients/tests/test-client.py:test_003()/54
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5396 bytes
+stdout: 5500 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1693,8 +1709,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1732,12 +1750,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5562
+size: 5666
 location: clients/tests/test-client.py:test_003()/55
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5422 bytes
+stdout: 5526 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1817,8 +1835,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -2244,12 +2264,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5529
+size: 5633
 location: clients/tests/test-client.py:test_003()/68
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5399 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2329,8 +2349,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -2368,12 +2390,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5566
+size: 5670
 location: clients/tests/test-client.py:test_003()/69
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5426 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2453,8 +2475,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -2492,12 +2516,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4861
+size: 4965
 location: clients/tests/test-client.py:test_003()/70
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4691 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2577,8 +2601,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -2602,12 +2628,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4894
+size: 4998
 location: clients/tests/test-client.py:test_003()/71
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4714 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2687,8 +2713,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -2910,12 +2938,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5541
+size: 5645
 location: clients/tests/test-client.py:test_003()/78
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5399 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2995,8 +3023,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3034,12 +3064,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5578
+size: 5682
 location: clients/tests/test-client.py:test_003()/79
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5426 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3119,8 +3149,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3158,12 +3190,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4873
+size: 4977
 location: clients/tests/test-client.py:test_003()/80
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4691 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3243,8 +3275,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3268,12 +3302,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4906
+size: 5010
 location: clients/tests/test-client.py:test_003()/81
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4714 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3353,8 +3387,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3592,12 +3628,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6783
+size: 6887
 location: clients/tests/test-client.py:test_003()/88
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6644 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3683,8 +3719,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3732,12 +3770,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6839
+size: 6943
 location: clients/tests/test-client.py:test_003()/89
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6690 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3823,8 +3861,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3872,12 +3912,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5802
+size: 5906
 location: clients/tests/test-client.py:test_003()/90
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5623 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3963,8 +4003,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3994,12 +4036,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5847
+size: 5951
 location: clients/tests/test-client.py:test_003()/91
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5658 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4085,8 +4127,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4354,12 +4398,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6795
+size: 6899
 location: clients/tests/test-client.py:test_003()/98
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6644 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4445,8 +4489,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4494,12 +4540,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6851
+size: 6955
 location: clients/tests/test-client.py:test_003()/99
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6690 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4585,8 +4631,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4634,12 +4682,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5815
+size: 5919
 location: clients/tests/test-client.py:test_003()/100
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5623 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4725,8 +4773,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4756,12 +4806,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5860
+size: 5964
 location: clients/tests/test-client.py:test_003()/101
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5658 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4847,8 +4897,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -5096,12 +5148,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 2963
+size: 3001
 location: clients/tests/test-client.py:test_003()/108
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5181,8 +5233,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -5220,12 +5274,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2973
+size: 3011
 location: clients/tests/test-client.py:test_003()/109
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5305,8 +5359,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -5344,12 +5400,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2617
+size: 2655
 location: clients/tests/test-client.py:test_003()/110
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5429,8 +5485,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -5454,12 +5512,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2627
+size: 2665
 location: clients/tests/test-client.py:test_003()/111
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5539,8 +5597,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -5758,12 +5818,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 2975
+size: 3013
 location: clients/tests/test-client.py:test_003()/118
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5843,8 +5903,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -5882,12 +5944,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2985
+size: 3023
 location: clients/tests/test-client.py:test_003()/119
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5967,8 +6029,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -6006,12 +6070,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2629
+size: 2667
 location: clients/tests/test-client.py:test_003()/120
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6091,8 +6155,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -6116,12 +6182,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2639
+size: 2677
 location: clients/tests/test-client.py:test_003()/121
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -6201,8 +6267,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -6424,12 +6492,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3682
+size: 3736
 location: clients/tests/test-client.py:test_003()/128
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
-stdout: 3536 bytes
+stdout: 3590 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6440,8 +6508,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6455,12 +6523,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3716
+size: 3770
 location: clients/tests/test-client.py:test_003()/129
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3560 bytes
+stdout: 3614 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6471,8 +6539,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6486,12 +6554,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 3220
+size: 3274
 location: clients/tests/test-client.py:test_003()/130
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3034 bytes
+stdout: 3088 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6502,8 +6570,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6513,12 +6581,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3252
+size: 3306
 location: clients/tests/test-client.py:test_003()/131
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3056 bytes
+stdout: 3110 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6529,8 +6597,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6668,12 +6736,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3694
+size: 3748
 location: clients/tests/test-client.py:test_003()/138
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3536 bytes
+stdout: 3590 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6684,8 +6752,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6699,12 +6767,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3728
+size: 3782
 location: clients/tests/test-client.py:test_003()/139
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3560 bytes
+stdout: 3614 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6715,8 +6783,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6730,12 +6798,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 3232
+size: 3286
 location: clients/tests/test-client.py:test_003()/140
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3034 bytes
+stdout: 3088 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6746,8 +6814,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6757,12 +6825,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 3264
+size: 3318
 location: clients/tests/test-client.py:test_003()/141
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3056 bytes
+stdout: 3110 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6773,8 +6841,8 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6928,12 +6996,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6008
+size: 6089
 location: clients/tests/test-client.py:test_003()/148
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 5853 bytes
+stdout: 5934 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -6950,9 +7018,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6975,12 +7043,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 6102
+size: 6183
 location: clients/tests/test-client.py:test_003()/149
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5937 bytes
+stdout: 6018 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -6997,9 +7065,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7022,12 +7090,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 5084
+size: 5165
 location: clients/tests/test-client.py:test_003()/150
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4889 bytes
+stdout: 4970 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -7044,9 +7112,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7061,12 +7129,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 5156
+size: 5237
 location: clients/tests/test-client.py:test_003()/151
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 5032 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -7083,9 +7151,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7268,12 +7336,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6020
+size: 6101
 location: clients/tests/test-client.py:test_003()/158
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5853 bytes
+stdout: 5934 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -7290,9 +7358,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7315,12 +7383,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 6114
+size: 6195
 location: clients/tests/test-client.py:test_003()/159
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5937 bytes
+stdout: 6018 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -7337,9 +7405,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7362,12 +7430,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deza
 
 
 <<<
-size: 5096
+size: 5177
 location: clients/tests/test-client.py:test_003()/160
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4889 bytes
+stdout: 4970 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -7384,9 +7452,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7401,12 +7469,12 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deac
 
 
 <<<
-size: 5168
+size: 5249
 location: clients/tests/test-client.py:test_003()/161
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4951 bytes
+stdout: 5032 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -7423,9 +7491,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7588,66 +7656,66 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 839
+size: 843
 location: clients/tests/test-client.py:test_003()/168
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 686 bytes
+stdout: 690 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 849
+size: 853
 location: clients/tests/test-client.py:test_003()/169
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 686 bytes
+stdout: 690 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 691
+size: 695
 location: clients/tests/test-client.py:test_003()/170
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 498 bytes
+stdout: 502 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 701
+size: 705
 location: clients/tests/test-client.py:test_003()/171
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 498 bytes
+stdout: 502 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
@@ -7742,66 +7810,66 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 851
+size: 855
 location: clients/tests/test-client.py:test_003()/178
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 686 bytes
+stdout: 690 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 861
+size: 865
 location: clients/tests/test-client.py:test_003()/179
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 686 bytes
+stdout: 690 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 703
+size: 707
 location: clients/tests/test-client.py:test_003()/180
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 498 bytes
+stdout: 502 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 713
+size: 717
 location: clients/tests/test-client.py:test_003()/181
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 498 bytes
+stdout: 502 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 proxy:none:no::
 GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
@@ -8044,12 +8112,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5547
+size: 5651
 location: clients/tests/test-client.py:test_003()/188
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
-stdout: 5399 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8129,8 +8197,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -8168,12 +8238,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5584
+size: 5688
 location: clients/tests/test-client.py:test_003()/189
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5426 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8253,8 +8323,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -8292,12 +8364,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4879
+size: 4983
 location: clients/tests/test-client.py:test_003()/190
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4691 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8377,8 +8449,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -8402,12 +8476,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4912
+size: 5016
 location: clients/tests/test-client.py:test_003()/191
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4714 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8487,8 +8561,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -8854,12 +8930,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5559
+size: 5663
 location: clients/tests/test-client.py:test_003()/198
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5399 bytes
+stdout: 5503 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8939,8 +9015,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -8978,12 +9056,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5596
+size: 5700
 location: clients/tests/test-client.py:test_003()/199
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5426 bytes
+stdout: 5530 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9063,8 +9141,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -9102,12 +9182,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4891
+size: 4995
 location: clients/tests/test-client.py:test_003()/200
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4691 bytes
+stdout: 4795 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9187,8 +9267,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -9212,12 +9294,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4924
+size: 5028
 location: clients/tests/test-client.py:test_003()/201
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4714 bytes
+stdout: 4818 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -9297,8 +9379,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -9694,12 +9778,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6801
+size: 6905
 location: clients/tests/test-client.py:test_003()/208
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6644 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9785,8 +9869,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -9834,12 +9920,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6857
+size: 6961
 location: clients/tests/test-client.py:test_003()/209
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6690 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9925,8 +10011,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -9974,12 +10062,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5820
+size: 5924
 location: clients/tests/test-client.py:test_003()/210
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5623 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10065,8 +10153,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -10096,12 +10186,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5865
+size: 5969
 location: clients/tests/test-client.py:test_003()/211
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5658 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10187,8 +10277,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -10614,12 +10706,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6813
+size: 6917
 location: clients/tests/test-client.py:test_003()/218
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6644 bytes
+stdout: 6748 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10705,8 +10797,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -10754,12 +10848,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6869
+size: 6973
 location: clients/tests/test-client.py:test_003()/219
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6690 bytes
+stdout: 6794 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10845,8 +10939,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -10894,12 +10990,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5832
+size: 5936
 location: clients/tests/test-client.py:test_003()/220
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5623 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10985,8 +11081,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11016,12 +11114,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5877
+size: 5981
 location: clients/tests/test-client.py:test_003()/221
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5658 bytes
+stdout: 5762 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -11107,8 +11205,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11504,12 +11604,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 2980
+size: 3018
 location: clients/tests/test-client.py:test_003()/228
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11589,8 +11689,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -11628,12 +11730,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2990
+size: 3028
 location: clients/tests/test-client.py:test_003()/229
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11713,8 +11815,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -11752,12 +11856,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2634
+size: 2672
 location: clients/tests/test-client.py:test_003()/230
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11837,8 +11941,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -11862,12 +11968,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2644
+size: 2682
 location: clients/tests/test-client.py:test_003()/231
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11947,8 +12053,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -12314,12 +12422,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 2992
+size: 3030
 location: clients/tests/test-client.py:test_003()/238
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12399,8 +12507,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -12438,12 +12548,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3002
+size: 3040
 location: clients/tests/test-client.py:test_003()/239
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2824 bytes
+stdout: 2862 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12523,8 +12633,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -12562,12 +12674,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2646
+size: 2684
 location: clients/tests/test-client.py:test_003()/240
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12647,8 +12759,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -12672,12 +12786,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2656
+size: 2694
 location: clients/tests/test-client.py:test_003()/241
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2438 bytes
+stdout: 2476 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12757,8 +12871,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
index a5375950..08be36d4 100644
--- a/clients/tests/test-client.check-on-disk/test_004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004.expected
@@ -58,12 +58,12 @@ location: clients/tests/test-client.py:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 4360
+size: 4464
 location: clients/tests/test-client.py:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
-stdout: 4232 bytes
+stdout: 4336 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -146,8 +146,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -158,12 +160,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4388
+size: 4492
 location: clients/tests/test-client.py:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4250 bytes
+stdout: 4354 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -246,8 +248,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -294,12 +298,12 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 3827
+size: 3931
 location: clients/tests/test-client.py:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3696 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -365,8 +369,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -383,12 +389,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3847
+size: 3951
 location: clients/tests/test-client.py:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3706 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -454,8 +460,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -544,12 +552,12 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      wlan0
 con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 4952
+size: 5056
 location: clients/tests/test-client.py:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4821 bytes
+stdout: 4925 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -615,8 +623,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -654,12 +664,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4978
+size: 5082
 location: clients/tests/test-client.py:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4837 bytes
+stdout: 4941 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -725,8 +735,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -764,12 +776,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4958
+size: 5062
 location: clients/tests/test-client.py:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -835,8 +847,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -874,12 +888,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4988
+size: 5092
 location: clients/tests/test-client.py:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -945,8 +959,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -984,12 +1000,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4958
+size: 5062
 location: clients/tests/test-client.py:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1055,8 +1071,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1094,12 +1112,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4988
+size: 5092
 location: clients/tests/test-client.py:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1165,8 +1183,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1204,12 +1224,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3834
+size: 3938
 location: clients/tests/test-client.py:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3696 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1275,8 +1295,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -1293,12 +1315,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3854
+size: 3958
 location: clients/tests/test-client.py:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3706 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1364,8 +1386,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -3942,12 +3966,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 4970
+size: 5074
 location: clients/tests/test-client.py:test_004()/73
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4013,8 +4037,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4052,12 +4078,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5000
+size: 5104
 location: clients/tests/test-client.py:test_004()/74
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4123,8 +4149,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4162,12 +4190,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4970
+size: 5074
 location: clients/tests/test-client.py:test_004()/75
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4233,8 +4261,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4272,12 +4302,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5000
+size: 5104
 location: clients/tests/test-client.py:test_004()/76
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4343,8 +4373,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4382,12 +4414,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3846
+size: 3950
 location: clients/tests/test-client.py:test_004()/77
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3696 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4453,8 +4485,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -4471,12 +4505,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3866
+size: 3970
 location: clients/tests/test-client.py:test_004()/78
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3706 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4542,8 +4576,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -7120,12 +7156,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 5980
+size: 6084
 location: clients/tests/test-client.py:test_004()/123
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7196,8 +7232,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -7243,12 +7281,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6022
+size: 6126
 location: clients/tests/test-client.py:test_004()/124
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7319,8 +7357,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -7366,12 +7406,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5980
+size: 6084
 location: clients/tests/test-client.py:test_004()/125
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7442,8 +7482,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -7489,12 +7531,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6022
+size: 6126
 location: clients/tests/test-client.py:test_004()/126
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7565,8 +7607,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -7612,12 +7656,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4463
+size: 4567
 location: clients/tests/test-client.py:test_004()/127
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4315 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7688,8 +7732,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -7709,12 +7755,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4488
+size: 4592
 location: clients/tests/test-client.py:test_004()/128
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4330 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7785,8 +7831,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -10970,12 +11018,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5992
+size: 6096
 location: clients/tests/test-client.py:test_004()/173
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11046,8 +11094,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11093,12 +11143,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6034
+size: 6138
 location: clients/tests/test-client.py:test_004()/174
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11169,8 +11219,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11216,12 +11268,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5992
+size: 6096
 location: clients/tests/test-client.py:test_004()/175
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11292,8 +11344,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11339,12 +11393,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6034
+size: 6138
 location: clients/tests/test-client.py:test_004()/176
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11415,8 +11469,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11462,12 +11518,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4475
+size: 4579
 location: clients/tests/test-client.py:test_004()/177
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4315 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -11538,8 +11594,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -11559,12 +11617,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4500
+size: 4604
 location: clients/tests/test-client.py:test_004()/178
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4330 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -11635,8 +11693,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -14820,12 +14880,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 2498
+size: 2536
 location: clients/tests/test-client.py:test_004()/223
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14891,8 +14951,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -14930,12 +14992,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2508
+size: 2546
 location: clients/tests/test-client.py:test_004()/224
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15001,8 +15063,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -15040,12 +15104,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2498
+size: 2536
 location: clients/tests/test-client.py:test_004()/225
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15111,8 +15175,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -15150,12 +15216,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2508
+size: 2546
 location: clients/tests/test-client.py:test_004()/226
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15221,8 +15287,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -15260,12 +15328,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1928
+size: 1966
 location: clients/tests/test-client.py:test_004()/227
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15331,8 +15399,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -15349,12 +15419,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1938
+size: 1976
 location: clients/tests/test-client.py:test_004()/228
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -15420,8 +15490,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -17968,12 +18040,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 2510
+size: 2548
 location: clients/tests/test-client.py:test_004()/273
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18039,8 +18111,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -18078,12 +18152,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2520
+size: 2558
 location: clients/tests/test-client.py:test_004()/274
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18149,8 +18223,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -18188,12 +18264,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2510
+size: 2548
 location: clients/tests/test-client.py:test_004()/275
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18259,8 +18335,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -18298,12 +18376,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2520
+size: 2558
 location: clients/tests/test-client.py:test_004()/276
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18369,8 +18447,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -18408,12 +18488,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1940
+size: 1978
 location: clients/tests/test-client.py:test_004()/277
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18479,8 +18559,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -18497,12 +18579,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1950
+size: 1988
 location: clients/tests/test-client.py:test_004()/278
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -18568,8 +18650,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -21116,12 +21200,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 3223
+size: 3277
 location: clients/tests/test-client.py:test_004()/323
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3076 bytes
+stdout: 3130 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -21129,8 +21213,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21145,12 +21229,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3246
+size: 3300
 location: clients/tests/test-client.py:test_004()/324
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3089 bytes
+stdout: 3143 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -21158,8 +21242,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21174,12 +21258,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3223
+size: 3277
 location: clients/tests/test-client.py:test_004()/325
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3076 bytes
+stdout: 3130 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -21187,8 +21271,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21203,12 +21287,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3246
+size: 3300
 location: clients/tests/test-client.py:test_004()/326
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3089 bytes
+stdout: 3143 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -21216,8 +21300,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21232,12 +21316,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2471
+size: 2525
 location: clients/tests/test-client.py:test_004()/327
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2317 bytes
+stdout: 2371 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -21245,8 +21329,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21256,12 +21340,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2483
+size: 2537
 location: clients/tests/test-client.py:test_004()/328
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2319 bytes
+stdout: 2373 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -21269,8 +21353,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -22770,12 +22854,12 @@ interface-name
 
 
 <<<
-size: 3235
+size: 3289
 location: clients/tests/test-client.py:test_004()/373
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3076 bytes
+stdout: 3130 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -22783,8 +22867,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -22799,12 +22883,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3258
+size: 3312
 location: clients/tests/test-client.py:test_004()/374
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3089 bytes
+stdout: 3143 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -22812,8 +22896,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -22828,12 +22912,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3235
+size: 3289
 location: clients/tests/test-client.py:test_004()/375
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3076 bytes
+stdout: 3130 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -22841,8 +22925,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -22857,12 +22941,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3258
+size: 3312
 location: clients/tests/test-client.py:test_004()/376
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3089 bytes
+stdout: 3143 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -22870,8 +22954,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -22886,12 +22970,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2483
+size: 2537
 location: clients/tests/test-client.py:test_004()/377
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2317 bytes
+stdout: 2371 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -22899,8 +22983,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -22910,12 +22994,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2495
+size: 2549
 location: clients/tests/test-client.py:test_004()/378
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2319 bytes
+stdout: 2373 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -22923,8 +23007,8 @@ connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -24424,12 +24508,12 @@ interface-name
 
 
 <<<
-size: 5112
+size: 5193
 location: clients/tests/test-client.py:test_004()/423
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4956 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -24442,9 +24526,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24466,12 +24550,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5168
+size: 5249
 location: clients/tests/test-client.py:test_004()/424
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5002 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24484,9 +24568,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24508,12 +24592,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5112
+size: 5193
 location: clients/tests/test-client.py:test_004()/425
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4956 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -24526,9 +24610,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24550,12 +24634,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5168
+size: 5249
 location: clients/tests/test-client.py:test_004()/426
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5002 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24568,9 +24652,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24592,12 +24676,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3768
+size: 3849
 location: clients/tests/test-client.py:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3605 bytes
+stdout: 3686 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -24610,9 +24694,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24624,12 +24708,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3791
+size: 3872
 location: clients/tests/test-client.py:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3618 bytes
+stdout: 3699 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -24642,9 +24726,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -26732,12 +26816,12 @@ interface-name
 
 
 <<<
-size: 5124
+size: 5205
 location: clients/tests/test-client.py:test_004()/473
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4956 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -26750,9 +26834,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -26774,12 +26858,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5180
+size: 5261
 location: clients/tests/test-client.py:test_004()/474
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5002 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -26792,9 +26876,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -26816,12 +26900,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5124
+size: 5205
 location: clients/tests/test-client.py:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4956 bytes
+stdout: 5037 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -26834,9 +26918,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -26858,12 +26942,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5180
+size: 5261
 location: clients/tests/test-client.py:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5002 bytes
+stdout: 5083 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -26876,9 +26960,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -26900,12 +26984,12 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3780
+size: 3861
 location: clients/tests/test-client.py:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3605 bytes
+stdout: 3686 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -26918,9 +27002,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -26932,12 +27016,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3803
+size: 3884
 location: clients/tests/test-client.py:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3618 bytes
+stdout: 3699 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -26950,9 +27034,9 @@ name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  ro
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   ra-timeout   dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  0 (default)  --         --         0 (default)   tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -29040,94 +29124,94 @@ interface-name
 
 
 <<<
-size: 800
+size: 804
 location: clients/tests/test-client.py:test_004()/523
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 810
+size: 814
 location: clients/tests/test-client.py:test_004()/524
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 800
+size: 804
 location: clients/tests/test-client.py:test_004()/525
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 810
+size: 814
 location: clients/tests/test-client.py:test_004()/526
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 512
+size: 516
 location: clients/tests/test-client.py:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 351 bytes
+stdout: 355 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 522
+size: 526
 location: clients/tests/test-client.py:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 351 bytes
+stdout: 355 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
@@ -29978,94 +30062,94 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 812
+size: 816
 location: clients/tests/test-client.py:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 822
+size: 826
 location: clients/tests/test-client.py:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 812
+size: 816
 location: clients/tests/test-client.py:test_004()/575
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 822
+size: 826
 location: clients/tests/test-client.py:test_004()/576
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 646 bytes
+stdout: 650 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 524
+size: 528
 location: clients/tests/test-client.py:test_004()/577
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 351 bytes
+stdout: 355 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 534
+size: 538
 location: clients/tests/test-client.py:test_004()/578
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 351 bytes
+stdout: 355 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:0:::0:yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
@@ -30916,12 +31000,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 4976
+size: 5080
 location: clients/tests/test-client.py:test_004()/623
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -30987,8 +31071,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -31026,12 +31112,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5006
+size: 5110
 location: clients/tests/test-client.py:test_004()/624
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31097,8 +31183,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -31136,12 +31224,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4976
+size: 5080
 location: clients/tests/test-client.py:test_004()/625
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31207,8 +31295,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -31246,12 +31336,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5006
+size: 5110
 location: clients/tests/test-client.py:test_004()/626
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31317,8 +31407,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -31356,12 +31448,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3852
+size: 3956
 location: clients/tests/test-client.py:test_004()/627
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3696 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31427,8 +31519,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -31445,12 +31539,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3872
+size: 3976
 location: clients/tests/test-client.py:test_004()/628
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3706 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -31516,8 +31610,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -34594,12 +34690,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 4988
+size: 5092
 location: clients/tests/test-client.py:test_004()/673
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34665,8 +34761,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -34704,12 +34802,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5018
+size: 5122
 location: clients/tests/test-client.py:test_004()/674
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34775,8 +34873,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -34814,12 +34914,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4988
+size: 5092
 location: clients/tests/test-client.py:test_004()/675
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4827 bytes
+stdout: 4931 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34885,8 +34985,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -34924,12 +35026,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5018
+size: 5122
 location: clients/tests/test-client.py:test_004()/676
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4847 bytes
+stdout: 4951 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -34995,8 +35097,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -35034,12 +35138,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3864
+size: 3968
 location: clients/tests/test-client.py:test_004()/677
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3696 bytes
+stdout: 3800 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35105,8 +35209,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -35123,12 +35229,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3884
+size: 3988
 location: clients/tests/test-client.py:test_004()/678
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3706 bytes
+stdout: 3810 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -35194,8 +35300,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -38272,12 +38380,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 5997
+size: 6101
 location: clients/tests/test-client.py:test_004()/723
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38348,8 +38456,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -38395,12 +38505,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6039
+size: 6143
 location: clients/tests/test-client.py:test_004()/724
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38471,8 +38581,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -38518,12 +38630,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5997
+size: 6101
 location: clients/tests/test-client.py:test_004()/725
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38594,8 +38706,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -38641,12 +38755,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6039
+size: 6143
 location: clients/tests/test-client.py:test_004()/726
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38717,8 +38831,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -38764,12 +38880,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4480
+size: 4584
 location: clients/tests/test-client.py:test_004()/727
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4315 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -38840,8 +38956,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -38861,12 +38979,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4505
+size: 4609
 location: clients/tests/test-client.py:test_004()/728
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4330 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -38937,8 +39055,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -42652,12 +42772,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6009
+size: 6113
 location: clients/tests/test-client.py:test_004()/773
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -42728,8 +42848,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -42775,12 +42897,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6051
+size: 6155
 location: clients/tests/test-client.py:test_004()/774
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -42851,8 +42973,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -42898,12 +43022,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6009
+size: 6113
 location: clients/tests/test-client.py:test_004()/775
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 5943 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -42974,8 +43098,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -43021,12 +43147,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6051
+size: 6155
 location: clients/tests/test-client.py:test_004()/776
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5871 bytes
+stdout: 5975 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -43097,8 +43223,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -43144,12 +43272,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4492
+size: 4596
 location: clients/tests/test-client.py:test_004()/777
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4315 bytes
+stdout: 4419 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -43220,8 +43348,10 @@ ipv6.never-default:                     no
 ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -43241,12 +43371,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4517
+size: 4621
 location: clients/tests/test-client.py:test_004()/778
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4330 bytes
+stdout: 4434 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -43317,8 +43447,10 @@ ipv6.never-default:                     nie
 ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
+ipv6.ra-timeout:                        0 (default)
 ipv6.dhcp-duid:                         --
 ipv6.dhcp-iaid:                         --
+ipv6.dhcp-timeout:                      0 (default)
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
 ipv6.dhcp-hostname-flags:               0x0 (none)
@@ -47032,12 +47164,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 2515
+size: 2553
 location: clients/tests/test-client.py:test_004()/823
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47103,8 +47235,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -47142,12 +47276,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2525
+size: 2563
 location: clients/tests/test-client.py:test_004()/824
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47213,8 +47347,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -47252,12 +47388,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2515
+size: 2553
 location: clients/tests/test-client.py:test_004()/825
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47323,8 +47459,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -47362,12 +47500,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2525
+size: 2563
 location: clients/tests/test-client.py:test_004()/826
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47433,8 +47571,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -47472,12 +47612,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1945
+size: 1983
 location: clients/tests/test-client.py:test_004()/827
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47543,8 +47683,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -47561,12 +47703,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1955
+size: 1993
 location: clients/tests/test-client.py:test_004()/828
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47632,8 +47774,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -50710,12 +50854,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 2527
+size: 2565
 location: clients/tests/test-client.py:test_004()/873
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50781,8 +50925,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -50820,12 +50966,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2537
+size: 2575
 location: clients/tests/test-client.py:test_004()/874
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50891,8 +51037,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -50930,12 +51078,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2527
+size: 2565
 location: clients/tests/test-client.py:test_004()/875
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51001,8 +51149,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -51040,12 +51190,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2537
+size: 2575
 location: clients/tests/test-client.py:test_004()/876
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2358 bytes
+stdout: 2396 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51111,8 +51261,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -51150,12 +51302,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1957
+size: 1995
 location: clients/tests/test-client.py:test_004()/877
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51221,8 +51373,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
@@ -51239,12 +51393,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1967
+size: 2005
 location: clients/tests/test-client.py:test_004()/878
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1781 bytes
+stdout: 1819 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -51310,8 +51464,10 @@ ipv6.never-default:no
 ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
+ipv6.ra-timeout:0
 ipv6.dhcp-duid:
 ipv6.dhcp-iaid:
+ipv6.dhcp-timeout:0
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
 ipv6.dhcp-hostname-flags:0x0
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index 67a66f72..4ab59329 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -103,7 +103,7 @@ device_entry_parse (NmtDeviceEntry  *deventry,
 		return TRUE;
 
 	if (priv->hardware_type == G_TYPE_NONE && !priv->device_filter) {
-		if (nm_utils_is_valid_iface_name (text, NULL)) {
+		if (nm_utils_ifname_valid_kernel (text, NULL)) {
 			*interface_name = g_strdup (text);
 			return TRUE;
 		} else
@@ -127,12 +127,12 @@ device_entry_parse (NmtDeviceEntry  *deventry,
 
 	len = nm_utils_hwaddr_len (priv->arptype);
 	if (   nm_utils_hwaddr_aton (words[0], buf, len)
-	    && (!words[1] || nm_utils_is_valid_iface_name (words[1], NULL))) {
+	    && (!words[1] || nm_utils_ifname_valid_kernel (words[1], NULL))) {
 		*mac_address = words[0];
 		*interface_name = NULL;
 		g_free (words);
 		return TRUE;
-	} else if (   nm_utils_is_valid_iface_name (words[0], NULL)
+	} else if (   nm_utils_ifname_valid_kernel (words[0], NULL)
 	           && (!words[1] || nm_utils_hwaddr_aton (words[1], buf, len))) {
 		*interface_name = words[0];
 		*mac_address = NULL;
diff --git a/configure b/configure
index 89e2d2ee..03031c8e 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.22.4.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.22.8.
 #
 # 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.22.4'
-PACKAGE_STRING='NetworkManager 1.22.4'
+PACKAGE_VERSION='1.22.8'
+PACKAGE_STRING='NetworkManager 1.22.8'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1726,7 +1726,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.22.4 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.22.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1796,7 +1796,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.22.4:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.22.8:";;
    esac
   cat <<\_ACEOF
 
@@ -2144,7 +2144,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.22.4
+NetworkManager configure 1.22.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2917,7 +2917,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.22.4, which was
+It was created by NetworkManager $as_me 1.22.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3787,7 +3787,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.22.4'
+ VERSION='1.22.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17971,8 +17971,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=22
-NM_MICRO_VERSION=4
-NM_VERSION=1.22.4
+NM_MICRO_VERSION=8
+NM_VERSION=1.22.8
 
 
 
@@ -17980,7 +17980,7 @@ NM_VERSION=1.22.4
 
 
 
-NM_GIT_SHA=76b6f2a6ba513caa447df310ebcf8ab29d1ba5f7
+NM_GIT_SHA=fa6c656473ecae51e9d199e50a2960a802f8827e
 
 if test """" != "no-config-h" ; then
 
@@ -29035,7 +29035,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.22.4, which was
+This file was extended by NetworkManager $as_me 1.22.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29101,7 +29101,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.22.4
+NetworkManager config.status 1.22.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index bf2ddf8a..65ceffbc 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], [22])
-m4_define([nm_micro_version], [4])
+m4_define([nm_micro_version], [8])
 m4_define([nm_version],
           [nm_major_version.nm_minor_version.nm_micro_version])
 
diff --git a/debian/changelog b/debian/changelog
index 66ef1303..b82c0bcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,24 @@
-network-manager (1.22.4-1ubuntu2) focal; urgency=medium
+network-manager (1.22.8-1ubuntu1) UNRELEASED; urgency=medium
 
+  * Update to the current stable version, merging from Debian
   * debian/patches/gitlab_connection_ready.patch:
-    - backport an upstream candidate fix for test regressions from
-      the current version
+    - removed, the change is in the new version
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 26 Feb 2020 16:29:15 +0100
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 05 Feb 2020 15:18:58 +0100
+network-manager (1.22.8-1) unstable; urgency=medium
 
-network-manager (1.22.4-1ubuntu1) focal; urgency=medium
+  * New upstream version 1.22.8
+  * Update symbols file for libnm0
 
-  * New upstream version, merged from Debian
+ -- Michael Biebl <biebl@debian.org>  Thu, 20 Feb 2020 00:27:58 +0100
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 29 Jan 2020 10:37:31 +0100
+network-manager (1.22.6-1) unstable; urgency=medium
+
+  * New upstream version 1.22.6
+  * Bump Standards-Version to 4.5.0
+  * Rebase patches
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 31 Jan 2020 18:14:59 +0100
 
 network-manager (1.22.4-1) unstable; urgency=medium
 
@@ -46,7 +54,7 @@ network-manager (1.22.0-1) unstable; urgency=medium
   * New upstream version 1.22.0
   * Rebase patches
   * Explicitly disable (experimental) nm-cloud-setup tool
-  * Update symbols file for linm0
+  * Update symbols file for libnm0
 
  -- Michael Biebl <biebl@debian.org>  Wed, 18 Dec 2019 19:05:33 +0100
 
diff --git a/debian/control b/debian/control
index 83f30dc6..149bb07b 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Depends: debhelper-compat (= 12),
                valac (>= 0.17.1.24),
                dbus <!nocheck>,
                python3-dbus <!nocheck>
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 XS-Debian-Vcs-Git: https://salsa.debian.org/utopia-team/network-manager.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/utopia-team/network-manager
@@ -92,12 +92,9 @@ Description: network management framework (daemon and userspace tools)
 
 Package: network-manager-dev
 Section: devel
-Architecture: linux-any
-Multi-Arch: same
+Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
-Conflicts: libnm-glib-dev,
-           libnm-glib-vpn-dev,
-           libnm-util-dev,
 Description: network management framework (development files)
  This package provides documentation of the NetworkManager D-Bus API, the
  configuration formats and command line utilities.
diff --git a/debian/libnm0.symbols b/debian/libnm0.symbols
index 9cd0d45e..f51b2a6b 100644
--- a/debian/libnm0.symbols
+++ b/debian/libnm0.symbols
@@ -15,6 +15,7 @@ libnm.so.0 libnm0 #MINVER#
  libnm_1_20_6@libnm_1_20_6 1.20.6
  libnm_1_22_0@libnm_1_22_0 1.22.0
  libnm_1_22_2@libnm_1_22_2 1.22.2
+ libnm_1_22_8@libnm_1_22_8 1.22.8
  libnm_1_2_0@libnm_1_2_0 1.1.90
  libnm_1_2_4@libnm_1_2_4 1.2.4
  libnm_1_4_0@libnm_1_4_0 1.4.0
@@ -895,6 +896,7 @@ libnm.so.0 libnm0 #MINVER#
  nm_setting_ip6_config_get_addr_gen_mode@libnm_1_2_0 1.1.90
  nm_setting_ip6_config_get_dhcp_duid@libnm_1_12_0 1.11.90
  nm_setting_ip6_config_get_ip6_privacy@libnm_1_0_0 1.0.0
+ nm_setting_ip6_config_get_ra_timeout@libnm_1_22_8 1.22.8
  nm_setting_ip6_config_get_token@libnm_1_4_0 1.4.0
  nm_setting_ip6_config_get_type@libnm_1_0_0 1.0.0
  nm_setting_ip6_config_new@libnm_1_0_0 1.0.0
diff --git a/debian/patches/Disable-core-with-expect.patch b/debian/patches/Disable-core-with-expect.patch
index 8c9c46ed..6bbf4b0f 100644
--- a/debian/patches/Disable-core-with-expect.patch
+++ b/debian/patches/Disable-core-with-expect.patch
@@ -7,11 +7,11 @@ which tends to fail on ppc64el and arm64
  Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
-Index: network-manager-1.22.2/Makefile.am
+Index: network-manager-1.22.8/Makefile.am
 ===================================================================
---- network-manager-1.22.2.orig/Makefile.am
-+++ network-manager-1.22.2/Makefile.am
-@@ -3932,7 +3932,6 @@ src_tests_ldadd = \
+--- network-manager-1.22.8.orig/Makefile.am
++++ network-manager-1.22.8/Makefile.am
+@@ -3933,7 +3933,6 @@ src_tests_ldadd = \
  
  check_programs += \
  	src/tests/test-core \
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index 40c5217a..1eb08e28 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 3696c78..abd71c4 100644
+index 6d3a5dd..f804918 100644
 --- a/src/nm-manager.c
 +++ b/src/nm-manager.c
 @@ -50,6 +50,8 @@
@@ -73,7 +73,7 @@ index 3696c78..abd71c4 100644
  	if (   new_state >= NM_STATE_CONNECTED_LOCAL
  	    && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
  		new_state = NM_STATE_CONNECTED_GLOBAL;
-@@ -6536,6 +6566,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
+@@ -6550,6 +6580,62 @@ impl_manager_check_connectivity (NMDBusObject *obj,
  	nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE);
  }
  
@@ -136,7 +136,7 @@ index 3696c78..abd71c4 100644
  static void
  start_factory (NMDeviceFactory *factory, gpointer user_data)
  {
-@@ -6709,6 +6795,9 @@ nm_manager_start (NMManager *self, GError **error)
+@@ -6723,6 +6809,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 3696c78..abd71c4 100644
  	return TRUE;
  }
  
-@@ -7557,6 +7646,22 @@ nm_manager_init (NMManager *self)
+@@ -7571,6 +7660,22 @@ nm_manager_init (NMManager *self)
  		       KERNEL_FIRMWARE_DIR);
  	}
  
@@ -169,7 +169,7 @@ index 3696c78..abd71c4 100644
  	/* Update timestamps in active connections */
  	priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self);
  
-@@ -7839,6 +7944,16 @@ dispose (GObject *object)
+@@ -7853,6 +7958,16 @@ dispose (GObject *object)
  		g_clear_object (&priv->fw_monitor);
  	}
  
diff --git a/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch b/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch
deleted file mode 100644
index 6f5360c2..00000000
--- a/debian/patches/n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 14 Jan 2020 16:20:56 +0100
-Subject: n-dhcp4: fix integer context in
- n_dhcp4_client_probe_transition_nak() on 32 bit
-
-Fixes: 218782a9a3c3 ('n-dhcp4: restart the transaction after a NAK')
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/339
-(cherry picked from commit de818bf610ba0fed2b275a19fe3e6f9cbfa1862b)
-(cherry picked from commit 4665bb9fc52c626d92f5ca383509c389706f4781)
----
- shared/n-dhcp4/src/n-dhcp4-c-probe.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
-index 5bed15b..f4962d6 100644
---- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
-+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
-@@ -1005,9 +1005,9 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) {
- 
-                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
-                 probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay;
--                probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2,
--                                                      UINT64_C(1000000000 * 2),
--                                                      UINT64_C(1000000000 * 300));
-+                probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u,
-+                                                      UINT64_C(2)   * UINT64_C(1000000000),
-+                                                      UINT64_C(300) * UINT64_C(1000000000));
-                 break;
-         case N_DHCP4_CLIENT_PROBE_STATE_SELECTING:
-         case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT:
diff --git a/debian/patches/series b/debian/patches/series
index f5f767ae..ab08f3ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,7 @@
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
-n-dhcp4-fix-integer-context-in-n_dhcp4_client_probe_trans.patch
 
 # Ubuntu patches
 Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
 Update-dnsmasq-parameters.patch
 Disable-core-with-expect.patch
-
-gitlab_connection_ready.patch
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 97287e90..04672d9b 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -328,6 +328,9 @@ no-auto-default=*
         setting below), the name server there will be localhost only.
         NetworkManager also writes a file <code class="filename">/run/NetworkManager/no-stub-resolv.conf</code>
         that contains the original name servers pushed to the DNS plugin.</p>
+<p>When using <code class="literal">dnsmasq</code> and <code class="literal">systemd-resolved</code>
+        per-connection added dns servers will always be queried using
+        the device the connection has been activated on.</p>
 </td>
 </tr>
 <tr>
@@ -640,11 +643,11 @@ ipv6.ip6-privacy=0
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">connection.llmnr</code></span></p></td>
-<td></td>
+<td><p>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "yes" (2) and for all other plugins "no" (0).</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">connection.mdns</code></span></p></td>
-<td></td>
+<td><p>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "no" (0) and for all other plugins also "no" (0).</p></td>
 </tr>
 <tr>
 <td><p><span class="term"><code class="varname">connection.stable-id</code></span></p></td>
@@ -716,6 +719,10 @@ ipv6.ip6-privacy=0
           </p></td>
 </tr>
 <tr>
+<td><p><span class="term"><code class="varname">ipv6.ra-timeout</code></span></p></td>
+<td><p>If left unspecified, the default value depends on the sysctl solicitation settings.</p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">ipv6.dhcp-duid</code></span></p></td>
 <td><p>If left unspecified, it defaults to "lease".</p></td>
 </tr>
@@ -1067,6 +1074,19 @@ managed=1
 </colgroup>
 <tbody>
 <tr>
+<td><p><span class="term"><code class="varname">enabled</code></span></p></td>
+<td><p>Whether connectivity check is enabled.
+          Note that to enable connectivity check, a valid uri must
+          also be configured. The value defaults to true, but since
+          the uri is unset by default, connectivity check may be disabled.
+          The main purpose of this option is to have a single flag
+          to disable connectivity check. Note that this setting can
+          also be set via D-Bus API at runtime. In that case, the value gets
+          stored in <code class="filename">/var/lib/NetworkManager/NetworkManager-intern.conf</code>
+          file.
+          </p></td>
+</tr>
+<tr>
 <td><p><span class="term"><code class="varname">uri</code></span></p></td>
 <td><p>The URI of a web page to periodically
           request when connectivity is being checked.  This page
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 33ceda9e..aae415c1 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -487,6 +487,7 @@
     <keyword type="property" name="The &quot;MaxBitrate&quot; property" link="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.MaxBitrate"/>
     <keyword type="property" name="The &quot;Strength&quot; property" link="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.Strength"/>
     <keyword type="property" name="The &quot;LastSeen&quot; property" link="gdbus-org.freedesktop.NetworkManager.AccessPoint.html#gdbus-property-org-freedesktop-NetworkManager-AccessPoint.LastSeen"/>
+    <keyword type="property" name="The &quot;Name&quot; property" link="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Name"/>
     <keyword type="property" name="The &quot;Flags&quot; property" link="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Flags"/>
     <keyword type="property" name="The &quot;Manufacturer&quot; property" link="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Manufacturer"/>
     <keyword type="property" name="The &quot;Model&quot; property" link="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Model"/>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html
index e6ca64ed..7dd3d66b 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html
@@ -35,6 +35,7 @@
 <div class="refsect1">
 <a name="id-1.4.15.2.3"></a><h2>Properties</h2>
 <pre class="synopsis">
+<a class="link" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Name" title='The "Name" property'>Name</a>          readable   s
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Flags" title='The "Flags" property'>Flags</a>         readable   u
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Manufacturer" title='The "Manufacturer" property'>Manufacturer</a>  readable   s
 <a class="link" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Model" title='The "Model" property'>Model</a>         readable   s
@@ -54,6 +55,17 @@
 <div class="refsect1">
 <a name="gdbus-properties-org.freedesktop.NetworkManager.WifiP2PPeer"></a><h2>Property Details</h2>
 <div class="refsect2">
+<a name="gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Name"></a><h3>The "Name" property</h3>
+<pre class="programlisting">
+Name  readable   s
+</pre>
+<p>        Device name.
+</p>
+<p>        Since: 1.16
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Flags"></a><h3>The "Flags" property</h3>
 <pre class="programlisting">
 Flags  readable   u
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 100e3d36..6902fd20 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.22.4
+      for NetworkManager 1.22.8
 
       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 0e307639..4377d376 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -26,1615 +26,1619 @@
 <div class="indexdiv">
 <h3>Symbols</h3>
 <dl>
-<dt id="ientry-idm45686052830688">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-idm45389936441376">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-idm45686040256160">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-idm45389942298464">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-idm45686039681088">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-idm45389936694160">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-idm45686039718288">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-idm45389936634976">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-idm45686039714144">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-idm45389935598608">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-idm45686039696272">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-idm45389935695552">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-idm45686039704720">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-idm45389937976208">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-idm45686039709936">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-idm45389936206112">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-idm45686039670672">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-idm45389936208480">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-idm45686039665440">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-idm45389935645952">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-idm45686039700480">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-idm45389936172816">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-idm45686039675888">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-idm45389935655360">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-idm45686052669488">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-idm45389946143744">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-idm45686052304496">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-idm45389942698480">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-idm45686051791488">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-idm45389942470112">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-idm45686053395168">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-idm45389940885680">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-idm45686050824032">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-idm45389947016192">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-idm45686051203616">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-idm45389945939904">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-idm45686044313360">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-idm45389942636208">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-idm45686044763936">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-idm45389935821248">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-idm45686051862112">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-idm45389940390128">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-idm45686047587872">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-idm45389934846768">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-idm45686045471232">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-idm45389938498416">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-idm45686045456288">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-idm45389938905296">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-idm45686045452480">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-idm45389938502592">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-idm45686051108736">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-idm45389942442480">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-idm45686050900432">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-idm45389938387264">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-idm45686047093648">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-idm45389944855328">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-idm45686053656736">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-idm45389937909904">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-idm45686047089152">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-idm45389944850672">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-idm45686049230128">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-idm45389944378496">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-idm45686051605504">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-idm45389943038928">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-idm45686053516080">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-idm45389938874976">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-idm45686049801488">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-idm45389938878944">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-idm45686049195232">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-idm45389937928816">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-idm45686045532672">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-idm45389944909776">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-idm45686045348512">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-idm45389944914048">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-idm45686050143248">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-idm45389942612224">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-idm45686050915808">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-idm45389938263504">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-idm45686044709248">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-idm45389937939648">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-idm45686049227216">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-idm45389942377600">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-idm45686044694480">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-idm45389944038016">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-idm45686052189248">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-idm45389946459040">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-idm45686044705984">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-idm45389945348160">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-idm45686045324640">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-idm45389938299728">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-idm45686050461904">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-idm45389942301264">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-idm45686044369504">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-idm45389944356896">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-idm45686044260064">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-idm45389938202448">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-idm45686044674096">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-idm45389945579696">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-idm45686049962848">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-idm45389941799856">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-idm45686047474976">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-idm45389938245888">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-idm45686051121056">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-idm45389938039968">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-idm45686052839760">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-idm45389937925904">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-idm45686044899888">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-idm45389938164784">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-idm45686044306480">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-idm45389938255216">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-idm45686048166240">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-idm45389944845568">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-idm45686048052560">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-idm45389938292000">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-idm45686052961152">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-idm45389938044256">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-idm45686044958944">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-idm45389937903968">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-idm45686047437584">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-idm45389937932384">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-idm45686044378432">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-idm45389934855664">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-idm45686051998896">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-idm45389937936576">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-idm45686053117136">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-idm45389940732864">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-idm45686049959728">org.freedesktop.NetworkManager.Device.Lowpan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Lowpan.top_of_page">org.freedesktop.NetworkManager.Device.Lowpan</a>
+<dt id="ientry-idm45389944003680">org.freedesktop.NetworkManager.Device.Lowpan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Lowpan.top_of_page">org.freedesktop.NetworkManager.Device.Lowpan</a>
 </dt>
-<dt id="ientry-idm45686044645808">org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Lowpan.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45389938896512">org.freedesktop.NetworkManager.Device.Lowpan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Lowpan.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45686044642000">org.freedesktop.NetworkManager.Device.Lowpan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Lowpan.Parent">The "Parent" property</a>
+<dt id="ientry-idm45389938139904">org.freedesktop.NetworkManager.Device.Lowpan:Parent, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Lowpan.Parent">The "Parent" property</a>
 </dt>
-<dt id="ientry-idm45686049549888">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-idm45389943476256">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-idm45686044344896">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-idm45389937916512">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-idm45686045404064">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-idm45389938397760">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-idm45686042537776">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-idm45389935632176">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-idm45686042529264">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-idm45389935623664">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-idm45686042243920">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-idm45389935611024">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-idm45686045408128">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-idm45389938401872">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-idm45686042520864">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-idm45389935615264">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-idm45686045387792">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-idm45389934877776">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-idm45686042525072">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-idm45389935619472">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-idm45686042235392">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-idm45389935602496">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-idm45686042239696">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-idm45389935606800">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-idm45686045412208">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-idm45389938405952">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-idm45686042533504">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-idm45389935627904">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-idm45686045399728">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-idm45389938393424">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-idm45686051317856">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-idm45389941779520">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-idm45686048939632">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-idm45389934958000">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-idm45686051913248">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-idm45389936682192">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-idm45686053654160">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-idm45389936678112">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-idm45686042097216">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-idm45389936752816">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-idm45686045429632">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-idm45389936673968">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-idm45686052299456">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-idm45389940680880">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-idm45686044798144">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-idm45389936744816">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-idm45686052230384">org.freedesktop.NetworkManager.Device.Modem:Apn, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.Apn">The "Apn" property</a>
+<dt id="ientry-idm45389934937072">org.freedesktop.NetworkManager.Device.Modem:Apn, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.Apn">The "Apn" property</a>
 </dt>
-<dt id="ientry-idm45686044839248">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-idm45389938098800">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-idm45686052238912">org.freedesktop.NetworkManager.Device.Modem:DeviceId, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.DeviceId">The "DeviceId" property</a>
+<dt id="ientry-idm45389934946160">org.freedesktop.NetworkManager.Device.Modem:DeviceId, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.DeviceId">The "DeviceId" property</a>
 </dt>
-<dt id="ientry-idm45686042552128">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-idm45389936701664">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-idm45686052234720">org.freedesktop.NetworkManager.Device.Modem:OperatorCode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.OperatorCode">The "OperatorCode" property</a>
+<dt id="ientry-idm45389934941728">org.freedesktop.NetworkManager.Device.Modem:OperatorCode, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Modem.html#gdbus-property-org-freedesktop-NetworkManager-Device-Modem.OperatorCode">The "OperatorCode" property</a>
 </dt>
-<dt id="ientry-idm45686051630624">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-idm45389946700400">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-idm45686052267776">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-idm45389937971328">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-idm45686044813808">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-idm45389946121936">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-idm45686044818016">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-idm45389934896768">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-idm45686044821680">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-idm45389943380368">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-idm45686048994432">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-idm45389946064368">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-idm45686044806848">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-idm45389938145952">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-idm45686044809312">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-idm45389938108928">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-idm45686046957520">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-idm45389945148096">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-idm45686042624704">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-idm45389935673936">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-idm45686050602736">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-idm45389945482064">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-idm45686042595520">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-idm45389936728320">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-idm45686042639024">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-idm45389935109360">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-idm45686053340272">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-idm45389940642896">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-idm45686042584464">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-idm45389935408336">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-idm45686045338976">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-idm45389937953344">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-idm45686049994864">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-idm45389945472256">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-idm45686045459008">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-idm45389945284368">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-idm45686044793984">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-idm45389942383728">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-idm45686045320992">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-idm45389943768592">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-idm45686044790288">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-idm45389945628640">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-idm45686053139760">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-idm45389944392352">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-idm45686042957200">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-idm45389935682656">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-idm45686042709424">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-idm45389935723456">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-idm45686042733712">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-idm45389935044720">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-idm45686042713504">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-idm45389935727296">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-idm45686042737952">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-idm45389935048720">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-idm45686044689120">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-idm45389945473488">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-idm45686042756512">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-idm45389934902592">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-idm45686042723056">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-idm45389935701120">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-idm45686041990608">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-idm45389934890240">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-idm45686042664032">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-idm45389934909200">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-idm45686042651472">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-idm45389938025616">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-idm45686042659920">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-idm45389935101856">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-idm45686042727248">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-idm45389938167776">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-idm45686042655680">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-idm45389938029872">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-idm45686051848352">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-idm45389940749696">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-idm45686042119856">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-idm45389934996544">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-idm45686042860080">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-idm45389935081440">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-idm45686051775760">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-idm45389942833472">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-idm45686042113968">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-idm45389935073968">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-idm45686042935504">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-idm45389935506224">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-idm45686042939584">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-idm45389935035600">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-idm45686042900304">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-idm45389935501568">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-idm45686042896112">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-idm45389935025072">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-idm45686051306544">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-idm45389942580032">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-idm45686042717376">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-idm45389935551280">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-idm45686042886784">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-idm45389936097344">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-idm45686042923808">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-idm45389936088912">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-idm45686042759648">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-idm45389935006208">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-idm45686042847504">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-idm45389935014400">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-idm45686042763760">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-idm45389935010320">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-idm45686042885264">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-idm45389936068032">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-idm45686042881056">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-idm45389936063824">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-idm45686042890944">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-idm45389936101504">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-idm45686042928032">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-idm45389936093136">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-idm45686044854448">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-idm45389936114192">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-idm45686042851712">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-idm45389935018608">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-idm45686042793264">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-idm45389936076480">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-idm45686042789056">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-idm45389936072272">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-idm45686042675968">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-idm45389936080720">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-idm45686042680224">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-idm45389936084832">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-idm45686052252880">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-idm45389936109952">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-idm45686052248656">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-idm45389936105728">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-idm45686053558528">org.freedesktop.NetworkManager.Device.WireGuard, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-interface-org-freedesktop-NetworkManager-Device-WireGuard.top_of_page">org.freedesktop.NetworkManager.Device.WireGuard</a>
+<dt id="ientry-idm45389944240272">org.freedesktop.NetworkManager.Device.WireGuard, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-interface-org-freedesktop-NetworkManager-Device-WireGuard.top_of_page">org.freedesktop.NetworkManager.Device.WireGuard</a>
 </dt>
-<dt id="ientry-idm45686042798064">org.freedesktop.NetworkManager.Device.WireGuard:FwMark, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-property-org-freedesktop-NetworkManager-Device-WireGuard.FwMark">The "FwMark" property</a>
+<dt id="ientry-idm45389934862624">org.freedesktop.NetworkManager.Device.WireGuard:FwMark, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-property-org-freedesktop-NetworkManager-Device-WireGuard.FwMark">The "FwMark" property</a>
 </dt>
-<dt id="ientry-idm45686039997760">org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-property-org-freedesktop-NetworkManager-Device-WireGuard.ListenPort">The "ListenPort" property</a>
+<dt id="ientry-idm45389935523328">org.freedesktop.NetworkManager.Device.WireGuard:ListenPort, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-property-org-freedesktop-NetworkManager-Device-WireGuard.ListenPort">The "ListenPort" property</a>
 </dt>
-<dt id="ientry-idm45686042098320">org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-property-org-freedesktop-NetworkManager-Device-WireGuard.PublicKey">The "PublicKey" property</a>
+<dt id="ientry-idm45389942672464">org.freedesktop.NetworkManager.Device.WireGuard:PublicKey, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html#gdbus-property-org-freedesktop-NetworkManager-Device-WireGuard.PublicKey">The "PublicKey" property</a>
 </dt>
-<dt id="ientry-idm45686047122656">org.freedesktop.NetworkManager.Device.Wpan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wpan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Wpan.top_of_page">org.freedesktop.NetworkManager.Device.Wpan</a>
+<dt id="ientry-idm45389941681600">org.freedesktop.NetworkManager.Device.Wpan, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wpan.html#gdbus-interface-org-freedesktop-NetworkManager-Device-Wpan.top_of_page">org.freedesktop.NetworkManager.Device.Wpan</a>
 </dt>
-<dt id="ientry-idm45686042174144">org.freedesktop.NetworkManager.Device.Wpan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wpan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wpan.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45389936740464">org.freedesktop.NetworkManager.Device.Wpan:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.Wpan.html#gdbus-property-org-freedesktop-NetworkManager-Device-Wpan.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45686045526752">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-idm45389944903968">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-idm45686044496288">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-idm45389935781200">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-idm45686044471056">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-idm45389935756352">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-idm45686044453184">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-idm45389935865424">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-idm45686045484496">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-idm45389935801776">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-idm45686044458384">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-idm45389935870528">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-idm45686044487792">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-idm45389935772896">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-idm45686044479312">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-idm45389935764608">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-idm45686045497360">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-idm45389944874832">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-idm45686045493088">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-idm45389935810368">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-idm45686044466912">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-idm45389935879056">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-idm45686045488784">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-idm45389935806064">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-idm45686045505888">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-idm45389944883104">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-idm45686044415840">org.freedesktop.NetworkManager.Device:InterfaceFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.InterfaceFlags">The "InterfaceFlags" property</a>
+<dt id="ientry-idm45389935828080">org.freedesktop.NetworkManager.Device:InterfaceFlags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.InterfaceFlags">The "InterfaceFlags" property</a>
 </dt>
-<dt id="ientry-idm45686045479264">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-idm45389935796544">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-idm45686044492128">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-idm45389935777040">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-idm45686044426880">org.freedesktop.NetworkManager.Device:Ip4Connectivity, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Connectivity">The "Ip4Connectivity" property</a>
+<dt id="ientry-idm45389935839120">org.freedesktop.NetworkManager.Device:Ip4Connectivity, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip4Connectivity">The "Ip4Connectivity" property</a>
 </dt>
-<dt id="ientry-idm45686044483648">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-idm45389935768752">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-idm45686044421360">org.freedesktop.NetworkManager.Device:Ip6Connectivity, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Connectivity">The "Ip6Connectivity" property</a>
+<dt id="ientry-idm45389935833600">org.freedesktop.NetworkManager.Device:Ip6Connectivity, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.html#gdbus-property-org-freedesktop-NetworkManager-Device.Ip6Connectivity">The "Ip6Connectivity" property</a>
 </dt>
-<dt id="ientry-idm45686045501488">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-idm45389944878960">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-idm45686044435264">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-idm45389935847504">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-idm45686044475184">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-idm45389935760480">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-idm45686044440560">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-idm45389935852800">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-idm45686044444672">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-idm45389935856912">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-idm45686044462656">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-idm45389935874800">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-idm45686044448800">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-idm45389935861040">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-idm45686044431008">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-idm45389935843248">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-idm45686045475024">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-idm45389935792304">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-idm45686044502256">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-idm45389935787168">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-idm45686045510416">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-idm45389944887632">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-idm45686044609904">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-idm45389947214256">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-idm45686047067808">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-idm45389944863280">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-idm45686049185584">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-idm45389940495840">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-idm45686050647808">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-idm45389940492000">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-idm45686051666672">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-idm45389944123024">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-idm45686039750400">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-idm45389936412048">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-idm45686040057536">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-idm45389936199568">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-idm45686039763216">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-idm45389935926208">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-idm45686039621888">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-idm45389936214736">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-idm45686039617584">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-idm45389936391616">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-idm45686039630208">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-idm45389936223056">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-idm45686040053408">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-idm45389936195440">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-idm45686039634768">org.freedesktop.NetworkManager.IP4Config:NameserverData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.NameserverData">The "NameserverData" property</a>
+<dt id="ientry-idm45389936227616">org.freedesktop.NetworkManager.IP4Config:NameserverData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.NameserverData">The "NameserverData" property</a>
 </dt>
-<dt id="ientry-idm45686039638992">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-idm45389936231840">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-idm45686039643280">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-idm45389936187136">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-idm45686040049248">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-idm45389936191280">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-idm45686039626080">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-idm45389936218928">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-idm45686039609296">org.freedesktop.NetworkManager.IP4Config:WinsServerData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServerData">The "WinsServerData" property</a>
+<dt id="ientry-idm45389936383328">org.freedesktop.NetworkManager.IP4Config:WinsServerData, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.IP4Config.html#gdbus-property-org-freedesktop-NetworkManager-IP4Config.WinsServerData">The "WinsServerData" property</a>
 </dt>
-<dt id="ientry-idm45686039613440">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-idm45389936387472">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-idm45686048842832">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-idm45389945070112">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-idm45686040212160">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-idm45389936306048">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-idm45686040198400">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-idm45389936526304">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-idm45686040202576">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-idm45389936530480">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-idm45686040174240">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-idm45389936362640">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-idm45686040169936">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-idm45389936358336">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-idm45686040182560">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-idm45389936370960">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-idm45686040227968">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-idm45389936522176">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-idm45686040215312">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-idm45389936375136">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-idm45686040219712">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-idm45389936379360">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-idm45686040223856">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-idm45389936518016">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-idm45686040178432">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-idm45389936366832">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-idm45686050268208">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-idm45389947173008">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-idm45686038845040">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-idm45389932424560">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-idm45686038909856">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-idm45389932277264">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-idm45686039340448">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-idm45389936292624">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-idm45686038919680">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-idm45389932414608">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-idm45686049092640">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-idm45389943019248">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-idm45686051152832">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-idm45389938522176">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-idm45686052787648">org.freedesktop.NetworkManager.Settings.AddConnection2(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection2">The AddConnection2() method</a>
+<dt id="ientry-idm45389943567376">org.freedesktop.NetworkManager.Settings.AddConnection2(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Settings.html#gdbus-method-org-freedesktop-NetworkManager-Settings.AddConnection2">The AddConnection2() method</a>
 </dt>
-<dt id="ientry-idm45686051100560">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-idm45389946705648">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-idm45686050788016">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-idm45389940742784">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-idm45686044582416">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-idm45389940416976">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-idm45686050863440">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-idm45389945646608">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-idm45686044537120">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-idm45389940404400">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-idm45686044544576">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-idm45389946146016">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-idm45686044578112">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-idm45389942337872">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-idm45686044397648">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-idm45389942622880">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-idm45686044573760">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-idm45389943400944">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-idm45686050870928">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-idm45389946918800">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-idm45686044594496">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-idm45389941814048">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-idm45686044598768">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-idm45389940411536">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-idm45686044513680">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-idm45389942790464">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-idm45686044382160">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-idm45389945924912">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-idm45686044387744">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-idm45389943727376">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-idm45686044391872">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-idm45389943099840">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-idm45686053255504">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-idm45389946204736">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-idm45686050112016">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-idm45389946355904">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-idm45686051765904">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-idm45389940829344">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-idm45686052629904">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-idm45389945561168">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-idm45686049672848">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-idm45389946974224">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-idm45686048836000">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-idm45389940802432">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-idm45686048964624">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-idm45389942968672">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-idm45686050125408">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-idm45389940613888">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-idm45686048039696">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-idm45389944130432">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-idm45686044361456">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-idm45389940368464">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-idm45686044357248">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-idm45389944134656">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-idm45686042544608">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-idm45389940895184">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-idm45686040024720">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-idm45389935982896">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-idm45686041930352">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-idm45389936157136">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-idm45686040015696">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-idm45389935955056">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-idm45686040094880">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-idm45389933348448">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-idm45686040081648">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-idm45389933336736">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-idm45686040109632">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-idm45389933361712">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-idm45686040086176">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-idm45389933340592">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-idm45686040072928">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-idm45389933328880">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-idm45686040122400">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-idm45389935946576">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-idm45686040090464">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-idm45389933344448">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-idm45686040077216">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-idm45389933332736">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-idm45686040064256">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-idm45389933321008">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-idm45686040126464">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-idm45389935950800">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-idm45686040105296">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-idm45389933357792">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-idm45686040100112">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-idm45389933353136">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-idm45686040113888">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-idm45389933365584">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-idm45686040118144">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-idm45389935942320">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-idm45686040068448">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-idm45389933324816">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-idm45686041366368">addr-gen-mode, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934468592">addr-gen-mode, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041460944">address-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934566272">address-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041457344">addresses, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934562672">addresses, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686040661760">ageing, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933759072">ageing, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686041698128">ageing-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934803104">ageing-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686043146848">altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939102272">altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043142944">anonymous-identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939098368">anonymous-identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041537296">apn, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934642272">apn, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45686041608016">app-fcoe-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934712992">app-fcoe-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041604432">app-fcoe-mode, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934709408">app-fcoe-mode, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041600944">app-fcoe-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934705920">app-fcoe-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041597248">app-fip-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934702224">app-fip-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041593664">app-fip-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934698640">app-fip-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041589968">app-iscsi-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934694944">app-iscsi-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041586384">app-iscsi-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934691360">app-iscsi-priority, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686040564928">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-idm45389933662176">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-idm45686040373360">auth-alg, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933471264">auth-alg, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686051747072">auth-retries, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389944496400">auth-retries, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686043139264">auth-timeout, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939094688">auth-timeout, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041533472">auto-config, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934638448">auto-config, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45686040560816">auto-negotiate, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933658496">auto-negotiate, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686052549472">autoconnect, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389944476624">autoconnect, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686052546304">autoconnect-priority, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938190832">autoconnect-priority, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686047146528">autoconnect-retries, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938187328">autoconnect-retries, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686047142688">autoconnect-slaves, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389944198144">autoconnect-slaves, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040889680">autoprobe-drivers, <a class="indexterm" href="settings-sriov.html">sriov</a>
+<dt id="ientry-idm45389933986096">autoprobe-drivers, <a class="indexterm" href="settings-sriov.html">sriov</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>B</h3>
 <dl>
-<dt id="ientry-idm45686040452448">band, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933550064">band, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686041034992">baud, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45389934131472">baud, <a class="indexterm" href="settings-ppp.html">ppp</a>, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45686041720336">bdaddr, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>
+<dt id="ientry-idm45389934825312">bdaddr, <a class="indexterm" href="settings-bluetooth.html">bluetooth</a>
 </dt>
-<dt id="ientry-idm45686040910224">bits, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45389934006640">bits, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45686041062928">bond-downdelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45389934159344">bond-downdelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45686041059008">bond-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45389934155424">bond-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45686041055248">bond-updelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45389934151664">bond-updelay, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45686040934528">browser-only, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45389934030944">browser-only, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45686040448336">bssid, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933545952">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-idm45686043135264">ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939090688">ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043131584">ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939087008">ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043127904">ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939083328">ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043124256">ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939079632">ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041129392">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>, <a class="indexterm" href="settings-wpan.html">wpan</a>
+<dt id="ientry-idm45389934225872">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>, <a class="indexterm" href="settings-wpan.html">wpan</a>
 </dt>
-<dt id="ientry-idm45686050459824">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-idm45389943706352">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-idm45686051934224">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-idm45389933178816">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-idm45686046911328">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-idm45389951949568">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-idm45686045343680">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-idm45389951953408">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-idm45686051130176">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-idm45389936558896">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-idm45686043120368">client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939075744">client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043116688">client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939072064">client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043112848">client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939068176">client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686040556512">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-idm45389933654192">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-idm45686040860160">config, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45389933957344">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-idm45686041031152">crtscts, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934127632">crtscts, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt id="ientry-idm45686041453984">dad-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934558768">dad-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686040727936">data, <a class="indexterm" href="settings-user.html">user</a>, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45389933825184">data, <a class="indexterm" href="settings-user.html">user</a>, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45686041113088">datapath-type, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45389934209568">datapath-type, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45686040657840">destination-port, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933755152">destination-port, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686041089072">devargs, <a class="indexterm" href="settings-ovs-dpdk.html">ovs-dpdk</a>
+<dt id="ientry-idm45389934185488">devargs, <a class="indexterm" href="settings-ovs-dpdk.html">ovs-dpdk</a>
 </dt>
-<dt id="ientry-idm45686041529792">device-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934634768">device-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45686049431840">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-idm45389947074896">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-idm45686041985632">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-idm45389935442448">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-idm45686042043120">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-idm45389936652560">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-idm45686042069584">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-idm45389935490736">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-idm45686042065520">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-idm45389935486672">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-idm45686042047328">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-idm45389936659584">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-idm45686042056672">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-idm45389936663792">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-idm45686051637696">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-idm45389944361376">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-idm45686042230400">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-idm45389936646496">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-idm45686042208832">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-idm45389936059312">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-idm45686042201536">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-idm45389936052112">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-idm45686039987424">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-idm45389936016832">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-idm45686058372896">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-idm45389936009344">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-idm45686039994912">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-idm45389936024320">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-idm45686039866736">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-idm45389936327856">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-idm45686039862368">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-idm45389936323488">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-idm45686039871024">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-idm45389936332144">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-idm45686058363680">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-idm45389936345760">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-idm45686039852720">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-idm45389936313840">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-idm45686039876144">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-idm45389936337264">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-idm45686039880368">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-idm45389936341488">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-idm45686039857984">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-idm45389936319104">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-idm45686051835568">org.freedesktop.NetworkManager.Device.WifiP2P, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-interface-org-freedesktop-NetworkManager-Device-WifiP2P.top_of_page">org.freedesktop.NetworkManager.Device.WifiP2P</a>
+<dt id="ientry-idm45389940391104">org.freedesktop.NetworkManager.Device.WifiP2P, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-interface-org-freedesktop-NetworkManager-Device-WifiP2P.top_of_page">org.freedesktop.NetworkManager.Device.WifiP2P</a>
 </dt>
-<dt id="ientry-idm45686042873728">org.freedesktop.NetworkManager.Device.WifiP2P.StartFind(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-method-org-freedesktop-NetworkManager-Device-WifiP2P.StartFind">The StartFind() method</a>
+<dt id="ientry-idm45389935431088">org.freedesktop.NetworkManager.Device.WifiP2P.StartFind(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-method-org-freedesktop-NetworkManager-Device-WifiP2P.StartFind">The StartFind() method</a>
 </dt>
-<dt id="ientry-idm45686042805888">org.freedesktop.NetworkManager.Device.WifiP2P.StopFind(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-method-org-freedesktop-NetworkManager-Device-WifiP2P.StopFind">The StopFind() method</a>
+<dt id="ientry-idm45389938121088">org.freedesktop.NetworkManager.Device.WifiP2P.StopFind(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-method-org-freedesktop-NetworkManager-Device-WifiP2P.StopFind">The StopFind() method</a>
 </dt>
-<dt id="ientry-idm45686042021776">org.freedesktop.NetworkManager.Device.WifiP2P::PeerAdded, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-signal-org-freedesktop-NetworkManager-Device-WifiP2P.PeerAdded">The "PeerAdded" signal</a>
+<dt id="ientry-idm45389935536368">org.freedesktop.NetworkManager.Device.WifiP2P::PeerAdded, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-signal-org-freedesktop-NetworkManager-Device-WifiP2P.PeerAdded">The "PeerAdded" signal</a>
 </dt>
-<dt id="ientry-idm45686042014000">org.freedesktop.NetworkManager.Device.WifiP2P::PeerRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-signal-org-freedesktop-NetworkManager-Device-WifiP2P.PeerRemoved">The "PeerRemoved" signal</a>
+<dt id="ientry-idm45389936136752">org.freedesktop.NetworkManager.Device.WifiP2P::PeerRemoved, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-signal-org-freedesktop-NetworkManager-Device-WifiP2P.PeerRemoved">The "PeerRemoved" signal</a>
 </dt>
-<dt id="ientry-idm45686040267264">org.freedesktop.NetworkManager.Device.WifiP2P:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-property-org-freedesktop-NetworkManager-Device-WifiP2P.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45389936127040">org.freedesktop.NetworkManager.Device.WifiP2P:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-property-org-freedesktop-NetworkManager-Device-WifiP2P.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45686040262896">org.freedesktop.NetworkManager.Device.WifiP2P:Peers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-property-org-freedesktop-NetworkManager-Device-WifiP2P.Peers">The "Peers" property</a>
+<dt id="ientry-idm45389936122672">org.freedesktop.NetworkManager.Device.WifiP2P:Peers, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html#gdbus-property-org-freedesktop-NetworkManager-Device-WifiP2P.Peers">The "Peers" property</a>
 </dt>
-<dt id="ientry-idm45686041125472">dhcp-anycast-address, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>
+<dt id="ientry-idm45389934221952">dhcp-anycast-address, <a class="indexterm" href="settings-802-11-olpc-mesh.html">802-11-olpc-mesh</a>
 </dt>
-<dt id="ientry-idm45686041450496">dhcp-client-id, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
+<dt id="ientry-idm45389934555280">dhcp-client-id, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
 </dt>
-<dt id="ientry-idm45686041349360">dhcp-duid, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934451520">dhcp-duid, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041445792">dhcp-fqdn, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
+<dt id="ientry-idm45389934550576">dhcp-fqdn, <a class="indexterm" href="settings-ipv4.html">ipv4</a>
 </dt>
-<dt id="ientry-idm45686041442192">dhcp-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934546976">dhcp-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041438608">dhcp-hostname-flags, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934543392">dhcp-hostname-flags, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041435120">dhcp-iaid, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934539904">dhcp-iaid, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041431760">dhcp-send-hostname, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934536544">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-idm45686041427936">dhcp-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934532720">dhcp-timeout, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686053260000">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-idm45389942675520">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-idm45686050383056">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-idm45389936563248">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-idm45686042092928">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-idm45389933182880">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-idm45686050789216">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-idm45389943605504">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-idm45686039806096">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-idm45389946449168">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-idm45686039826416">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-idm45389943356032">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-idm45686041424448">dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934528992">dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041421088">dns-options, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934525632">dns-options, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041417488">dns-priority, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934522032">dns-priority, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041412352">dns-search, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934516832">dns-search, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686043109264">domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939064448">domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686040552608">duplex, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933650288">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-idm45686043105216">eap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939060400">eap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686040718880">egress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45389933816128">egress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45686042967456">encapsulation, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45389938922096">encapsulation, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45686041254432">encapsulation-limit, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45389934351312">encapsulation-limit, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45686041198576">encrypt, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45389934295456">encrypt, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>F</h3>
 <dl>
-<dt id="ientry-idm45686041109344">fail-mode, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45389934205824">fail-mode, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45686040369296">fils, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933467200">fils, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686041250448">flags, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45389934347328">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-idm45686041246224">flow-label, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45389934343104">flow-label, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45686041694640">forward-delay, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934799616">forward-delay, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686040497184">fwmark, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933594864">fwmark, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>G</h3>
 <dl>
-<dt id="ientry-idm45686041408752">gateway, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934513232">gateway, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686042517184">gateway-ping-timeout, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938060576">gateway-ping-timeout, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040548160">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-idm45389933645840">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-idm45686040756464">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-idm45389933853712">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-idm45686041691152">group-forward-mask, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934796128">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-idm45686041647872">hairpin-mode, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45389934752848">hairpin-mode, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
 </dt>
-<dt id="ientry-idm45686041687280">hello-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934792256">hello-time, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686040430928">hidden, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933528544">hidden, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686041526240">home-only, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934631216">home-only, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>I</h3>
 <dl>
-<dt id="ientry-idm45686042513344">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-idm45389938056736">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-idm45686043101216">identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939056400">identity, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041405280">ignore-auto-dns, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934509760">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-idm45686041401536">ignore-auto-routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934505952">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-idm45686040707312">ingress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45389933804560">ingress-priority-map, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45686041242288">input-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45389934339168">input-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45686042509552">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-match.html">match</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
+<dt id="ientry-idm45389938052944">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-match.html">match</a>, <a class="indexterm" href="settings-team.html">team</a>, <a class="indexterm" href="settings-vlan.html">vlan</a>
 </dt>
-<dt id="ientry-idm45686040493072">ip4-auto-default-route, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933590752">ip4-auto-default-route, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686040488832">ip6-auto-default-route, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933586512">ip6-auto-default-route, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686041295440">ip6-privacy, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934396352">ip6-privacy, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>K</h3>
-<dl><dt id="ientry-idm45686040360880">key-mgmt, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dl><dt id="ientry-idm45389933458784">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-idm45686040649968">l2-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933747280">l2-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040646048">l3-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933743360">l3-miss, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686041051328">lacp, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45389934147744">lacp, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45686040785200">lacp-key, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45389933882384">lacp-key, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45686040781296">lacp-prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45389933878480">lacp-prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45686041027136">lcp-echo-failure, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934123616">lcp-echo-failure, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041023040">lcp-echo-interval, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934119520">lcp-echo-interval, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040356928">leap-password, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933454832">leap-password, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040353120">leap-password-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933451024">leap-password-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040349328">leap-username, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933447232">leap-username, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040642128">learning, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933739440">learning, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040638144">limit, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933735456">limit, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040852352">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-idm45389933949536">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-idm45686040485072">listen-port, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933582752">listen-port, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686042505872">lldp, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938049264">lldp, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686042502032">llmnr, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938222160">llmnr, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686041238464">local, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389934335344">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-idm45686041680272">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>, <a class="indexterm" href="settings-wpan.html">wpan</a>
+<dt id="ientry-idm45389934785248">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>, <a class="indexterm" href="settings-wpan.html">wpan</a>
 </dt>
-<dt id="ientry-idm45686040538928">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-idm45389933636608">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-idm45686040419248">mac-address-randomization, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933516864">mac-address-randomization, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686049916608">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-idm45389942568288">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-idm45686052565744">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-idm45389944942576">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-idm45686044716976">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-idm45389940878544">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-idm45686049726848">org.freedesktop.NetworkManager.AddAndActivateConnection2(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection2">The AddAndActivateConnection2() method</a>
+<dt id="ientry-idm45389947250448">org.freedesktop.NetworkManager.AddAndActivateConnection2(), <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-method-org-freedesktop-NetworkManager.AddAndActivateConnection2">The AddAndActivateConnection2() method</a>
 </dt>
-<dt id="ientry-idm45686052516928">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-idm45389938470464">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-idm45686047027888">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-idm45389938357968">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-idm45686044723568">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-idm45389937857088">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-idm45686051276528">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-idm45389943455216">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-idm45686049456128">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-idm45389943447776">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-idm45686052100976">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-idm45389940579280">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-idm45686044941680">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-idm45389938011536">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-idm45686046759712">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-idm45389943263024">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-idm45686051079824">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-idm45389940356528">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-idm45686044276368">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-idm45389938507152">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-idm45686050854256">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-idm45389946965136">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-idm45686047471360">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-idm45389938003904">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-idm45686049264400">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-idm45389937987488">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-idm45686047058480">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-idm45389943744992">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-idm45686052507408">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-idm45389940864496">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-idm45686053707376">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-idm45389937865136">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-idm45686047597024">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-idm45389938344080">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-idm45686051814976">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-idm45389937844976">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-idm45686044660256">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-idm45389938341936">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-idm45686046879120">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-idm45389937852208">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-idm45686047592720">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-idm45389946380704">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-idm45686044779776">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-idm45389938280864">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-idm45686049519984">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-idm45389935748304">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-idm45686052621696">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-idm45389938328592">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-idm45686046891680">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-idm45389938268400">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-idm45686052617552">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-idm45389945687472">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-idm45686053268656">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-idm45389938452688">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-idm45686044953632">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-idm45389938446592">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-idm45686044949184">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-idm45389937898400">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-idm45686048280656">org.freedesktop.NetworkManager:ConnectivityCheckUri, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckUri">The "ConnectivityCheckUri" property</a>
+<dt id="ientry-idm45389937894080">org.freedesktop.NetworkManager:ConnectivityCheckUri, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.html#gdbus-property-org-freedesktop-NetworkManager.ConnectivityCheckUri">The "ConnectivityCheckUri" property</a>
 </dt>
-<dt id="ientry-idm45686044730384">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-idm45389938332992">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-idm45686048276464">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-idm45389937889808">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-idm45686044784960">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-idm45389938286048">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-idm45686052932656">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-idm45389945683328">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-idm45686044754336">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-idm45389935744144">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-idm45686044750176">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-idm45389935739984">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-idm45686052047248">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-idm45389938276752">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-idm45686046886960">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-idm45389938458464">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-idm45686052043120">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-idm45389938272624">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-idm45686041746048">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-idm45389937825824">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-idm45686049524208">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-idm45389935752576">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-idm45686047622592">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-idm45389945679056">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-idm45686047618368">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-idm45389945674832">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-idm45686053252672">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-idm45389937834352">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-idm45686053248432">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-idm45389937830112">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-idm45686044923632">master, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938218320">master, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686041676912">max-age, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934781888">max-age, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686041397856">may-fail, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934501920">may-fail, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686040848112">mcast-rejoin-count, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933945296">mcast-rejoin-count, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040844208">mcast-rejoin-interval, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933941392">mcast-rejoin-interval, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686041105584">mcast-snooping-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45389934202064">mcast-snooping-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45686044919952">mdns, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938214640">mdns, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686044916112">metered, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938210800">metered, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686041393904">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-idm45389934497616">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-idm45686041194672">mka-cak, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45389934291552">mka-cak, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45686041190896">mka-cak-flags, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45389934287776">mka-cak-flags, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45686041187136">mka-ckn, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45389934284016">mka-ckn, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45686041234656">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-idm45389934331536">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-idm45686041018944">mppe-stateful, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934115424">mppe-stateful, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041014992">mru, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934111472">mru, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041629648">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-wireguard.html">wireguard</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389934734624">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-wireguard.html">wireguard</a>, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686044912272">multi-connect, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389938206960">multi-connect, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040748624">multi-queue, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45389933845872">multi-queue, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
-<dt id="ientry-idm45686041673424">multicast-snooping, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934778400">multicast-snooping, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>N</h3>
 <dl>
-<dt id="ientry-idm45686041519008">network-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934623984">network-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45686040573600">network-name, <a class="indexterm" href="settings-wimax.html">wimax</a>
+<dt id="ientry-idm45389933670912">network-name, <a class="indexterm" href="settings-wimax.html">wimax</a>
 </dt>
-<dt id="ientry-idm45686041390544">never-default, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934493936">never-default, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686036900944">NM80211ApFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApFlags">enum NM80211ApFlags</a>
+<dt id="ientry-idm45389930927360">NM80211ApFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApFlags">enum NM80211ApFlags</a>
 </dt>
-<dt id="ientry-idm45686036873920">NM80211ApSecurityFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApSecurityFlags">enum NM80211ApSecurityFlags</a>
+<dt id="ientry-idm45389930900336">NM80211ApSecurityFlags, <a class="indexterm" href="nm-dbus-types.html#NM80211ApSecurityFlags">enum NM80211ApSecurityFlags</a>
 </dt>
-<dt id="ientry-idm45686036820384">NM80211Mode, <a class="indexterm" href="nm-dbus-types.html#NM80211Mode">enum NM80211Mode</a>
+<dt id="ientry-idm45389930846800">NM80211Mode, <a class="indexterm" href="nm-dbus-types.html#NM80211Mode">enum NM80211Mode</a>
 </dt>
-<dt id="ientry-idm45686036014528">NMActivationStateFlags, <a class="indexterm" href="nm-dbus-types.html#NMActivationStateFlags">enum NMActivationStateFlags</a>
+<dt id="ientry-idm45389930014240">NMActivationStateFlags, <a class="indexterm" href="nm-dbus-types.html#NMActivationStateFlags">enum NMActivationStateFlags</a>
 </dt>
-<dt id="ientry-idm45686036324784">NMActiveConnectionState, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionState">enum NMActiveConnectionState</a>
+<dt id="ientry-idm45389930324640">NMActiveConnectionState, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionState">enum NMActiveConnectionState</a>
 </dt>
-<dt id="ientry-idm45686036293376">NMActiveConnectionStateReason, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionStateReason">enum NMActiveConnectionStateReason</a>
+<dt id="ientry-idm45389930293232">NMActiveConnectionStateReason, <a class="indexterm" href="nm-dbus-types.html#NMActiveConnectionStateReason">enum NMActiveConnectionStateReason</a>
 </dt>
-<dt id="ientry-idm45686036792800">NMBluetoothCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMBluetoothCapabilities">enum NMBluetoothCapabilities</a>
+<dt id="ientry-idm45389930819216">NMBluetoothCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMBluetoothCapabilities">enum NMBluetoothCapabilities</a>
 </dt>
-<dt id="ientry-idm45686049617360">NMCapability, <a class="indexterm" href="nm-dbus-types.html#NMCapability">enum NMCapability</a>
+<dt id="ientry-idm45389942884160">NMCapability, <a class="indexterm" href="nm-dbus-types.html#NMCapability">enum NMCapability</a>
 </dt>
-<dt id="ientry-idm45686036099584">NMCheckpointCreateFlags, <a class="indexterm" href="nm-dbus-types.html#NMCheckpointCreateFlags">enum NMCheckpointCreateFlags</a>
+<dt id="ientry-idm45389930099360">NMCheckpointCreateFlags, <a class="indexterm" href="nm-dbus-types.html#NMCheckpointCreateFlags">enum NMCheckpointCreateFlags</a>
 </dt>
-<dt id="ientry-idm45686036351552">NMConnectionMultiConnect, <a class="indexterm" href="nm-dbus-types.html#NMConnectionMultiConnect">enum NMConnectionMultiConnect</a>
+<dt id="ientry-idm45389930351440">NMConnectionMultiConnect, <a class="indexterm" href="nm-dbus-types.html#NMConnectionMultiConnect">enum NMConnectionMultiConnect</a>
 </dt>
-<dt id="ientry-idm45686039186384">NMConnectivityState, <a class="indexterm" href="nm-dbus-types.html#NMConnectivityState">enum NMConnectivityState</a>
+<dt id="ientry-idm45389932758064">NMConnectivityState, <a class="indexterm" href="nm-dbus-types.html#NMConnectivityState">enum NMConnectivityState</a>
 </dt>
-<dt id="ientry-idm45686039015936">NMDeviceCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceCapabilities">enum NMDeviceCapabilities</a>
+<dt id="ientry-idm45389932587664">NMDeviceCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceCapabilities">enum NMDeviceCapabilities</a>
 </dt>
-<dt id="ientry-idm45686035846000">NMDeviceInterfaceFlags, <a class="indexterm" href="nm-dbus-types.html#NMDeviceInterfaceFlags">enum NMDeviceInterfaceFlags</a>
+<dt id="ientry-idm45389929845584">NMDeviceInterfaceFlags, <a class="indexterm" href="nm-dbus-types.html#NMDeviceInterfaceFlags">enum NMDeviceInterfaceFlags</a>
 </dt>
-<dt id="ientry-idm45686036772800">NMDeviceModemCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceModemCapabilities">enum NMDeviceModemCapabilities</a>
+<dt id="ientry-idm45389930799216">NMDeviceModemCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceModemCapabilities">enum NMDeviceModemCapabilities</a>
 </dt>
-<dt id="ientry-idm45686036721776">NMDeviceState, <a class="indexterm" href="nm-dbus-types.html#NMDeviceState">enum NMDeviceState</a>
+<dt id="ientry-idm45389930747984">NMDeviceState, <a class="indexterm" href="nm-dbus-types.html#NMDeviceState">enum NMDeviceState</a>
 </dt>
-<dt id="ientry-idm45686036663728">NMDeviceStateReason, <a class="indexterm" href="nm-dbus-types.html#NMDeviceStateReason">enum NMDeviceStateReason</a>
+<dt id="ientry-idm45389930689936">NMDeviceStateReason, <a class="indexterm" href="nm-dbus-types.html#NMDeviceStateReason">enum NMDeviceStateReason</a>
 </dt>
-<dt id="ientry-idm45686039156384">NMDeviceType, <a class="indexterm" href="nm-dbus-types.html#NMDeviceType">enum NMDeviceType</a>
+<dt id="ientry-idm45389932728064">NMDeviceType, <a class="indexterm" href="nm-dbus-types.html#NMDeviceType">enum NMDeviceType</a>
 </dt>
-<dt id="ientry-idm45686038985296">NMDeviceWifiCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceWifiCapabilities">enum NMDeviceWifiCapabilities</a>
+<dt id="ientry-idm45389932557024">NMDeviceWifiCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceWifiCapabilities">enum NMDeviceWifiCapabilities</a>
 </dt>
-<dt id="ientry-idm45686036160016">NMIPTunnelMode, <a class="indexterm" href="nm-dbus-types.html#NMIPTunnelMode">enum NMIPTunnelMode</a>
+<dt id="ientry-idm45389930159856">NMIPTunnelMode, <a class="indexterm" href="nm-dbus-types.html#NMIPTunnelMode">enum NMIPTunnelMode</a>
 </dt>
-<dt id="ientry-idm45686035877056">NMManagerReloadFlags, <a class="indexterm" href="nm-dbus-types.html#NMManagerReloadFlags">enum NMManagerReloadFlags</a>
+<dt id="ientry-idm45389929876704">NMManagerReloadFlags, <a class="indexterm" href="nm-dbus-types.html#NMManagerReloadFlags">enum NMManagerReloadFlags</a>
 </dt>
-<dt id="ientry-idm45686036392624">NMMetered, <a class="indexterm" href="nm-dbus-types.html#NMMetered">enum NMMetered</a>
+<dt id="ientry-idm45389930392448">NMMetered, <a class="indexterm" href="nm-dbus-types.html#NMMetered">enum NMMetered</a>
 </dt>
-<dt id="ientry-idm45686036068352">NMRollbackResult, <a class="indexterm" href="nm-dbus-types.html#NMRollbackResult">enum NMRollbackResult</a>
+<dt id="ientry-idm45389930068128">NMRollbackResult, <a class="indexterm" href="nm-dbus-types.html#NMRollbackResult">enum NMRollbackResult</a>
 </dt>
-<dt id="ientry-idm45686036178784">NMSecretAgentCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentCapabilities">enum NMSecretAgentCapabilities</a>
+<dt id="ientry-idm45389930178560">NMSecretAgentCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentCapabilities">enum NMSecretAgentCapabilities</a>
 </dt>
-<dt id="ientry-idm45686036219360">NMSecretAgentGetSecretsFlags, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags">enum NMSecretAgentGetSecretsFlags</a>
+<dt id="ientry-idm45389930219296">NMSecretAgentGetSecretsFlags, <a class="indexterm" href="nm-dbus-types.html#NMSecretAgentGetSecretsFlags">enum NMSecretAgentGetSecretsFlags</a>
 </dt>
-<dt id="ientry-idm45686035970464">NMSettingsAddConnection2Flags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsAddConnection2Flags">enum NMSettingsAddConnection2Flags</a>
+<dt id="ientry-idm45389929970176">NMSettingsAddConnection2Flags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsAddConnection2Flags">enum NMSettingsAddConnection2Flags</a>
 </dt>
-<dt id="ientry-idm45686036041520">NMSettingsConnectionFlags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsConnectionFlags">enum NMSettingsConnectionFlags</a>
+<dt id="ientry-idm45389930041296">NMSettingsConnectionFlags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsConnectionFlags">enum NMSettingsConnectionFlags</a>
 </dt>
-<dt id="ientry-idm45686035943376">NMSettingsUpdate2Flags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsUpdate2Flags">enum NMSettingsUpdate2Flags</a>
+<dt id="ientry-idm45389929943024">NMSettingsUpdate2Flags, <a class="indexterm" href="nm-dbus-types.html#NMSettingsUpdate2Flags">enum NMSettingsUpdate2Flags</a>
 </dt>
-<dt id="ientry-idm45686039574240">NMState, <a class="indexterm" href="nm-dbus-types.html#NMState">enum NMState</a>
+<dt id="ientry-idm45389936497408">NMState, <a class="indexterm" href="nm-dbus-types.html#NMState">enum NMState</a>
 </dt>
-<dt id="ientry-idm45686035899632">NMTernary, <a class="indexterm" href="nm-dbus-types.html#NMTernary">enum NMTernary</a>
+<dt id="ientry-idm45389929899280">NMTernary, <a class="indexterm" href="nm-dbus-types.html#NMTernary">enum NMTernary</a>
 </dt>
-<dt id="ientry-idm45686041816640">NMVpnConnectionState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionState">enum NMVpnConnectionState</a>
+<dt id="ientry-idm45389932991120">NMVpnConnectionState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionState">enum NMVpnConnectionState</a>
 </dt>
-<dt id="ientry-idm45686038416864">NMVpnConnectionStateReason, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionStateReason">enum NMVpnConnectionStateReason</a>
+<dt id="ientry-idm45389931925840">NMVpnConnectionStateReason, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionStateReason">enum NMVpnConnectionStateReason</a>
 </dt>
-<dt id="ientry-idm45686038357872">NMVpnPluginFailure, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnPluginFailure">enum NMVpnPluginFailure</a>
+<dt id="ientry-idm45389931866848">NMVpnPluginFailure, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnPluginFailure">enum NMVpnPluginFailure</a>
 </dt>
-<dt id="ientry-idm45686048720432">NMVpnServiceState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnServiceState">enum NMVpnServiceState</a>
+<dt id="ientry-idm45389947255104">NMVpnServiceState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnServiceState">enum NMVpnServiceState</a>
 </dt>
-<dt id="ientry-idm45686036745040">NMWimaxNspNetworkType, <a class="indexterm" href="nm-dbus-types.html#NMWimaxNspNetworkType">enum NMWimaxNspNetworkType</a>
+<dt id="ientry-idm45389930771248">NMWimaxNspNetworkType, <a class="indexterm" href="nm-dbus-types.html#NMWimaxNspNetworkType">enum NMWimaxNspNetworkType</a>
 </dt>
-<dt id="ientry-idm45686041007040">no-vj-comp, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934103520">no-vj-comp, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041003120">noauth, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934099600">noauth, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040999056">nobsdcomp, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934095536">nobsdcomp, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040995152">nodeflate, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934091632">nodeflate, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040840304">notify-peers-count, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933937488">notify-peers-count, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040836400">notify-peers-interval, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933933584">notify-peers-interval, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686041626032">number, <a class="indexterm" href="settings-cdma.html">cdma</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934731008">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-idm45686043097536">optional, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939052720">optional, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041705776">options, <a class="indexterm" href="settings-bond.html">bond</a>
+<dt id="ientry-idm45389934810752">options, <a class="indexterm" href="settings-bond.html">bond</a>
 </dt>
-<dt id="ientry-idm45686041226720">output-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45389934323600">output-key, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45686040744576">owner, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45389933841824">owner, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>P</h3>
 <dl>
-<dt id="ientry-idm45686041475856">p-key, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
+<dt id="ientry-idm45389934581184">p-key, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
 </dt>
-<dt id="ientry-idm45686043093376">pac-file, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939048560">pac-file, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686040926688">pac-script, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45389934023104">pac-script, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45686040922960">pac-url, <a class="indexterm" href="settings-proxy.html">proxy</a>
+<dt id="ientry-idm45389934019376">pac-url, <a class="indexterm" href="settings-proxy.html">proxy</a>
 </dt>
-<dt id="ientry-idm45686040281136">page, <a class="indexterm" href="settings-wpan.html">wpan</a>
+<dt id="ientry-idm45389933379040">page, <a class="indexterm" href="settings-wpan.html">wpan</a>
 </dt>
-<dt id="ientry-idm45686040345520">pairwise, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933443424">pairwise, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040277168">pan-id, <a class="indexterm" href="settings-wpan.html">wpan</a>
+<dt id="ientry-idm45389933375072">pan-id, <a class="indexterm" href="settings-wpan.html">wpan</a>
 </dt>
-<dt id="ientry-idm45686043155184">parent, <a class="indexterm" href="settings-6lowpan.html">6lowpan</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-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-idm45389939110656">parent, <a class="indexterm" href="settings-6lowpan.html">6lowpan</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-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-idm45686040906304">parity, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45389934002720">parity, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45686043089696">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-idm45389939044880">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-idm45686043086016">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-idm45389939041200">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-idm45686043082368">password-raw, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939037504">password-raw, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043078432">password-raw-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939033568">password-raw-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041644240">path-cost, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45389934749216">path-cost, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
 </dt>
-<dt id="ientry-idm45686041219024">path-mtu-discovery, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
+<dt id="ientry-idm45389934315904">path-mtu-discovery, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>
 </dt>
-<dt id="ientry-idm45686041071664">peer, <a class="indexterm" href="settings-ovs-patch.html">ovs-patch</a>, <a class="indexterm" href="settings-wifi-p2p.html">wifi-p2p</a>
+<dt id="ientry-idm45389934168080">peer, <a class="indexterm" href="settings-ovs-patch.html">ovs-patch</a>, <a class="indexterm" href="settings-wifi-p2p.html">wifi-p2p</a>
 </dt>
-<dt id="ientry-idm45686040476976">peer-routes, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933574656">peer-routes, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686040472752">peers, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933570432">peers, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686043200768">permissions, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939156048">permissions, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040686768">persistent, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45389933784080">persistent, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45686043074784">phase1-auth-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939029872">phase1-auth-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043070592">phase1-fast-provisioning, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939025632">phase1-fast-provisioning, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043066496">phase1-peaplabel, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939021536">phase1-peaplabel, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043062816">phase1-peapver, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939017856">phase1-peapver, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043058752">phase2-altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939013792">phase2-altsubject-matches, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043054768">phase2-auth, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939009808">phase2-auth, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043051088">phase2-autheap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939006128">phase2-autheap, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043047408">phase2-ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389939002048">phase2-ca-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043043728">phase2-ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938998368">phase2-ca-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043039840">phase2-ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938994480">phase2-ca-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043036112">phase2-ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938990752">phase2-ca-path, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043032224">phase2-client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938986864">phase2-client-cert, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043028528">phase2-client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938983168">phase2-client-cert-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043024592">phase2-client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938979232">phase2-client-cert-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043020848">phase2-domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938975488">phase2-domain-suffix-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043017136">phase2-private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938971776">phase2-private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043012352">phase2-private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938966992">phase2-private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043008432">phase2-private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938963072">phase2-private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686043004608">phase2-subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938959248">phase2-subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686040740784">pi, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45389933838032">pi, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
-<dt id="ientry-idm45686043000544">pin, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389938955184">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-idm45686042996864">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-idm45389938951504">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-idm45686040341568">pmf, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933439472">pmf, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686041175472">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-idm45389934272352">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-idm45686040407136">powersave, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933504752">powersave, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686050963616">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-idm45389942669728">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-idm45686042182384">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-idm45389936038672">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-idm45686042160304">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-idm45389935997072">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-idm45686041767552">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-idm45389935895184">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-idm45686041760480">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-idm45389936592640">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-idm45686042132704">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-idm45389936585728">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-idm45686040773152">prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45389933870336">prio, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45686041669712">priority, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45389934774688">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-idm45686041582688">priority-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934687664">priority-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041579008">priority-flow-control, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934683984">priority-flow-control, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041575440">priority-flow-control-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934680416">priority-flow-control-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041571856">priority-group-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934676832">priority-group-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041568224">priority-group-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934673200">priority-group-flags, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041564656">priority-group-id, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934669632">priority-group-id, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041561072">priority-strict-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934666048">priority-strict-bandwidth, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686041557488">priority-traffic-class, <a class="indexterm" href="settings-dcb.html">dcb</a>
+<dt id="ientry-idm45389934662464">priority-traffic-class, <a class="indexterm" href="settings-dcb.html">dcb</a>
 </dt>
-<dt id="ientry-idm45686042993168">private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389938947808">private-key, <a class="indexterm" href="settings-802-1x.html">802-1x</a>, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686040465264">private-key-flags, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
+<dt id="ientry-idm45389933562944">private-key-flags, <a class="indexterm" href="settings-wireguard.html">wireguard</a>
 </dt>
-<dt id="ientry-idm45686042988176">private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938942816">private-key-password, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686042984288">private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938938928">private-key-password-flags, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686041150832">promiscuous, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
+<dt id="ientry-idm45389934247712">promiscuous, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
 </dt>
-<dt id="ientry-idm45686040337152">proto, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933435056">proto, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686041738192">protocol, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45389934843168">protocol, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45686040626640">proxy, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933723952">proxy, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040333248">psk, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933431152">psk, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040329232">psk-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933427136">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-idm45686040872560">qdiscs, <a class="indexterm" href="settings-tc.html">tc</a>
+<dt id="ientry-idm45389933969680">qdiscs, <a class="indexterm" href="settings-tc.html">tc</a>
 </dt>
-<dt id="ientry-idm45686040769248">queue-id, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45389933866432">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-idm45686040402912">rate, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389934380672">ra-timeout, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686043197088">read-only, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389933500528">rate, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686040991248">refuse-chap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389939152368">read-only, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040987328">refuse-eap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934087728">refuse-chap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040983408">refuse-mschap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934083808">refuse-eap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040979488">refuse-mschapv2, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934079888">refuse-mschap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040975568">refuse-pap, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934075968">refuse-mschapv2, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041215120">remote, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389934072048">refuse-pap, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686040971648">require-mppe, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934312000">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-idm45686040967568">require-mppe-128, <a class="indexterm" href="settings-ppp.html">ppp</a>
+<dt id="ientry-idm45389934068128">require-mppe, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041386896">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934064048">require-mppe-128, <a class="indexterm" href="settings-ppp.html">ppp</a>
 </dt>
-<dt id="ientry-idm45686041383536">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934489936">route-data, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041379504">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934486256">route-metric, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041375088">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934481872">route-table, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686040618832">rsc, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389934477104">routes, <a class="indexterm" href="settings-ipv4.html">ipv4</a>, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041101696">rstp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45389933716144">rsc, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040832496">runner, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389934198176">rstp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45686040828672">runner-active, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933929680">runner, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040824768">runner-agg-select-policy, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933925856">runner-active, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040820992">runner-fast-rate, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933921952">runner-agg-select-policy, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040817088">runner-hwaddr-policy, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933918176">runner-fast-rate, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040813344">runner-min-ports, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933914272">runner-hwaddr-policy, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040809440">runner-sys-prio, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933910528">runner-min-ports, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040805536">runner-tx-balancer, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933906624">runner-sys-prio, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040801776">runner-tx-balancer-interval, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933902720">runner-tx-balancer, <a class="indexterm" href="settings-team.html">team</a>
 </dt>
-<dt id="ientry-idm45686040797840">runner-tx-hash, <a class="indexterm" href="settings-team.html">team</a>
+<dt id="ientry-idm45389933898960">runner-tx-balancer-interval, <a class="indexterm" href="settings-team.html">team</a>
+</dt>
+<dt id="ientry-idm45389933895024">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-idm45686040527056">s390-nettype, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933624736">s390-nettype, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686040523216">s390-options, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933620896">s390-options, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686040519088">s390-subchannels, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933616768">s390-subchannels, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686043193056">secondaries, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939148528">secondaries, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040682736">secrets, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45389933780048">secrets, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45686040398800">security, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933496416">security, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686040394864">seen-bssids, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933492480">seen-bssids, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686040902496">send-delay, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45389933998912">send-delay, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45686041171536">send-sci, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45389934268416">send-sci, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45686040947120">service, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
+<dt id="ientry-idm45389934043600">service, <a class="indexterm" href="settings-pppoe.html">pppoe</a>
 </dt>
-<dt id="ientry-idm45686040678736">service-type, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45389933776048">service-type, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45686040273264">short-address, <a class="indexterm" href="settings-wpan.html">wpan</a>
+<dt id="ientry-idm45389933371168">short-address, <a class="indexterm" href="settings-wpan.html">wpan</a>
 </dt>
-<dt id="ientry-idm45686041498016">sim-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934603344">sim-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45686041494400">sim-operator-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
+<dt id="ientry-idm45389934599728">sim-operator-id, <a class="indexterm" href="settings-gsm.html">gsm</a>
 </dt>
-<dt id="ientry-idm45686043189216">slave-type, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939144688">slave-type, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040614928">source-port-max, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933712240">source-port-max, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040610976">source-port-min, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389933708288">source-port-min, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
 </dt>
-<dt id="ientry-idm45686040514976">speed, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933612656">speed, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686041121776">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-idm45389934218256">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-idm45686043185392">stable-id, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939140864">stable-id, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686040765280">sticky, <a class="indexterm" href="settings-team-port.html">team-port</a>
+<dt id="ientry-idm45389933862464">sticky, <a class="indexterm" href="settings-team-port.html">team-port</a>
 </dt>
-<dt id="ientry-idm45686040898576">stopbits, <a class="indexterm" href="settings-serial.html">serial</a>
+<dt id="ientry-idm45389933994992">stopbits, <a class="indexterm" href="settings-serial.html">serial</a>
 </dt>
-<dt id="ientry-idm45686041666064">stp, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934771040">stp, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686041097824">stp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
+<dt id="ientry-idm45389934194304">stp-enable, <a class="indexterm" href="settings-ovs-bridge.html">ovs-bridge</a>
 </dt>
-<dt id="ientry-idm45686042980560">subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938935200">subject-match, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
 </dt>
-<dt id="ientry-idm45686042976544">system-ca-certs, <a class="indexterm" href="settings-802-1x.html">802-1x</a>
+<dt id="ientry-idm45389938931184">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-idm45686041047584">tag, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45389934144000">tag, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45686041146912">tap, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
+<dt id="ientry-idm45389934243792">tap, <a class="indexterm" href="settings-macvlan.html">macvlan</a>
 </dt>
-<dt id="ientry-idm45686040868832">tfilters, <a class="indexterm" href="settings-tc.html">tc</a>
+<dt id="ientry-idm45389933965952">tfilters, <a class="indexterm" href="settings-tc.html">tc</a>
 </dt>
-<dt id="ientry-idm45686040674896">timeout, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45389933772208">timeout, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45686043179760">timestamp, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939135232">timestamp, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
-<dt id="ientry-idm45686041263216">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
+<dt id="ientry-idm45389934360032">token, <a class="indexterm" href="settings-ipv6.html">ipv6</a>
 </dt>
-<dt id="ientry-idm45686041211344">tos, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389934308224">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-idm45686040886000">total-vfs, <a class="indexterm" href="settings-sriov.html">sriov</a>
+<dt id="ientry-idm45389933982416">total-vfs, <a class="indexterm" href="settings-sriov.html">sriov</a>
 </dt>
-<dt id="ientry-idm45686041468560">transport-mode, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
+<dt id="ientry-idm45389934573888">transport-mode, <a class="indexterm" href="settings-infiniband.html">infiniband</a>
 </dt>
-<dt id="ientry-idm45686041207408">ttl, <a class="indexterm" href="settings-ip-tunnel.html">ip-tunnel</a>, <a class="indexterm" href="settings-vxlan.html">vxlan</a>
+<dt id="ientry-idm45389934304288">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-idm45686040387056">tx-power, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933485024">tx-power, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686043175552">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-idm45389939131024">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-idm45686040670768">user-name, <a class="indexterm" href="settings-vpn.html">vpn</a>
+<dt id="ientry-idm45389933768080">user-name, <a class="indexterm" href="settings-vpn.html">vpn</a>
 </dt>
-<dt id="ientry-idm45686041734832">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-idm45389934839808">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-idm45686043171504">uuid, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939126976">uuid, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>V</h3>
 <dl>
-<dt id="ientry-idm45686041167600">validation, <a class="indexterm" href="settings-macsec.html">macsec</a>
+<dt id="ientry-idm45389934264480">validation, <a class="indexterm" href="settings-macsec.html">macsec</a>
 </dt>
-<dt id="ientry-idm45686041731472">vci, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45389934836448">vci, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45686040881872">vfs, <a class="indexterm" href="settings-sriov.html">sriov</a>
+<dt id="ientry-idm45389933978288">vfs, <a class="indexterm" href="settings-sriov.html">sriov</a>
 </dt>
-<dt id="ientry-idm45686041662480">vlan-default-pvid, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934767456">vlan-default-pvid, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686041658880">vlan-filtering, <a class="indexterm" href="settings-bridge.html">bridge</a>
+<dt id="ientry-idm45389934763856">vlan-filtering, <a class="indexterm" href="settings-bridge.html">bridge</a>
 </dt>
-<dt id="ientry-idm45686041043696">vlan-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
+<dt id="ientry-idm45389934140112">vlan-mode, <a class="indexterm" href="settings-ovs-port.html">ovs-port</a>
 </dt>
-<dt id="ientry-idm45686041655392">vlans, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
+<dt id="ientry-idm45389934760368">vlans, <a class="indexterm" href="settings-bridge.html">bridge</a>, <a class="indexterm" href="settings-bridge-port.html">bridge-port</a>
 </dt>
-<dt id="ientry-idm45686040736832">vnet-hdr, <a class="indexterm" href="settings-tun.html">tun</a>
+<dt id="ientry-idm45389933834080">vnet-hdr, <a class="indexterm" href="settings-tun.html">tun</a>
 </dt>
-<dt id="ientry-idm45686041727984">vpi, <a class="indexterm" href="settings-adsl.html">adsl</a>
+<dt id="ientry-idm45389934832960">vpi, <a class="indexterm" href="settings-adsl.html">adsl</a>
 </dt>
-<dt id="ientry-idm45686052738400">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-idm45389942604144">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-idm45686039838512">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-idm45389935962704">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-idm45686041950368">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-idm45389936433520">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-idm45686040134352">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-idm45389936397184">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-idm45686040139248">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-idm45389936402032">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-idm45686052687088">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-idm45389944467920">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-idm45686038935072">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-idm45389932263712">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-idm45686039544720">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-idm45389933226256">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-idm45686038826112">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-idm45389933090032">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-idm45686039534416">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-idm45389933216208">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-idm45686038792000">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-idm45389933055824">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-idm45686038822000">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-idm45389933085920">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-idm45686038799456">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-idm45389933063280">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-idm45686038814592">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-idm45389933078464">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-idm45686038807040">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-idm45389933070864">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-idm45686038764256">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-idm45389932204704">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-idm45686038734272">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-idm45389932174720">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-idm45686038756720">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-idm45389932197168">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-idm45686038749280">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-idm45389932189728">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-idm45686038741824">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-idm45389932182272">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-idm45686038774608">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-idm45389932215056">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-idm45686038782800">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-idm45389932223248">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-idm45686038724192">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-idm45389932164640">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-idm45686043167248">wait-device-timeout, <a class="indexterm" href="settings-connection.html">connection</a>
+<dt id="ientry-idm45389939122720">wait-device-timeout, <a class="indexterm" href="settings-connection.html">connection</a>
+</dt>
+<dt id="ientry-idm45389933608064">wake-on-lan, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686040510384">wake-on-lan, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933603648">wake-on-lan-password, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
 </dt>
-<dt id="ientry-idm45686040505968">wake-on-lan-password, <a class="indexterm" href="settings-802-3-ethernet.html">802-3-ethernet</a>
+<dt id="ientry-idm45389933480960">wake-on-wlan, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
 </dt>
-<dt id="ientry-idm45686040382992">wake-on-wlan, <a class="indexterm" href="settings-802-11-wireless.html">802-11-wireless</a>
+<dt id="ientry-idm45389933423424">wep-key-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040325520">wep-key-flags, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933419600">wep-key-type, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040321696">wep-key-type, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933415520">wep-key0, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040317616">wep-key0, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933411664">wep-key1, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040313760">wep-key1, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933407808">wep-key2, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040309904">wep-key2, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933403952">wep-key3, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040306048">wep-key3, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933400096">wep-tx-keyidx, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
 </dt>
-<dt id="ientry-idm45686040302192">wep-tx-keyidx, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933687776">wfd-ies, <a class="indexterm" href="settings-wifi-p2p.html">wifi-p2p</a>
 </dt>
-<dt id="ientry-idm45686040590464">wfd-ies, <a class="indexterm" href="settings-wifi-p2p.html">wifi-p2p</a>
+<dt id="ientry-idm45389945165856">org.freedesktop.NetworkManager.WifiP2PPeer, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-interface-org-freedesktop-NetworkManager-WifiP2PPeer.top_of_page">org.freedesktop.NetworkManager.WifiP2PPeer</a>
 </dt>
-<dt id="ientry-idm45686053582512">org.freedesktop.NetworkManager.WifiP2PPeer, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-interface-org-freedesktop-NetworkManager-WifiP2PPeer.top_of_page">org.freedesktop.NetworkManager.WifiP2PPeer</a>
+<dt id="ientry-idm45389935511600">org.freedesktop.NetworkManager.WifiP2PPeer:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Flags">The "Flags" property</a>
 </dt>
-<dt id="ientry-idm45686041892800">org.freedesktop.NetworkManager.WifiP2PPeer:Flags, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Flags">The "Flags" property</a>
+<dt id="ientry-idm45389936626144">org.freedesktop.NetworkManager.WifiP2PPeer:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.HwAddress">The "HwAddress" property</a>
 </dt>
-<dt id="ientry-idm45686039595232">org.freedesktop.NetworkManager.WifiP2PPeer:HwAddress, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.HwAddress">The "HwAddress" property</a>
+<dt id="ientry-idm45389933316624">org.freedesktop.NetworkManager.WifiP2PPeer:LastSeen, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.LastSeen">The "LastSeen" property</a>
 </dt>
-<dt id="ientry-idm45686041870224">org.freedesktop.NetworkManager.WifiP2PPeer:LastSeen, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.LastSeen">The "LastSeen" property</a>
+<dt id="ientry-idm45389938126528">org.freedesktop.NetworkManager.WifiP2PPeer:Manufacturer, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Manufacturer">The "Manufacturer" property</a>
 </dt>
-<dt id="ientry-idm45686041887344">org.freedesktop.NetworkManager.WifiP2PPeer:Manufacturer, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Manufacturer">The "Manufacturer" property</a>
+<dt id="ientry-idm45389938092096">org.freedesktop.NetworkManager.WifiP2PPeer:Model, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Model">The "Model" property</a>
 </dt>
-<dt id="ientry-idm45686039739952">org.freedesktop.NetworkManager.WifiP2PPeer:Model, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Model">The "Model" property</a>
+<dt id="ientry-idm45389936578352">org.freedesktop.NetworkManager.WifiP2PPeer:ModelNumber, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.ModelNumber">The "ModelNumber" property</a>
 </dt>
-<dt id="ientry-idm45686039735584">org.freedesktop.NetworkManager.WifiP2PPeer:ModelNumber, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.ModelNumber">The "ModelNumber" property</a>
+<dt id="ientry-idm45389936721952">org.freedesktop.NetworkManager.WifiP2PPeer:Name, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Name">The "Name" property</a>
 </dt>
-<dt id="ientry-idm45686039604080">org.freedesktop.NetworkManager.WifiP2PPeer:Serial, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Serial">The "Serial" property</a>
+<dt id="ientry-idm45389935469280">org.freedesktop.NetworkManager.WifiP2PPeer:Serial, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Serial">The "Serial" property</a>
 </dt>
-<dt id="ientry-idm45686039590784">org.freedesktop.NetworkManager.WifiP2PPeer:Strength, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Strength">The "Strength" property</a>
+<dt id="ientry-idm45389936463792">org.freedesktop.NetworkManager.WifiP2PPeer:Strength, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.Strength">The "Strength" property</a>
 </dt>
-<dt id="ientry-idm45686039599680">org.freedesktop.NetworkManager.WifiP2PPeer:WfdIEs, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.WfdIEs">The "WfdIEs" property</a>
+<dt id="ientry-idm45389936713632">org.freedesktop.NetworkManager.WifiP2PPeer:WfdIEs, <a class="indexterm" href="gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html#gdbus-property-org-freedesktop-NetworkManager-WifiP2PPeer.WfdIEs">The "WfdIEs" property</a>
 </dt>
-<dt id="ientry-idm45686040586464">wps-method, <a class="indexterm" href="settings-wifi-p2p.html">wifi-p2p</a>, <a class="indexterm" href="settings-802-11-wireless-security.html">802-11-wireless-security</a>
+<dt id="ientry-idm45389933683776">wps-method, <a class="indexterm" href="settings-wifi-p2p.html">wifi-p2p</a>, <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-idm45686043163408">zone, <a class="indexterm" href="settings-connection.html">connection</a>
+<dl><dt id="ientry-idm45389939118880">zone, <a class="indexterm" href="settings-connection.html">connection</a>
 </dt></dl>
 </div>
 </div>
diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
index 6a27ae19..d980f298 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -2995,7 +2995,7 @@
 <hr>
 <div class="refsect2">
 <a name="NMMetered"></a><h3>enum NMMetered</h3>
-<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#NMDevice-struct">NMDevice</a> at a given moment.</p>
+<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.</p>
 <p>For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.</p>
 <p>The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.</p>
 <p>Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.</p>
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 8921a324..8bc1a6f5 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -1411,6 +1411,15 @@ Example: </strong></span>IPV6_DEFAULTGW=abbe::1</td>
 <td align="left">Hostname to send the DHCP server.</td>
 </tr>
 <tr>
+<td align="left">dhcp-timeout</td>
+<td align="left">IPV6_DHCP_TIMEOUT<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">A timeout after which the DHCP transaction fails in case of no response.<span class="bold"><strong>
+
+Example: </strong></span>IPV6_DHCP_TIMEOUT=10</td>
+</tr>
+<tr>
 <td align="left">never-default</td>
 <td align="left">IPV6_DEFROUTE<span class="emphasis"><em>(+)</em></span>, (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)</td>
 <td align="left">IPV6_DEFROUTE=yes (when no variable specified)</td>
@@ -1487,6 +1496,15 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 Example: </strong></span>IPV6_TOKEN=::53</td>
 </tr>
 <tr>
+<td align="left">dhcp-timeout</td>
+<td align="left">IPV6_RA_TIMEOUT<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">A timeout for waiting Router Advertisements in seconds.<span class="bold"><strong>
+
+Example: </strong></span>IPV6_RA_TIMEOUT=10</td>
+</tr>
+<tr>
 <td align="left">dhcp-duid</td>
 <td align="left">DHCPV6_DUID<span class="emphasis"><em>(+)</em></span>
 </td>
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 0dfdd5dc..79cdd09a 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -178,7 +178,7 @@
 <a name="nm-settings.property.connection.llmnr"></a>llmnr</td>
 <td align="left">int32</td>
 <td align="left">-1</td>
-<td>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.</td>
+<td>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</td>
 </tr>
 <tr>
 <td align="left">
@@ -192,7 +192,7 @@
 <a name="nm-settings.property.connection.mdns"></a>mdns</td>
 <td align="left">int32</td>
 <td align="left">-1</td>
-<td>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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.</td>
+<td>Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1447,7 +1447,7 @@
 <a name="nm-settings.property.ipv4.dhcp-timeout"></a>dhcp-timeout</td>
 <td align="left">int32</td>
 <td align="left">0</td>
-<td>A timeout for a DHCP transaction in seconds.</td>
+<td>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1468,7 +1468,7 @@
 <a name="nm-settings.property.ipv4.dns-priority"></a>dns-priority</td>
 <td align="left">int32</td>
 <td align="left">0</td>
-<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</td>
+<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1636,7 +1636,7 @@
 <a name="nm-settings.property.ipv6.dhcp-timeout"></a>dhcp-timeout</td>
 <td align="left">int32</td>
 <td align="left">0</td>
-<td>A timeout for a DHCP transaction in seconds.</td>
+<td>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1657,7 +1657,7 @@
 <a name="nm-settings.property.ipv6.dns-priority"></a>dns-priority</td>
 <td align="left">int32</td>
 <td align="left">0</td>
-<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</td>
+<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</td>
 </tr>
 <tr>
 <td align="left">
@@ -1717,6 +1717,13 @@
 </tr>
 <tr>
 <td align="left">
+<a name="nm-settings.property.ipv6.ra-timeout"></a>ra-timeout</td>
+<td align="left">int32</td>
+<td align="left">0</td>
+<td>A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.</td>
+</tr>
+<tr>
+<td align="left">
 <a name="nm-settings.property.ipv6.route-data"></a>route-data</td>
 <td align="left">array of vardict</td>
 <td align="left"> </td>
diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html
index 2963eeac..94b7b590 100644
--- a/docs/api/html/settings-connection.html
+++ b/docs/api/html/settings-connection.html
@@ -111,7 +111,7 @@
 <td><pre class="screen">llmnr</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">-1</pre></td>
-<td>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.</td>
+<td>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</td>
 </tr>
 <tr>
 <td><pre class="screen">master</pre></td>
@@ -123,7 +123,7 @@
 <td><pre class="screen">mdns</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">-1</pre></td>
-<td>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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.</td>
+<td>Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</td>
 </tr>
 <tr>
 <td><pre class="screen">metered</pre></td>
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html
index 81fd918d..f3440d3a 100644
--- a/docs/api/html/settings-ipv4.html
+++ b/docs/api/html/settings-ipv4.html
@@ -111,7 +111,7 @@
 <td><pre class="screen">dhcp-timeout</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>A timeout for a DHCP transaction in seconds.</td>
+<td>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</td>
 </tr>
 <tr>
 <td><pre class="screen">dns</pre></td>
@@ -129,7 +129,7 @@
 <td><pre class="screen">dns-priority</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</td>
+<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</td>
 </tr>
 <tr>
 <td><pre class="screen">dns-search</pre></td>
diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html
index 8dda5170..a5282705 100644
--- a/docs/api/html/settings-ipv6.html
+++ b/docs/api/html/settings-ipv6.html
@@ -111,7 +111,7 @@
 <td><pre class="screen">dhcp-timeout</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>A timeout for a DHCP transaction in seconds.</td>
+<td>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</td>
 </tr>
 <tr>
 <td><pre class="screen">dns</pre></td>
@@ -129,7 +129,7 @@
 <td><pre class="screen">dns-priority</pre></td>
 <td><pre class="screen">int32</pre></td>
 <td><pre class="screen">0</pre></td>
-<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</td>
+<td>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</td>
 </tr>
 <tr>
 <td><pre class="screen">dns-search</pre></td>
@@ -180,6 +180,12 @@
 <td>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.</td>
 </tr>
 <tr>
+<td><pre class="screen">ra-timeout</pre></td>
+<td><pre class="screen">int32</pre></td>
+<td><pre class="screen">0</pre></td>
+<td>A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.</td>
+</tr>
+<tr>
 <td><pre class="screen">route-data</pre></td>
 <td><pre class="screen">array of vardict</pre></td>
 <td><pre class="screen"></pre></td>
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index ce9cc069..743e5a81 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -13,9 +13,9 @@
     <row><entry><screen>id<indexterm zone="settings-connection"><primary sortas="id">id</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".</entry></row>
     <row><entry><screen>interface-name<indexterm zone="settings-connection"><primary sortas="interface-name">interface-name</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>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 (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.</entry></row>
     <row><entry><screen>lldp<indexterm zone="settings-connection"><primary sortas="lldp">lldp</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Whether LLDP is enabled for the connection.</entry></row>
-    <row><entry><screen>llmnr<indexterm zone="settings-connection"><primary sortas="llmnr">llmnr</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.</entry></row>
+    <row><entry><screen>llmnr<indexterm zone="settings-connection"><primary sortas="llmnr">llmnr</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</entry></row>
     <row><entry><screen>master<indexterm zone="settings-connection"><primary sortas="master">master</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>Interface name of the master device or UUID of the master connection.</entry></row>
-    <row><entry><screen>mdns<indexterm zone="settings-connection"><primary sortas="mdns">mdns</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.</entry></row>
+    <row><entry><screen>mdns<indexterm zone="settings-connection"><primary sortas="mdns">mdns</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>-1</screen></entry><entry>Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</entry></row>
     <row><entry><screen>metered<indexterm zone="settings-connection"><primary sortas="metered">metered</primary></indexterm></screen></entry><entry><screen>NMMetered (int32)</screen></entry><entry><screen/></entry><entry>Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.</entry></row>
     <row><entry><screen>multi-connect<indexterm zone="settings-connection"><primary sortas="multi-connect">multi-connect</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.</entry></row>
     <row><entry><screen>permissions<indexterm zone="settings-connection"><primary sortas="permissions">permissions</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry>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 connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.</entry></row>
@@ -210,10 +210,10 @@
     <row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv4"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry>Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.</entry></row>
     <row><entry><screen>dhcp-iaid<indexterm zone="settings-ipv4"><primary sortas="dhcp-iaid">dhcp-iaid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</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>
-    <row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv4"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for a DHCP transaction in seconds.</entry></row>
+    <row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv4"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</entry></row>
     <row><entry><screen>dns<indexterm zone="settings-ipv4"><primary sortas="dns">dns</primary></indexterm></screen></entry><entry><screen>array of uint32</screen></entry><entry><screen/></entry><entry>Array of IP addresses of DNS servers (as network-byte-order integers)</entry></row>
     <row><entry><screen>dns-options<indexterm zone="settings-ipv4"><primary sortas="dns-options">dns-options</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry>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 use default options. This is distinct from an empty list of properties.</entry></row>
-    <row><entry><screen>dns-priority<indexterm zone="settings-ipv4"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</entry></row>
+    <row><entry><screen>dns-priority<indexterm zone="settings-ipv4"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</entry></row>
     <row><entry><screen>dns-search<indexterm zone="settings-ipv4"><primary sortas="dns-search">dns-search</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry>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.</entry></row>
     <row><entry><screen>gateway<indexterm zone="settings-ipv4"><primary sortas="gateway">gateway</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry><screen>ignore-auto-dns<indexterm zone="settings-ipv4"><primary sortas="ignore-auto-dns">ignore-auto-dns</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
@@ -238,10 +238,10 @@
     <row><entry><screen>dhcp-hostname-flags<indexterm zone="settings-ipv6"><primary sortas="dhcp-hostname-flags">dhcp-hostname-flags</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry>Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.</entry></row>
     <row><entry><screen>dhcp-iaid<indexterm zone="settings-ipv6"><primary sortas="dhcp-iaid">dhcp-iaid</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</entry></row>
     <row><entry><screen>dhcp-send-hostname<indexterm zone="settings-ipv6"><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>
-    <row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv6"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for a DHCP transaction in seconds.</entry></row>
+    <row><entry><screen>dhcp-timeout<indexterm zone="settings-ipv6"><primary sortas="dhcp-timeout">dhcp-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</entry></row>
     <row><entry><screen>dns<indexterm zone="settings-ipv6"><primary sortas="dns">dns</primary></indexterm></screen></entry><entry><screen>array of byte array</screen></entry><entry><screen/></entry><entry>Array of IP addresses of DNS servers (in network byte order)</entry></row>
     <row><entry><screen>dns-options<indexterm zone="settings-ipv6"><primary sortas="dns-options">dns-options</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry>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 use default options. This is distinct from an empty list of properties.</entry></row>
-    <row><entry><screen>dns-priority<indexterm zone="settings-ipv6"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</entry></row>
+    <row><entry><screen>dns-priority<indexterm zone="settings-ipv6"><primary sortas="dns-priority">dns-priority</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</entry></row>
     <row><entry><screen>dns-search<indexterm zone="settings-ipv6"><primary sortas="dns-search">dns-search</primary></indexterm></screen></entry><entry><screen>array of string</screen></entry><entry><screen/></entry><entry>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.</entry></row>
     <row><entry><screen>gateway<indexterm zone="settings-ipv6"><primary sortas="gateway">gateway</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry><screen>ignore-auto-dns<indexterm zone="settings-ipv6"><primary sortas="ignore-auto-dns">ignore-auto-dns</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
@@ -250,6 +250,7 @@
     <row><entry><screen>may-fail<indexterm zone="settings-ipv6"><primary sortas="may-fail">may-fail</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</entry></row>
     <row><entry><screen>method<indexterm zone="settings-ipv6"><primary sortas="method">method</primary></indexterm></screen></entry><entry><screen>string</screen></entry><entry><screen/></entry><entry>IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.</entry></row>
     <row><entry><screen>never-default<indexterm zone="settings-ipv6"><primary sortas="never-default">never-default</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>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.</entry></row>
+    <row><entry><screen>ra-timeout<indexterm zone="settings-ipv6"><primary sortas="ra-timeout">ra-timeout</primary></indexterm></screen></entry><entry><screen>int32</screen></entry><entry><screen>0</screen></entry><entry>A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.</entry></row>
     <row><entry><screen>route-data<indexterm zone="settings-ipv6"><primary sortas="route-data">route-data</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen/></entry><entry>Array of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.</entry></row>
     <row><entry><screen>route-metric<indexterm zone="settings-ipv6"><primary sortas="route-metric">route-metric</primary></indexterm></screen></entry><entry><screen>int64</screen></entry><entry><screen>-1</screen></entry><entry>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 device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.</entry></row>
     <row><entry><screen>route-table<indexterm zone="settings-ipv6"><primary sortas="route-table">route-table</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>0</screen></entry><entry>Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</entry></row>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 2a0ba77c..229a27c6 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.22.4
+1.22.8
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 6e43e916..195132f0 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -402,7 +402,7 @@ by the connection, and must not be modified.</p>
 <a name="nm-active-connection-get-devices"></a><h3>nm_active_connection_get_devices ()</h3>
 <pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *
 nm_active_connection_get_devices (<em class="parameter"><code><a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> *connection</code></em>);</pre>
-<p>Gets the <a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> used for the active connections.</p>
+<p>Gets the <span class="type">NMDevices</span> used for the active connections.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-devices.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -420,7 +420,7 @@ nm_active_connection_get_devices (<em class="parameter"><code><a class="link" hr
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-devices.returns"></a><h4>Returns</h4>
-<p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing <a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a>.
+<p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing <span class="type">NMDevices</span>.
 This is the internal copy used by the connection, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
 </div>
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 4135defd..7a06059a 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -2463,7 +2463,7 @@ methods such as <a class="link" href="NMDeviceEthernet.html#nm-device-ethernet-g
 <div class="refsect3">
 <a name="nm-client-get-devices.returns"></a><h4>Returns</h4>
 <p>a <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>
-containing all the <a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a>.  The returned array is owned by the
+containing all the <span class="type">NMDevices</span>.  The returned array is owned by the
 <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> object and should not be modified. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
 </div>
@@ -2499,7 +2499,7 @@ use device-specific methods such as <a class="link" href="NMDeviceEthernet.html#
 <div class="refsect3">
 <a name="nm-client-get-all-devices.returns"></a><h4>Returns</h4>
 <p>a <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>
-containing all the <a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a>.  The returned array is owned by the
+containing all the <span class="type">NMDevices</span>.  The returned array is owned by the
 <a class="link" href="NMClient.html" title="NMClient"><span class="type">NMClient</span></a> object and should not be modified. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
 </div>
@@ -2601,7 +2601,7 @@ nm_client_get_active_connections (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="nm-client-get-active-connections.returns"></a><h4>Returns</h4>
 <p>a <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>
-containing all the active <a href="NMActiveConnection.html#NMActiveConnection-struct"><span class="type">NMActiveConnections</span></a>.
+containing all the active <span class="type">NMActiveConnections</span>.
 The returned array is owned by the client and should not be modified. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMActiveConnection]</span></p>
 </div>
@@ -2649,7 +2649,7 @@ any. </p>
 nm_client_get_activating_connection (<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 <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> corresponding to a
 currently-activating connection that is expected to become the new
-<a href="NMClient.html#NMClient--primary-connection"><span class="type">“primary-connection�</span></a> upon successful activation.</p>
+<span class="type">“primary-connection�</span> upon successful activation.</p>
 <div class="refsect3">
 <a name="nm-client-get-activating-connection.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -2699,7 +2699,7 @@ in <em class="parameter"><code>connection</code></em>
 picks the best available connection for the device and activates it.</p>
 <p>Note that the callback is invoked when NetworkManager has started activating
 the new connection, not when it finishes. You can use the returned
-<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a href="NMActiveConnection.html#NMActiveConnection--state"><span class="type">“state�</span></a>) to
+<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <span class="type">“state�</span>) to
 track the activation to its completion.</p>
 <div class="refsect3">
 <a name="nm-client-activate-connection-async.parameters"></a><h4>Parameters</h4>
@@ -2819,7 +2819,7 @@ activated as with <a class="link" href="NMClient.html#nm-client-activate-connect
 VPN connections at this time.</p>
 <p>Note that the callback is invoked when NetworkManager has started activating
 the new connection, not when it finishes. You can used the returned
-<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a href="NMActiveConnection.html#NMActiveConnection--state"><span class="type">“state�</span></a>) to
+<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <span class="type">“state�</span>) to
 track the activation to its completion.</p>
 <div class="refsect3">
 <a name="nm-client-add-and-activate-connection-async.parameters"></a><h4>Parameters</h4>
@@ -2948,7 +2948,7 @@ activated as with <a class="link" href="NMClient.html#nm-client-activate-connect
 VPN connections at this time.</p>
 <p>Note that the callback is invoked when NetworkManager has started activating
 the new connection, not when it finishes. You can used the returned
-<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <a href="NMActiveConnection.html#NMActiveConnection--state"><span class="type">“state�</span></a>) to
+<a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a> object (in particular, <span class="type">“state�</span>) to
 track the activation to its completion.</p>
 <p>This is identitcal to <a class="link" href="NMClient.html#nm-client-add-and-activate-connection-async" title="nm_client_add_and_activate_connection_async ()"><code class="function">nm_client_add_and_activate_connection_async()</code></a> but takes
 a further <em class="parameter"><code>options</code></em>
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 2ae56a87..b6d0f9c5 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -1345,7 +1345,7 @@ not part of an active connection. </p>
 <a name="nm-device-get-available-connections"></a><h3>nm_device_get_available_connections ()</h3>
 <pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="returnvalue">GPtrArray</span></a> *
 nm_device_get_available_connections (<em class="parameter"><code><a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *device</code></em>);</pre>
-<p>Gets the <a href="NMRemoteConnection.html#NMRemoteConnection-struct"><span class="type">NMRemoteConnections</span></a> currently known to the daemon that could
+<p>Gets the <span class="type">NMRemoteConnections</span> currently known to the daemon that could
 be activated on <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
@@ -1366,7 +1366,7 @@ be activated on <em class="parameter"><code>device</code></em>
 <div class="refsect3">
 <a name="nm-device-get-available-connections.returns"></a><h4>Returns</h4>
 <p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a>
-containing <a href="NMRemoteConnection.html#NMRemoteConnection-struct"><span class="type">NMRemoteConnections</span></a>. This is the internal copy used by
+containing <span class="type">NMRemoteConnections</span>. This is the internal copy used by
 the connection, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMRemoteConnection]</span></p>
 </div>
@@ -1378,7 +1378,7 @@ the connection, and must not be modified. </p>
 nm_device_get_physical_port_id (<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 physical port ID of the <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a>. If non-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, this is
 an opaque string that can be used to recognize when
-seemingly-unrelated <a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> are actually just different virtual
+seemingly-unrelated <span class="type">NMDevices</span> are actually just different virtual
 ports on a single physical port. (Eg, NPAR / SR-IOV.)</p>
 <div class="refsect3">
 <a name="nm-device-get-physical-port-id.parameters"></a><h4>Parameters</h4>
@@ -1452,7 +1452,7 @@ nm_device_is_real (<em class="parameter"><code><a class="link" href="NMDevice.ht
 <a name="nm-device-is-real.returns"></a><h4>Returns</h4>
 <p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device exists, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is a placeholder device
 that could be automatically created by NetworkManager if one of its
-<a href="NMDevice.html#NMDevice--available-connections"><span class="type">“available-connections�</span></a> was activated.</p>
+<span class="type">“available-connections�</span> was activated.</p>
 </div>
 <p class="since">Since: 1.2</p>
 </div>
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index a2b16f14..7bd7b1db 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -169,7 +169,7 @@ nm_device_bond_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="nm-device-bond-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
-<a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index dadf1c8d..67bb6aed 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -169,7 +169,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="nm-device-bridge-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
-<a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html
index 60a2cfe3..031f25c6 100644
--- a/docs/libnm/html/NMDeviceOvsBridge.html
+++ b/docs/libnm/html/NMDeviceOvsBridge.html
@@ -89,7 +89,7 @@ nm_device_ovs_bridge_get_slaves (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="nm-device-ovs-bridge-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
-<a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html
index 01ff2196..37570652 100644
--- a/docs/libnm/html/NMDeviceOvsPort.html
+++ b/docs/libnm/html/NMDeviceOvsPort.html
@@ -89,7 +89,7 @@ nm_device_ovs_port_get_slaves (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="nm-device-ovs-port-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
-<a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index c6a38139..e343f053 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -180,7 +180,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="nm-device-team-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
-<a href="NMDevice.html#NMDevice-struct"><span class="type">NMDevices</span></a> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index c6990839..f4bc9913 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -419,7 +419,7 @@ nm_device_wifi_get_access_points (<em class="parameter"><code><a class="link" hr
 <div class="refsect3">
 <a name="nm-device-wifi-get-access-points.returns"></a><h4>Returns</h4>
 <p>a <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing all the
-scanned <a href="NMAccessPoint.html#NMAccessPoint-struct"><span class="type">NMAccessPoints</span></a>.
+scanned <span class="type">NMAccessPoints</span>.
 The returned array is owned by the client and should not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMAccessPoint]</span></p>
 </div>
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index 4b61bd34..57326e3b 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -287,7 +287,7 @@ nm_device_wimax_get_nsps (<em class="parameter"><code><a class="link" href="NMDe
 <div class="refsect3">
 <a name="nm-device-wimax-get-nsps.returns"></a><h4>Returns</h4>
 <p>a <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing
-all the scanned <a href="NMWimaxNsp.html#NMWimaxNsp-struct"><span class="type">NMWimaxNsps</span></a>.
+all the scanned <span class="type">NMWimaxNsps</span>.
 The returned array is owned by the client and should not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMWimaxNsp]</span></p>
 </div>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index f9c862eb..ee8a6c6b 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -2147,11 +2147,13 @@ connection may be applied to the wrong interface.</p>
 for the connection. LLMNR is a protocol based on the Domain Name
 System (DNS) packet format that allows both IPv4 and IPv6 hosts
 to perform name resolution for hosts on the same local link.</p>
-<p>The permitted values are: yes: register hostname and resolving
-for the connection, no: disable LLMNR for the interface, resolve:
-do not register hostname but allow resolving of LLMNR host names.</p>
-<p>This feature requires a plugin which supports LLMNR. One such
-plugin is dns-systemd-resolved.</p>
+<p>The permitted values are: "yes" (2) register hostname and resolving
+for the connection, "no" (0) disable LLMNR for the interface, "resolve"
+(1) do not register hostname but allow resolving of LLMNR host names
+If unspecified, "default" ultimately depends on the DNS plugin (which
+for systemd-resolved currently means "yes").</p>
+<p>This feature requires a plugin which supports LLMNR. Otherwise the
+setting has no effect. One such plugin is dns-systemd-resolved.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: -1</p>
 <p class="since">Since: 1.14</p>
@@ -2169,11 +2171,14 @@ plugin is dns-systemd-resolved.</p>
 <a name="NMSettingConnection--mdns"></a><h3>The <code class="literal">“mdns�</code> property</h3>
 <pre class="programlisting">  “mdns�                     <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
 <p>Whether mDNS is enabled for the connection.</p>
-<p>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.</p>
-<p>This feature requires a plugin which supports mDNS. One such
-plugin is dns-systemd-resolved.</p>
+<p>The permitted values are: "yes" (2) register hostname and resolving
+for the connection, "no" (0) disable mDNS for the interface, "resolve"
+(1) do not register hostname but allow resolving of mDNS host names
+and "default" (-1) to allow lookup of a global default in NetworkManager.conf.
+If unspecified, "default" ultimately depends on the DNS plugin (which
+for systemd-resolved currently means "no").</p>
+<p>This feature requires a plugin which supports mDNS. Otherwise the
+setting has no effect. One such plugin is dns-systemd-resolved.</p>
 <p>Flags: Read / Write</p>
 <p>Default value: -1</p>
 <p class="since">Since: 1.12</p>
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 2cdd15c6..fc74885c 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -79,6 +79,14 @@
 <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-dhcp-duid" title="nm_setting_ip6_config_get_dhcp_duid ()">nm_setting_ip6_config_get_dhcp_duid</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
+<tr>
+<td class="function_type">
+<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="returnvalue">gint32</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-ra-timeout" title="nm_setting_ip6_config_get_ra_timeout ()">nm_setting_ip6_config_get_ra_timeout</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -108,6 +116,11 @@
 <td class="property_flags">Read / Write / Construct</td>
 </tr>
 <tr>
+<td class="property_type"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
+<td class="property_name"><a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--ra-timeout" title="The “ra-timeout� property">ra-timeout</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
+<tr>
 <td class="property_type">
 <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</td>
 <td class="property_name"><a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--token" title="The “token� property">token</a></td>
@@ -146,6 +159,10 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-RA-TIMEOUT:CAPS" title="NM_SETTING_IP6_CONFIG_RA_TIMEOUT">NM_SETTING_IP6_CONFIG_RA_TIMEOUT</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-IGNORE:CAPS" title="NM_SETTING_IP6_CONFIG_METHOD_IGNORE">NM_SETTING_IP6_CONFIG_METHOD_IGNORE</a></td>
 </tr>
 <tr>
@@ -342,6 +359,33 @@ sent to the DHCPv6 servers.</p>
 </div>
 <p class="since">Since: 1.12</p>
 </div>
+<hr>
+<div class="refsect2">
+<a name="nm-setting-ip6-config-get-ra-timeout"></a><h3>nm_setting_ip6_config_get_ra_timeout ()</h3>
+<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="returnvalue">gint32</span></a>
+nm_setting_ip6_config_get_ra_timeout (<em class="parameter"><code><a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a> *setting</code></em>);</pre>
+<div class="refsect3">
+<a name="nm-setting-ip6-config-get-ra-timeout.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>setting</p></td>
+<td class="parameter_description"><p>the <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config"><span class="type">NMSettingIP6Config</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="nm-setting-ip6-config-get-ra-timeout.returns"></a><h4>Returns</h4>
+<p> The configured <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-RA-TIMEOUT:CAPS" title="NM_SETTING_IP6_CONFIG_RA_TIMEOUT"><code class="literal">NM_SETTING_IP6_CONFIG_RA_TIMEOUT</code></a> value with the
+timeout for router advertisements in seconds.</p>
+</div>
+<p class="since">Since: 1.24, 1.22.8</p>
+</div>
 </div>
 <div class="refsect1">
 <a name="NMSettingIP6Config.other_details"></a><h2>Types and Values</h2>
@@ -376,6 +420,12 @@ sent to the DHCPv6 servers.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-SETTING-IP6-CONFIG-RA-TIMEOUT:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_RA_TIMEOUT</h3>
+<pre class="programlisting">#define NM_SETTING_IP6_CONFIG_RA_TIMEOUT "ra-timeout"
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NM-SETTING-IP6-CONFIG-METHOD-IGNORE:CAPS"></a><h3>NM_SETTING_IP6_CONFIG_METHOD_IGNORE</h3>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 </pre>
@@ -615,6 +665,19 @@ setting as another way of avoiding host tracking with IPv6 addresses.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingIP6Config--ra-timeout"></a><h3>The <code class="literal">“ra-timeout�</code> property</h3>
+<pre class="programlisting">  “ra-timeout�               <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
+<p>A timeout for waiting Router Advertisements in seconds. If zero (the default), a
+globally configured default is used. If still unspecified, the timeout depends on the
+sysctl settings of the device.</p>
+<p>Set to 2147483647 (MAXINT32) for infinity.</p>
+<p>Flags: Read / Write</p>
+<p>Allowed values: &gt;= 0</p>
+<p>Default value: 0</p>
+<p class="since">Since: 1.24, 1.22.8</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingIP6Config--token"></a><h3>The <code class="literal">“token�</code> property</h3>
 <pre class="programlisting">  “token�                    <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *</pre>
 <p>Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index c7f19f28..32891026 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -6472,7 +6472,10 @@ providing a static hostname for the computer.  If the
 <div class="refsect2">
 <a name="NMSettingIPConfig--dhcp-timeout"></a><h3>The <code class="literal">“dhcp-timeout�</code> property</h3>
 <pre class="programlisting">  “dhcp-timeout�             <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>A timeout for a DHCP transaction in seconds.</p>
+<p>A timeout for a DHCP transaction in seconds. If zero (the default), a
+globally configured default is used. If still unspecified, a device specific
+timeout is used (usually 45 seconds).</p>
+<p>Set to 2147483647 (MAXINT32) for infinity.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &gt;= 0</p>
 <p>Default value: 0</p>
@@ -6510,10 +6513,11 @@ same connection profile.</p>
 <p>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.  Negative values have the special
+devices have configurations with the same priority, VPNs will be
+considered first, then devices with the best (lowest metric) default
+route and then all other devices.  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
+so in presence of at least one negative priority, only DNS servers from
 connections with the lowest priority value will be used.</p>
 <p>When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or
 dns=systemd-resolved, each connection is used to query domains in its
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index 915f0def..98353656 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -41,7 +41,7 @@
 <tbody>
 <tr>
 <td class="function_type">
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<span class="returnvalue">NMVpnConnectionState</span>
 </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>
@@ -83,7 +83,7 @@
 <a name="NMVpnConnection.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="nm-vpn-connection-get-vpn-state"></a><h3>nm_vpn_connection_get_vpn_state ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState"><span class="returnvalue">NMVpnConnectionState</span></a>
+<pre class="programlisting"><span class="returnvalue">NMVpnConnectionState</span>
 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/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 6e5e560c..ee7bf244 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -133,51 +133,51 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint-struct">NMAccessPoint</a>, struct in NMDeviceOvs
+NMAccessPoint, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--bssid">NMAccessPoint:bssid</a>, object property in NMDeviceOvs
+NMAccessPoint:bssid, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--flags">NMAccessPoint:flags</a>, object property in NMDeviceOvs
+NMAccessPoint:flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--frequency">NMAccessPoint:frequency</a>, object property in NMDeviceOvs
+NMAccessPoint:frequency, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--hw-address">NMAccessPoint:hw-address</a>, object property in NMDeviceOvs
+NMAccessPoint:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--last-seen">NMAccessPoint:last-seen</a>, object property in NMDeviceOvs
+NMAccessPoint:last-seen, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--max-bitrate">NMAccessPoint:max-bitrate</a>, object property in NMDeviceOvs
+NMAccessPoint:max-bitrate, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--mode">NMAccessPoint:mode</a>, object property in NMDeviceOvs
+NMAccessPoint:mode, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--rsn-flags">NMAccessPoint:rsn-flags</a>, object property in NMDeviceOvs
+NMAccessPoint:rsn-flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--ssid">NMAccessPoint:ssid</a>, object property in NMDeviceOvs
+NMAccessPoint:ssid, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--strength">NMAccessPoint:strength</a>, object property in NMDeviceOvs
+NMAccessPoint:strength, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMAccessPoint.html#NMAccessPoint--wpa-flags">NMAccessPoint:wpa-flags</a>, object property in NMDeviceOvs
+NMAccessPoint:wpa-flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -185,75 +185,75 @@ json_true, macro in nm-json
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection-struct">NMActiveConnection</a>, struct in NMDeviceOvs
+NMActiveConnection, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection-state-changed">NMActiveConnection::state-changed</a>, object signal in NMDeviceOvs
+NMActiveConnection::state-changed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--connection">NMActiveConnection:connection</a>, object property in NMDeviceOvs
+NMActiveConnection:connection, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--default">NMActiveConnection:default</a>, object property in NMDeviceOvs
+NMActiveConnection:default, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--default6">NMActiveConnection:default6</a>, object property in NMDeviceOvs
+NMActiveConnection:default6, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--devices">NMActiveConnection:devices</a>, object property in NMDeviceOvs
+NMActiveConnection:devices, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--dhcp4-config">NMActiveConnection:dhcp4-config</a>, object property in NMDeviceOvs
+NMActiveConnection:dhcp4-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--dhcp6-config">NMActiveConnection:dhcp6-config</a>, object property in NMDeviceOvs
+NMActiveConnection:dhcp6-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--id">NMActiveConnection:id</a>, object property in NMDeviceOvs
+NMActiveConnection:id, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--ip4-config">NMActiveConnection:ip4-config</a>, object property in NMDeviceOvs
+NMActiveConnection:ip4-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--ip6-config">NMActiveConnection:ip6-config</a>, object property in NMDeviceOvs
+NMActiveConnection:ip6-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--master">NMActiveConnection:master</a>, object property in NMDeviceOvs
+NMActiveConnection:master, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--specific-object-path">NMActiveConnection:specific-object-path</a>, object property in NMDeviceOvs
+NMActiveConnection:specific-object-path, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--state">NMActiveConnection:state</a>, object property in NMDeviceOvs
+NMActiveConnection:state, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--state-flags">NMActiveConnection:state-flags</a>, object property in NMDeviceOvs
+NMActiveConnection:state-flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--type">NMActiveConnection:type</a>, object property in NMDeviceOvs
+NMActiveConnection:type, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--uuid">NMActiveConnection:uuid</a>, object property in NMDeviceOvs
+NMActiveConnection:uuid, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMActiveConnection.html#NMActiveConnection--vpn">NMActiveConnection:vpn</a>, object property in NMDeviceOvs
+NMActiveConnection:vpn, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -301,59 +301,59 @@ NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-struct">NMClient</a>, struct in NMDeviceOvs
+NMClient, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-active-connection-added">NMClient::active-connection-added</a>, object signal in NMDeviceOvs
+NMClient::active-connection-added, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-active-connection-removed">NMClient::active-connection-removed</a>, object signal in NMDeviceOvs
+NMClient::active-connection-removed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-any-device-added">NMClient::any-device-added</a>, object signal in NMDeviceOvs
+NMClient::any-device-added, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-any-device-removed">NMClient::any-device-removed</a>, object signal in NMDeviceOvs
+NMClient::any-device-removed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-connection-added">NMClient::connection-added</a>, object signal in NMDeviceOvs
+NMClient::connection-added, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-connection-removed">NMClient::connection-removed</a>, object signal in NMDeviceOvs
+NMClient::connection-removed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-device-added">NMClient::device-added</a>, object signal in NMDeviceOvs
+NMClient::device-added, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-device-removed">NMClient::device-removed</a>, object signal in NMDeviceOvs
+NMClient::device-removed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient-permission-changed">NMClient::permission-changed</a>, object signal in NMDeviceOvs
+NMClient::permission-changed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--activating-connection">NMClient:activating-connection</a>, object property in NMDeviceOvs
+NMClient:activating-connection, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--active-connections">NMClient:active-connections</a>, object property in NMDeviceOvs
+NMClient:active-connections, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--all-devices">NMClient:all-devices</a>, object property in NMDeviceOvs
+NMClient:all-devices, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--can-modify">NMClient:can-modify</a>, object property in NMDeviceOvs
+NMClient:can-modify, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -361,23 +361,23 @@ NMClient:capabilities, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--checkpoints">NMClient:checkpoints</a>, object property in NMDeviceOvs
+NMClient:checkpoints, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--connections">NMClient:connections</a>, object property in NMDeviceOvs
+NMClient:connections, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--connectivity">NMClient:connectivity</a>, object property in NMDeviceOvs
+NMClient:connectivity, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--connectivity-check-available">NMClient:connectivity-check-available</a>, object property in NMDeviceOvs
+NMClient:connectivity-check-available, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--connectivity-check-enabled">NMClient:connectivity-check-enabled</a>, object property in NMDeviceOvs
+NMClient:connectivity-check-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -393,75 +393,75 @@ NMClient:dbus-name-owner, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--devices">NMClient:devices</a>, object property in NMDeviceOvs
+NMClient:devices, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--dns-configuration">NMClient:dns-configuration</a>, object property in NMDeviceOvs
+NMClient:dns-configuration, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--dns-mode">NMClient:dns-mode</a>, object property in NMDeviceOvs
+NMClient:dns-mode, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--dns-rc-manager">NMClient:dns-rc-manager</a>, object property in NMDeviceOvs
+NMClient:dns-rc-manager, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--hostname">NMClient:hostname</a>, object property in NMDeviceOvs
+NMClient:hostname, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--metered">NMClient:metered</a>, object property in NMDeviceOvs
+NMClient:metered, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--networking-enabled">NMClient:networking-enabled</a>, object property in NMDeviceOvs
+NMClient:networking-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--nm-running">NMClient:nm-running</a>, object property in NMDeviceOvs
+NMClient:nm-running, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--primary-connection">NMClient:primary-connection</a>, object property in NMDeviceOvs
+NMClient:primary-connection, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--startup">NMClient:startup</a>, object property in NMDeviceOvs
+NMClient:startup, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--state">NMClient:state</a>, object property in NMDeviceOvs
+NMClient:state, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--version">NMClient:version</a>, object property in NMDeviceOvs
+NMClient:version, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--wimax-enabled">NMClient:wimax-enabled</a>, object property in NMDeviceOvs
+NMClient:wimax-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--wimax-hardware-enabled">NMClient:wimax-hardware-enabled</a>, object property in NMDeviceOvs
+NMClient:wimax-hardware-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--wireless-enabled">NMClient:wireless-enabled</a>, object property in NMDeviceOvs
+NMClient:wireless-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--wireless-hardware-enabled">NMClient:wireless-hardware-enabled</a>, object property in NMDeviceOvs
+NMClient:wireless-hardware-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--wwan-enabled">NMClient:wwan-enabled</a>, object property in NMDeviceOvs
+NMClient:wwan-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMClient.html#NMClient--wwan-hardware-enabled">NMClient:wwan-hardware-enabled</a>, object property in NMDeviceOvs
+NMClient:wwan-hardware-enabled, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -537,7 +537,7 @@ NMConnection::secrets-updated, object signal in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice-struct">NMDevice</a>, struct in NMDeviceOvs
+NMDevice, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -553,55 +553,55 @@ NMDevice6Lowpan:parent, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice-state-changed">NMDevice::state-changed</a>, object signal in NMDeviceOvs
+NMDevice::state-changed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--active-connection">NMDevice:active-connection</a>, object property in NMDeviceOvs
+NMDevice:active-connection, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--autoconnect">NMDevice:autoconnect</a>, object property in NMDeviceOvs
+NMDevice:autoconnect, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--available-connections">NMDevice:available-connections</a>, object property in NMDeviceOvs
+NMDevice:available-connections, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--capabilities">NMDevice:capabilities</a>, object property in NMDeviceOvs
+NMDevice:capabilities, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--device-type">NMDevice:device-type</a>, object property in NMDeviceOvs
+NMDevice:device-type, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--dhcp4-config">NMDevice:dhcp4-config</a>, object property in NMDeviceOvs
+NMDevice:dhcp4-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--dhcp6-config">NMDevice:dhcp6-config</a>, object property in NMDeviceOvs
+NMDevice:dhcp6-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--driver">NMDevice:driver</a>, object property in NMDeviceOvs
+NMDevice:driver, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--driver-version">NMDevice:driver-version</a>, object property in NMDeviceOvs
+NMDevice:driver-version, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--firmware-missing">NMDevice:firmware-missing</a>, object property in NMDeviceOvs
+NMDevice:firmware-missing, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--firmware-version">NMDevice:firmware-version</a>, object property in NMDeviceOvs
+NMDevice:firmware-version, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--interface">NMDevice:interface</a>, object property in NMDeviceOvs
+NMDevice:interface, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -609,127 +609,127 @@ NMDevice:interface-flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--ip-interface">NMDevice:ip-interface</a>, object property in NMDeviceOvs
+NMDevice:ip-interface, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--ip4-config">NMDevice:ip4-config</a>, object property in NMDeviceOvs
+NMDevice:ip4-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--ip4-connectivity">NMDevice:ip4-connectivity</a>, object property in NMDeviceOvs
+NMDevice:ip4-connectivity, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--ip6-config">NMDevice:ip6-config</a>, object property in NMDeviceOvs
+NMDevice:ip6-config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--ip6-connectivity">NMDevice:ip6-connectivity</a>, object property in NMDeviceOvs
+NMDevice:ip6-connectivity, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--lldp-neighbors">NMDevice:lldp-neighbors</a>, object property in NMDeviceOvs
+NMDevice:lldp-neighbors, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--managed">NMDevice:managed</a>, object property in NMDeviceOvs
+NMDevice:managed, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--metered">NMDevice:metered</a>, object property in NMDeviceOvs
+NMDevice:metered, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--mtu">NMDevice:mtu</a>, object property in NMDeviceOvs
+NMDevice:mtu, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--nm-plugin-missing">NMDevice:nm-plugin-missing</a>, object property in NMDeviceOvs
+NMDevice:nm-plugin-missing, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--physical-port-id">NMDevice:physical-port-id</a>, object property in NMDeviceOvs
+NMDevice:physical-port-id, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--product">NMDevice:product</a>, object property in NMDeviceOvs
+NMDevice:product, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--real">NMDevice:real</a>, object property in NMDeviceOvs
+NMDevice:real, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--state">NMDevice:state</a>, object property in NMDeviceOvs
+NMDevice:state, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--state-reason">NMDevice:state-reason</a>, object property in NMDeviceOvs
+NMDevice:state-reason, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--udi">NMDevice:udi</a>, object property in NMDeviceOvs
+NMDevice:udi, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDevice.html#NMDevice--vendor">NMDevice:vendor</a>, object property in NMDeviceOvs
+NMDevice:vendor, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceAdsl.html#NMDeviceAdsl-struct">NMDeviceAdsl</a>, struct in NMDeviceOvs
+NMDeviceAdsl, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceAdsl.html#NMDeviceAdsl--carrier">NMDeviceAdsl:carrier</a>, object property in NMDeviceOvs
+NMDeviceAdsl:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBond.html#NMDeviceBond-struct">NMDeviceBond</a>, struct in NMDeviceOvs
+NMDeviceBond, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBond.html#NMDeviceBond--carrier">NMDeviceBond:carrier</a>, object property in NMDeviceOvs
+NMDeviceBond:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBond.html#NMDeviceBond--hw-address">NMDeviceBond:hw-address</a>, object property in NMDeviceOvs
+NMDeviceBond:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBond.html#NMDeviceBond--slaves">NMDeviceBond:slaves</a>, object property in NMDeviceOvs
+NMDeviceBond:slaves, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBridge.html#NMDeviceBridge-struct">NMDeviceBridge</a>, struct in NMDeviceOvs
+NMDeviceBridge, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBridge.html#NMDeviceBridge--carrier">NMDeviceBridge:carrier</a>, object property in NMDeviceOvs
+NMDeviceBridge:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBridge.html#NMDeviceBridge--hw-address">NMDeviceBridge:hw-address</a>, object property in NMDeviceOvs
+NMDeviceBridge:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBridge.html#NMDeviceBridge--slaves">NMDeviceBridge:slaves</a>, object property in NMDeviceOvs
+NMDeviceBridge:slaves, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBt.html#NMDeviceBt-struct">NMDeviceBt</a>, struct in NMDeviceOvs
+NMDeviceBt, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBt.html#NMDeviceBt--bt-capabilities">NMDeviceBt:bt-capabilities</a>, object property in NMDeviceOvs
+NMDeviceBt:bt-capabilities, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBt.html#NMDeviceBt--hw-address">NMDeviceBt:hw-address</a>, object property in NMDeviceOvs
+NMDeviceBt:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceBt.html#NMDeviceBt--name">NMDeviceBt:name</a>, object property in NMDeviceOvs
+NMDeviceBt:name, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -741,11 +741,11 @@ NMDeviceClass, struct in <a class="link" href="NMIPConfig.html" title="NMIPConfi
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceDummy.html#NMDeviceDummy-struct">NMDeviceDummy</a>, struct in NMDeviceOvs
+NMDeviceDummy, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceDummy.html#NMDeviceDummy--hw-address">NMDeviceDummy:hw-address</a>, object property in NMDeviceOvs
+NMDeviceDummy:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -753,51 +753,51 @@ NMDeviceClass, struct in <a class="link" href="NMIPConfig.html" title="NMIPConfi
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceEthernet.html#NMDeviceEthernet-struct">NMDeviceEthernet</a>, struct in NMDeviceOvs
+NMDeviceEthernet, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceEthernet.html#NMDeviceEthernet--carrier">NMDeviceEthernet:carrier</a>, object property in NMDeviceOvs
+NMDeviceEthernet:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceEthernet.html#NMDeviceEthernet--hw-address">NMDeviceEthernet:hw-address</a>, object property in NMDeviceOvs
+NMDeviceEthernet:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceEthernet.html#NMDeviceEthernet--perm-hw-address">NMDeviceEthernet:perm-hw-address</a>, object property in NMDeviceOvs
+NMDeviceEthernet:perm-hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceEthernet.html#NMDeviceEthernet--s390-subchannels">NMDeviceEthernet:s390-subchannels</a>, object property in NMDeviceOvs
+NMDeviceEthernet:s390-subchannels, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceEthernet.html#NMDeviceEthernet--speed">NMDeviceEthernet:speed</a>, object property in NMDeviceOvs
+NMDeviceEthernet:speed, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceGeneric.html#NMDeviceGeneric-struct">NMDeviceGeneric</a>, struct in NMDeviceOvs
+NMDeviceGeneric, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceGeneric.html#NMDeviceGeneric--hw-address">NMDeviceGeneric:hw-address</a>, object property in NMDeviceOvs
+NMDeviceGeneric:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceGeneric.html#NMDeviceGeneric--type-description">NMDeviceGeneric:type-description</a>, object property in NMDeviceOvs
+NMDeviceGeneric:type-description, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceInfiniband.html#NMDeviceInfiniband-struct">NMDeviceInfiniband</a>, struct in NMDeviceOvs
+NMDeviceInfiniband, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceInfiniband.html#NMDeviceInfiniband--carrier">NMDeviceInfiniband:carrier</a>, object property in NMDeviceOvs
+NMDeviceInfiniband:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceInfiniband.html#NMDeviceInfiniband--hw-address">NMDeviceInfiniband:hw-address</a>, object property in NMDeviceOvs
+NMDeviceInfiniband:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -805,143 +805,143 @@ NMDeviceClass, struct in <a class="link" href="NMIPConfig.html" title="NMIPConfi
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel-struct">NMDeviceIPTunnel</a>, struct in NMDeviceOvs
+NMDeviceIPTunnel, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--encapsulation-limit">NMDeviceIPTunnel:encapsulation-limit</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:encapsulation-limit, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flags">NMDeviceIPTunnel:flags</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--flow-label">NMDeviceIPTunnel:flow-label</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:flow-label, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--input-key">NMDeviceIPTunnel:input-key</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:input-key, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--local">NMDeviceIPTunnel:local</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:local, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--mode">NMDeviceIPTunnel:mode</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:mode, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--output-key">NMDeviceIPTunnel:output-key</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:output-key, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--parent">NMDeviceIPTunnel:parent</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:parent, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--path-mtu-discovery">NMDeviceIPTunnel:path-mtu-discovery</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:path-mtu-discovery, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--remote">NMDeviceIPTunnel:remote</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:remote, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--tos">NMDeviceIPTunnel:tos</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:tos, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceIPTunnel.html#NMDeviceIPTunnel--ttl">NMDeviceIPTunnel:ttl</a>, object property in NMDeviceOvs
+NMDeviceIPTunnel:ttl, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec-struct">NMDeviceMacsec</a>, struct in NMDeviceOvs
+NMDeviceMacsec, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--cipher-suite">NMDeviceMacsec:cipher-suite</a>, object property in NMDeviceOvs
+NMDeviceMacsec:cipher-suite, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--encoding-sa">NMDeviceMacsec:encoding-sa</a>, object property in NMDeviceOvs
+NMDeviceMacsec:encoding-sa, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--encrypt">NMDeviceMacsec:encrypt</a>, object property in NMDeviceOvs
+NMDeviceMacsec:encrypt, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--es">NMDeviceMacsec:es</a>, object property in NMDeviceOvs
+NMDeviceMacsec:es, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--hw-address">NMDeviceMacsec:hw-address</a>, object property in NMDeviceOvs
+NMDeviceMacsec:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--icv-length">NMDeviceMacsec:icv-length</a>, object property in NMDeviceOvs
+NMDeviceMacsec:icv-length, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--include-sci">NMDeviceMacsec:include-sci</a>, object property in NMDeviceOvs
+NMDeviceMacsec:include-sci, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--parent">NMDeviceMacsec:parent</a>, object property in NMDeviceOvs
+NMDeviceMacsec:parent, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--protect">NMDeviceMacsec:protect</a>, object property in NMDeviceOvs
+NMDeviceMacsec:protect, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--replay-protect">NMDeviceMacsec:replay-protect</a>, object property in NMDeviceOvs
+NMDeviceMacsec:replay-protect, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--scb">NMDeviceMacsec:scb</a>, object property in NMDeviceOvs
+NMDeviceMacsec:scb, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--sci">NMDeviceMacsec:sci</a>, object property in NMDeviceOvs
+NMDeviceMacsec:sci, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--validation">NMDeviceMacsec:validation</a>, object property in NMDeviceOvs
+NMDeviceMacsec:validation, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacsec.html#NMDeviceMacsec--window">NMDeviceMacsec:window</a>, object property in NMDeviceOvs
+NMDeviceMacsec:window, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacvlan.html#NMDeviceMacvlan-struct">NMDeviceMacvlan</a>, struct in NMDeviceOvs
+NMDeviceMacvlan, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacvlan.html#NMDeviceMacvlan--hw-address">NMDeviceMacvlan:hw-address</a>, object property in NMDeviceOvs
+NMDeviceMacvlan:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacvlan.html#NMDeviceMacvlan--mode">NMDeviceMacvlan:mode</a>, object property in NMDeviceOvs
+NMDeviceMacvlan:mode, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacvlan.html#NMDeviceMacvlan--no-promisc">NMDeviceMacvlan:no-promisc</a>, object property in NMDeviceOvs
+NMDeviceMacvlan:no-promisc, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacvlan.html#NMDeviceMacvlan--parent">NMDeviceMacvlan:parent</a>, object property in NMDeviceOvs
+NMDeviceMacvlan:parent, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceMacvlan.html#NMDeviceMacvlan--tap">NMDeviceMacvlan:tap</a>, object property in NMDeviceOvs
+NMDeviceMacvlan:tap, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceModem.html#NMDeviceModem-struct">NMDeviceModem</a>, struct in NMDeviceOvs
+NMDeviceModem, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -949,7 +949,7 @@ NMDeviceModem:apn, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceModem.html#NMDeviceModem--current-capabilities">NMDeviceModem:current-capabilities</a>, object property in NMDeviceOvs
+NMDeviceModem:current-capabilities, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -957,7 +957,7 @@ NMDeviceModem:device-id, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceModem.html#NMDeviceModem--modem-capabilities">NMDeviceModem:modem-capabilities</a>, object property in NMDeviceOvs
+NMDeviceModem:modem-capabilities, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -969,19 +969,19 @@ NMDeviceModem:operator-code, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh-struct">NMDeviceOlpcMesh</a>, struct in NMDeviceOvs
+NMDeviceOlpcMesh, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--active-channel">NMDeviceOlpcMesh:active-channel</a>, object property in NMDeviceOvs
+NMDeviceOlpcMesh:active-channel, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--companion">NMDeviceOlpcMesh:companion</a>, object property in NMDeviceOvs
+NMDeviceOlpcMesh:companion, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceOlpcMesh.html#NMDeviceOlpcMesh--hw-address">NMDeviceOlpcMesh:hw-address</a>, object property in NMDeviceOvs
+NMDeviceOlpcMesh:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1017,55 +1017,55 @@ NMDevicePpp, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTeam.html#NMDeviceTeam-struct">NMDeviceTeam</a>, struct in NMDeviceOvs
+NMDeviceTeam, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTeam.html#NMDeviceTeam--carrier">NMDeviceTeam:carrier</a>, object property in NMDeviceOvs
+NMDeviceTeam:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTeam.html#NMDeviceTeam--config">NMDeviceTeam:config</a>, object property in NMDeviceOvs
+NMDeviceTeam:config, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTeam.html#NMDeviceTeam--hw-address">NMDeviceTeam:hw-address</a>, object property in NMDeviceOvs
+NMDeviceTeam:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTeam.html#NMDeviceTeam--slaves">NMDeviceTeam:slaves</a>, object property in NMDeviceOvs
+NMDeviceTeam:slaves, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun-struct">NMDeviceTun</a>, struct in NMDeviceOvs
+NMDeviceTun, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--group">NMDeviceTun:group</a>, object property in NMDeviceOvs
+NMDeviceTun:group, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--hw-address">NMDeviceTun:hw-address</a>, object property in NMDeviceOvs
+NMDeviceTun:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--mode">NMDeviceTun:mode</a>, object property in NMDeviceOvs
+NMDeviceTun:mode, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--multi-queue">NMDeviceTun:multi-queue</a>, object property in NMDeviceOvs
+NMDeviceTun:multi-queue, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--no-pi">NMDeviceTun:no-pi</a>, object property in NMDeviceOvs
+NMDeviceTun:no-pi, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--owner">NMDeviceTun:owner</a>, object property in NMDeviceOvs
+NMDeviceTun:owner, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceTun.html#NMDeviceTun--vnet-hdr">NMDeviceTun:vnet-hdr</a>, object property in NMDeviceOvs
+NMDeviceTun:vnet-hdr, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1073,143 +1073,143 @@ NMDevicePpp, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVlan.html#NMDeviceVlan-struct">NMDeviceVlan</a>, struct in NMDeviceOvs
+NMDeviceVlan, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVlan.html#NMDeviceVlan--carrier">NMDeviceVlan:carrier</a>, object property in NMDeviceOvs
+NMDeviceVlan:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVlan.html#NMDeviceVlan--hw-address">NMDeviceVlan:hw-address</a>, object property in NMDeviceOvs
+NMDeviceVlan:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVlan.html#NMDeviceVlan--parent">NMDeviceVlan:parent</a>, object property in NMDeviceOvs
+NMDeviceVlan:parent, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVlan.html#NMDeviceVlan--vlan-id">NMDeviceVlan:vlan-id</a>, object property in NMDeviceOvs
+NMDeviceVlan:vlan-id, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan-struct">NMDeviceVxlan</a>, struct in NMDeviceOvs
+NMDeviceVxlan, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--ageing">NMDeviceVxlan:ageing</a>, object property in NMDeviceOvs
+NMDeviceVxlan:ageing, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--carrier">NMDeviceVxlan:carrier</a>, object property in NMDeviceOvs
+NMDeviceVxlan:carrier, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--dst-port">NMDeviceVxlan:dst-port</a>, object property in NMDeviceOvs
+NMDeviceVxlan:dst-port, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--group">NMDeviceVxlan:group</a>, object property in NMDeviceOvs
+NMDeviceVxlan:group, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--hw-address">NMDeviceVxlan:hw-address</a>, object property in NMDeviceOvs
+NMDeviceVxlan:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--id">NMDeviceVxlan:id</a>, object property in NMDeviceOvs
+NMDeviceVxlan:id, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--l2miss">NMDeviceVxlan:l2miss</a>, object property in NMDeviceOvs
+NMDeviceVxlan:l2miss, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--l3miss">NMDeviceVxlan:l3miss</a>, object property in NMDeviceOvs
+NMDeviceVxlan:l3miss, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--learning">NMDeviceVxlan:learning</a>, object property in NMDeviceOvs
+NMDeviceVxlan:learning, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--limit">NMDeviceVxlan:limit</a>, object property in NMDeviceOvs
+NMDeviceVxlan:limit, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--local">NMDeviceVxlan:local</a>, object property in NMDeviceOvs
+NMDeviceVxlan:local, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--parent">NMDeviceVxlan:parent</a>, object property in NMDeviceOvs
+NMDeviceVxlan:parent, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--proxy">NMDeviceVxlan:proxy</a>, object property in NMDeviceOvs
+NMDeviceVxlan:proxy, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--rsc">NMDeviceVxlan:rsc</a>, object property in NMDeviceOvs
+NMDeviceVxlan:rsc, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--src-port-max">NMDeviceVxlan:src-port-max</a>, object property in NMDeviceOvs
+NMDeviceVxlan:src-port-max, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--src-port-min">NMDeviceVxlan:src-port-min</a>, object property in NMDeviceOvs
+NMDeviceVxlan:src-port-min, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--tos">NMDeviceVxlan:tos</a>, object property in NMDeviceOvs
+NMDeviceVxlan:tos, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceVxlan.html#NMDeviceVxlan--ttl">NMDeviceVxlan:ttl</a>, object property in NMDeviceOvs
+NMDeviceVxlan:ttl, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi-struct">NMDeviceWifi</a>, struct in NMDeviceOvs
+NMDeviceWifi, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi-access-point-added">NMDeviceWifi::access-point-added</a>, object signal in NMDeviceOvs
+NMDeviceWifi::access-point-added, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi-access-point-removed">NMDeviceWifi::access-point-removed</a>, object signal in NMDeviceOvs
+NMDeviceWifi::access-point-removed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--access-points">NMDeviceWifi:access-points</a>, object property in NMDeviceOvs
+NMDeviceWifi:access-points, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--active-access-point">NMDeviceWifi:active-access-point</a>, object property in NMDeviceOvs
+NMDeviceWifi:active-access-point, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--bitrate">NMDeviceWifi:bitrate</a>, object property in NMDeviceOvs
+NMDeviceWifi:bitrate, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--hw-address">NMDeviceWifi:hw-address</a>, object property in NMDeviceOvs
+NMDeviceWifi:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--last-scan">NMDeviceWifi:last-scan</a>, object property in NMDeviceOvs
+NMDeviceWifi:last-scan, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--mode">NMDeviceWifi:mode</a>, object property in NMDeviceOvs
+NMDeviceWifi:mode, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--perm-hw-address">NMDeviceWifi:perm-hw-address</a>, object property in NMDeviceOvs
+NMDeviceWifi:perm-hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWifi.html#NMDeviceWifi--wireless-capabilities">NMDeviceWifi:wireless-capabilities</a>, object property in NMDeviceOvs
+NMDeviceWifi:wireless-capabilities, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1237,47 +1237,47 @@ NMDeviceWifiP2P:peers, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax-struct">NMDeviceWimax</a>, struct in NMDeviceOvs
+NMDeviceWimax, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax-nsp-added">NMDeviceWimax::nsp-added</a>, object signal in NMDeviceOvs
+NMDeviceWimax::nsp-added, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax-nsp-removed">NMDeviceWimax::nsp-removed</a>, object signal in NMDeviceOvs
+NMDeviceWimax::nsp-removed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--active-nsp">NMDeviceWimax:active-nsp</a>, object property in NMDeviceOvs
+NMDeviceWimax:active-nsp, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--bsid">NMDeviceWimax:bsid</a>, object property in NMDeviceOvs
+NMDeviceWimax:bsid, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--center-frequency">NMDeviceWimax:center-frequency</a>, object property in NMDeviceOvs
+NMDeviceWimax:center-frequency, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--cinr">NMDeviceWimax:cinr</a>, object property in NMDeviceOvs
+NMDeviceWimax:cinr, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--hw-address">NMDeviceWimax:hw-address</a>, object property in NMDeviceOvs
+NMDeviceWimax:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--nsps">NMDeviceWimax:nsps</a>, object property in NMDeviceOvs
+NMDeviceWimax:nsps, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--rssi">NMDeviceWimax:rssi</a>, object property in NMDeviceOvs
+NMDeviceWimax:rssi, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDeviceWimax.html#NMDeviceWimax--tx-power">NMDeviceWimax:tx-power</a>, object property in NMDeviceOvs
+NMDeviceWimax:tx-power, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1305,15 +1305,15 @@ NMDeviceWpan:hw-address, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDhcpConfig.html#NMDhcpConfig-struct">NMDhcpConfig</a>, struct in NMDeviceOvs
+NMDhcpConfig, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDhcpConfig.html#NMDhcpConfig--family">NMDhcpConfig:family</a>, object property in NMDeviceOvs
+NMDhcpConfig:family, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMDhcpConfig.html#NMDhcpConfig--options">NMDhcpConfig:options</a>, object property in NMDeviceOvs
+NMDhcpConfig:options, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1329,39 +1329,39 @@ NMDhcpConfigClass, struct in <a class="link" href="NMIPConfig.html" title="NMIPC
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig-struct">NMIPConfig</a>, struct in NMDeviceOvs
+NMIPConfig, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--addresses">NMIPConfig:addresses</a>, object property in NMDeviceOvs
+NMIPConfig:addresses, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--domains">NMIPConfig:domains</a>, object property in NMDeviceOvs
+NMIPConfig:domains, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--family">NMIPConfig:family</a>, object property in NMDeviceOvs
+NMIPConfig:family, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--gateway">NMIPConfig:gateway</a>, object property in NMDeviceOvs
+NMIPConfig:gateway, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--nameservers">NMIPConfig:nameservers</a>, object property in NMDeviceOvs
+NMIPConfig:nameservers, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--routes">NMIPConfig:routes</a>, object property in NMDeviceOvs
+NMIPConfig:routes, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--searches">NMIPConfig:searches</a>, object property in NMDeviceOvs
+NMIPConfig:searches, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMIPConfig.html#NMIPConfig--wins-servers">NMIPConfig:wins-servers</a>, object property in NMDeviceOvs
+NMIPConfig:wins-servers, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1589,6 +1589,10 @@ nml_dbus_property_o_is_ready, function in <a class="link" href="NMIPConfig.html"
 </dt>
 <dd></dd>
 <dt>
+nml_dbus_property_o_is_ready_fully, function in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
+</dt>
+<dd></dd>
+<dt>
 nml_dbus_property_o_notify_changed_many, function in <a class="link" href="NMIPConfig.html" title="NMIPConfig">NMIPConfig</a>
 </dt>
 <dd></dd>
@@ -1625,11 +1629,11 @@ NML_NMCLIENT_LOG_W, macro in <a class="link" href="NMIPConfig.html" title="NMIPC
 </dt>
 <dd></dd>
 <dt>
-<a href="NMObject.html#NMObject-struct">NMObject</a>, struct in NMDeviceOvs
+NMObject, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMObject.html#NMObject--path">NMObject:path</a>, object property in NMDeviceOvs
+NMObject:path, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -1649,23 +1653,23 @@ _NMObjectClassFieldInfo, struct in <a class="link" href="NMIPConfig.html" title=
 </dt>
 <dd></dd>
 <dt>
-<a href="NMRemoteConnection.html#NMRemoteConnection-struct">NMRemoteConnection</a>, struct in NMDeviceOvs
+NMRemoteConnection, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMRemoteConnection.html#NMRemoteConnection--filename">NMRemoteConnection:filename</a>, object property in NMDeviceOvs
+NMRemoteConnection:filename, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMRemoteConnection.html#NMRemoteConnection--flags">NMRemoteConnection:flags</a>, object property in NMDeviceOvs
+NMRemoteConnection:flags, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMRemoteConnection.html#NMRemoteConnection--unsaved">NMRemoteConnection:unsaved</a>, object property in NMDeviceOvs
+NMRemoteConnection:unsaved, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMRemoteConnection.html#NMRemoteConnection--visible">NMRemoteConnection:visible</a>, object property in NMDeviceOvs
+NMRemoteConnection:visible, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -2397,6 +2401,10 @@ NMSettingEthtool, struct in NMSettingOvs
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--ra-timeout" title="The “ra-timeout� property">NMSettingIP6Config:ra-timeout</a>, object property in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#NMSettingIP6Config--token" title="The “token� property">NMSettingIP6Config:token</a>, object property in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -3577,27 +3585,27 @@ NMTeamSettingData, struct in nm-team-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="NMVpnConnection.html#NMVpnConnection-struct">NMVpnConnection</a>, struct in NMDeviceOvs
+NMVpnConnection, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMVpnConnection.html#NMVpnConnection-vpn-state-changed">NMVpnConnection::vpn-state-changed</a>, object signal in NMDeviceOvs
+NMVpnConnection::vpn-state-changed, object signal in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMVpnConnection.html#NMVpnConnection--banner">NMVpnConnection:banner</a>, object property in NMDeviceOvs
+NMVpnConnection:banner, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMVpnConnection.html#NMVpnConnection--vpn-state">NMVpnConnection:vpn-state</a>, object property in NMDeviceOvs
+NMVpnConnection:vpn-state, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState">NMVpnConnectionState</a>, enum in nm-vpn-dbus-interface
+NMVpnConnectionState, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>, enum in nm-vpn-dbus-interface
+NMVpnConnectionStateReason, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -3649,7 +3657,7 @@ NMTeamSettingData, struct in nm-team-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure">NMVpnPluginFailure</a>, enum in nm-vpn-dbus-interface
+NMVpnPluginFailure, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -3657,7 +3665,7 @@ NMTeamSettingData, struct in nm-team-utils
 </dt>
 <dd></dd>
 <dt>
-<a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState">NMVpnServiceState</a>, enum in nm-vpn-dbus-interface
+NMVpnServiceState, enum in nm-vpn-dbus-interface
 </dt>
 <dd></dd>
 <dt>
@@ -3709,19 +3717,19 @@ NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMWimaxNsp.html#NMWimaxNsp-struct">NMWimaxNsp</a>, struct in NMDeviceOvs
+NMWimaxNsp, struct in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMWimaxNsp.html#NMWimaxNsp--name">NMWimaxNsp:name</a>, object property in NMDeviceOvs
+NMWimaxNsp:name, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMWimaxNsp.html#NMWimaxNsp--network-type">NMWimaxNsp:network-type</a>, object property in NMDeviceOvs
+NMWimaxNsp:network-type, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
-<a href="NMWimaxNsp.html#NMWimaxNsp--signal-quality">NMWimaxNsp:signal-quality</a>, object property in NMDeviceOvs
+NMWimaxNsp:signal-quality, object property in NMDeviceOvs
 </dt>
 <dd></dd>
 <dt>
@@ -4013,6 +4021,10 @@ nm_auto_unref_nml_dbusobj, macro in <a class="link" href="NMIPConfig.html" title
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-22-8:CAPS" title="NM_AVAILABLE_IN_1_22_8">NM_AVAILABLE_IN_1_22_8</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-4:CAPS" title="NM_AVAILABLE_IN_1_4">NM_AVAILABLE_IN_1_4</a>, macro in <a class="link" href="libnm-nm-version.html" title="nm-version">nm-version</a>
 </dt>
 <dd></dd>
@@ -9577,6 +9589,10 @@ nm_permission_to_client, function in <a class="link" href="NMIPConfig.html" titl
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-ra-timeout" title="nm_setting_ip6_config_get_ra_timeout ()">nm_setting_ip6_config_get_ra_timeout</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#nm-setting-ip6-config-get-token" title="nm_setting_ip6_config_get_token ()">nm_setting_ip6_config_get_token</a>, function in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
@@ -9617,6 +9633,10 @@ nm_permission_to_client, function in <a class="link" href="NMIPConfig.html" titl
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-RA-TIMEOUT:CAPS" title="NM_SETTING_IP6_CONFIG_RA_TIMEOUT">NM_SETTING_IP6_CONFIG_RA_TIMEOUT</a>, macro in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS" title="NM_SETTING_IP6_CONFIG_SETTING_NAME">NM_SETTING_IP6_CONFIG_SETTING_NAME</a>, macro in <a class="link" href="NMSettingIP6Config.html" title="NMSettingIP6Config">NMSettingIP6Config</a>
 </dt>
 <dd></dd>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index f3478dca..93d2fef9 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.22.4
+      for libnm 1.22.8
 
       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-version.html b/docs/libnm/html/libnm-nm-version.html
index 3178fbde..d596b86e 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -254,6 +254,10 @@
 <td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-22-2:CAPS" title="NM_AVAILABLE_IN_1_22_2">NM_AVAILABLE_IN_1_22_2</a></td>
 </tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-version.html#NM-AVAILABLE-IN-1-22-8:CAPS" title="NM_AVAILABLE_IN_1_22_8">NM_AVAILABLE_IN_1_22_8</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -524,6 +528,12 @@
 <pre class="programlisting"># define NM_AVAILABLE_IN_1_22_2            G_UNAVAILABLE(1,22.2)
 </pre>
 </div>
+<hr>
+<div class="refsect2">
+<a name="NM-AVAILABLE-IN-1-22-8:CAPS"></a><h3>NM_AVAILABLE_IN_1_22_8</h3>
+<pre class="programlisting"># define NM_AVAILABLE_IN_1_22_8            G_UNAVAILABLE(1,22.8)
+</pre>
+</div>
 </div>
 </div>
 <div class="footer">
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index d215c6c5..2313c69b 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -1206,11 +1206,13 @@
     <keyword type="function" name="nm_setting_ip6_config_get_addr_gen_mode ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-addr-gen-mode" since="1.2"/>
     <keyword type="function" name="nm_setting_ip6_config_get_token ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-token" since="1.4"/>
     <keyword type="function" name="nm_setting_ip6_config_get_dhcp_duid ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-dhcp-duid" since="1.12"/>
+    <keyword type="function" name="nm_setting_ip6_config_get_ra_timeout ()" link="NMSettingIP6Config.html#nm-setting-ip6-config-get-ra-timeout" since="1.24, 1.22.8"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_SETTING_NAME" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-SETTING-NAME:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_IP6_PRIVACY" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-IP6-PRIVACY:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-ADDR-GEN-MODE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_TOKEN" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-TOKEN:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_DHCP_DUID" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-DHCP-DUID:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_IP6_CONFIG_RA_TIMEOUT" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-RA-TIMEOUT:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_IGNORE" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-IGNORE:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_AUTO" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-AUTO:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_DHCP" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-DHCP:CAPS"/>
@@ -1224,6 +1226,7 @@
     <keyword type="property" name="The “addr-gen-mode� property" link="NMSettingIP6Config.html#NMSettingIP6Config--addr-gen-mode"/>
     <keyword type="property" name="The “dhcp-duid� property" link="NMSettingIP6Config.html#NMSettingIP6Config--dhcp-duid"/>
     <keyword type="property" name="The “ip6-privacy� property" link="NMSettingIP6Config.html#NMSettingIP6Config--ip6-privacy"/>
+    <keyword type="property" name="The “ra-timeout� property" link="NMSettingIP6Config.html#NMSettingIP6Config--ra-timeout"/>
     <keyword type="property" name="The “token� property" link="NMSettingIP6Config.html#NMSettingIP6Config--token"/>
     <keyword type="function" name="nm_ip_address_new ()" link="NMSettingIPConfig.html#nm-ip-address-new"/>
     <keyword type="function" name="nm_ip_address_new_binary ()" link="NMSettingIPConfig.html#nm-ip-address-new-binary"/>
@@ -2936,6 +2939,7 @@
     <keyword type="macro" name="NM_AVAILABLE_IN_1_22" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-22:CAPS"/>
     <keyword type="macro" name="NM_DEPRECATED_IN_1_22_2" link="libnm-nm-version.html#NM-DEPRECATED-IN-1-22-2:CAPS"/>
     <keyword type="macro" name="NM_AVAILABLE_IN_1_22_2" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-22-2:CAPS"/>
+    <keyword type="macro" name="NM_AVAILABLE_IN_1_22_8" link="libnm-nm-version.html#NM-AVAILABLE-IN-1-22-8:CAPS"/>
     <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-SERVICE-NAME:CAPS"/>
     <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-DBUS-WATCH-PEER:CAPS"/>
     <keyword type="macro" name="NM_VPN_SERVICE_PLUGIN_STATE" link="libnm-nm-vpn-service-plugin.html#NM-VPN-SERVICE-PLUGIN-STATE:CAPS"/>
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index a08c3b8a..c2a6c21e 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -196,10 +196,10 @@
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMTernary" title="enum NMTernary">NMTernary</a>
     <span class="lineart">├──</span> <a class="link" href="libnm-nm-utils.html#NMUtilsSecurityType" title="enum NMUtilsSecurityType">NMUtilsSecurityType</a>
     <span class="lineart">├──</span> <a class="link" href="NMSettingVlan.html#NMVlanPriorityMap" title="enum NMVlanPriorityMap">NMVlanPriorityMap</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionState">NMVpnConnectionState</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnConnectionStateReason">NMVpnConnectionStateReason</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnPluginFailure">NMVpnPluginFailure</a>
-    <span class="lineart">├──</span> <a href="/usr/share/gtk-doc/html/NetworkManager/nm-vpn-dbus-types.html#NMVpnServiceState">NMVpnServiceState</a>
+    <span class="lineart">├──</span> NMVpnConnectionState
+    <span class="lineart">├──</span> NMVpnConnectionStateReason
+    <span class="lineart">├──</span> NMVpnPluginFailure
+    <span class="lineart">├──</span> NMVpnServiceState
     <span class="lineart">├──</span> <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType">NMWepKeyType</a>
     <span class="lineart">╰──</span> <a class="link" href="libnm-nm-dbus-interface.html#NMWimaxNspNetworkType" title="enum NMWimaxNspNetworkType">NMWimaxNspNetworkType</a>
     <a href="/usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 97924be9..73d434ae 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.22.4
+  NetworkManager version: 1.22.8
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 8760e3c1..bdad6694 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -1516,6 +1516,7 @@ NMLDBusPropertVTableO
 NMLDBusPropertyO
 nml_dbus_property_o_get_obj
 nml_dbus_property_o_is_ready
+nml_dbus_property_o_is_ready_fully
 nml_dbus_property_o_clear
 nml_dbus_property_o_clear_many
 nml_dbus_property_o_notify_changed_many
@@ -2703,6 +2704,7 @@ NM_SETTING_IP6_CONFIG_IP6_PRIVACY
 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE
 NM_SETTING_IP6_CONFIG_TOKEN
 NM_SETTING_IP6_CONFIG_DHCP_DUID
+NM_SETTING_IP6_CONFIG_RA_TIMEOUT
 NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 NM_SETTING_IP6_CONFIG_METHOD_AUTO
 NM_SETTING_IP6_CONFIG_METHOD_DHCP
@@ -2718,6 +2720,7 @@ nm_setting_ip6_config_get_ip6_privacy
 nm_setting_ip6_config_get_addr_gen_mode
 nm_setting_ip6_config_get_token
 nm_setting_ip6_config_get_dhcp_duid
+nm_setting_ip6_config_get_ra_timeout
 <SUBSECTION Standard>
 NMSettingIP6ConfigClass
 NM_IS_SETTING_IP6_CONFIG
@@ -4062,6 +4065,7 @@ NM_AVAILABLE_IN_1_22
 NM_DEPRECATED_IN_1_22_2
 NM_DEPRECATED_IN_1_22_2_FOR
 NM_AVAILABLE_IN_1_22_2
+NM_AVAILABLE_IN_1_22_8
 </SECTION>
 
 <SECTION>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 2a0ba77c..229a27c6 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.22.4
+1.22.8
diff --git a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
index 9068f071..693d26b5 100644
--- a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
+++ b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
@@ -10,6 +10,15 @@
     <annotation name="org.gtk.GDBus.C.Name" value="Wifi_P2P_Peer"/>
 
     <!--
+        Name:
+
+        Device name.
+
+        Since: 1.16
+    -->
+    <property name="Name" type="s" access="read"/>
+
+    <!--
         Flags:
 
         Flags describing the capabilities of the access point.
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index 4c72590e..469d4161 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -188,9 +188,12 @@ links = [
   libnm_libnm_core_intern,
 ]
 
+libnm_core_c_args = common_c_flags
+
 if enable_json_validation
   libnm_core_sources += files('nm-json.c')
   deps += jansson_dep
+  libnm_core_c_args += ['-fcommon']
 endif
 
 libnm_core = static_library(
@@ -198,7 +201,7 @@ libnm_core = static_library(
   sources: libnm_core_sources + libnm_core_enum_sources + nm_meta_setting_source + [nm_version_macro_header],
   include_directories: top_inc,
   dependencies: deps,
-  c_args: common_c_flags,
+  c_args: libnm_core_c_args,
   link_with: links,
 )
 
diff --git a/libnm-core/nm-connection-private.h b/libnm-core/nm-connection-private.h
index ea7583e0..034c350f 100644
--- a/libnm-core/nm-connection-private.h
+++ b/libnm-core/nm-connection-private.h
@@ -27,6 +27,7 @@ int _nm_setting_ovs_interface_verify_interface_type (NMSettingOvsInterface *self
                                                      NMConnection *connection,
                                                      gboolean normalize,
                                                      gboolean *out_modified,
+                                                     const char **normalized_type,
                                                      GError **error);
 
 #endif  /* __NM_CONNECTION_PRIVATE_H__ */
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 307b9d62..4146fd55 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -1235,6 +1235,7 @@ _normalize_ovs_interface_type (NMConnection *self)
 	                                                     self,
 	                                                     TRUE,
 	                                                     &modified,
+	                                                     NULL,
 	                                                     NULL);
 	if (v != TRUE)
 		g_return_val_if_reached (modified);
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index 52da8ccf..f4c35663 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -225,7 +225,7 @@ validate_ifname (const char *name, const char *value)
 	if (!value || !value[0])
 		return FALSE;
 
-	return nm_utils_is_valid_iface_name (value, NULL);
+	return nm_utils_ifname_valid_kernel (value, NULL);
 }
 
 /**
@@ -611,7 +611,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	if (strcmp (mode_new, "active-backup") == 0) {
 		GError *tmp_error = NULL;
 
-		if (primary && !nm_utils_is_valid_iface_name (primary, &tmp_error)) {
+		if (primary && !nm_utils_ifname_valid_kernel (primary, &tmp_error)) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index a13e3f23..17058ea7 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -973,20 +973,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		return FALSE;
 	}
 
-	if (priv->interface_name) {
-		GError *tmp_error = NULL;
-
-		if (!nm_utils_is_valid_iface_name (priv->interface_name, &tmp_error)) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             "'%s': %s", priv->interface_name, tmp_error->message);
-			g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME);
-			g_error_free (tmp_error);
-			return FALSE;
-		}
-	}
-
 	type = priv->type;
 	if (!type) {
 		if (   !connection
@@ -1044,6 +1030,34 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
+	if (priv->interface_name) {
+		GError *tmp_error = NULL;
+		gboolean valid_ifname = FALSE;
+
+		/* do not perform a interface name length check for OVS connection types
+		 * as they don't have a corresponding kernel link that enforces the 15 bytes limit.
+		 * Here we're whitelisting the OVS interface type as well, even if most OVS
+		 * iface types do have the limit, to let the OVS specific nm-setting verify whether the iface name
+		 * is good or not according to the internal type (internal, patch, ...) */
+		if (NM_IN_STRSET (type,
+		                  NM_SETTING_OVS_BRIDGE_SETTING_NAME,
+		                  NM_SETTING_OVS_PORT_SETTING_NAME,
+		                  NM_SETTING_OVS_INTERFACE_SETTING_NAME))
+			valid_ifname = nm_utils_ifname_valid (priv->interface_name, NMU_IFACE_OVS, &tmp_error);
+		else
+			valid_ifname = nm_utils_ifname_valid (priv->interface_name, NMU_IFACE_KERNEL, &tmp_error);
+
+		if (!valid_ifname) {
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             "'%s': %s", priv->interface_name, tmp_error->message);
+			g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME);
+			g_error_free (tmp_error);
+			return FALSE;
+		}
+	}
+
 	is_slave = FALSE;
 	slave_setting_type = NULL;
 	slave_type = priv->slave_type;
@@ -1276,7 +1290,7 @@ nm_setting_connection_set_interface_name (NMSetting *setting,
 	 * overridden by a valid connection.interface-name.
 	 */
 	interface_name = find_virtual_interface_name (connection_dict);
-	if (!interface_name || nm_utils_is_valid_iface_name (interface_name, NULL))
+	if (!interface_name || nm_utils_ifname_valid_kernel (interface_name, NULL))
 		interface_name = g_variant_get_string (value, NULL);
 
 	g_object_set (G_OBJECT (setting),
@@ -2173,13 +2187,16 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 *
 	 * 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.
-	 *
-	 * This feature requires a plugin which supports mDNS. One such
-	 * plugin is dns-systemd-resolved.
+	 * The permitted values are: "yes" (2) register hostname and resolving
+	 * for the connection, "no" (0) disable mDNS for the interface, "resolve"
+	 * (1) do not register hostname but allow resolving of mDNS host names
+	 * and "default" (-1) to allow lookup of a global default in NetworkManager.conf.
+	 * If unspecified, "default" ultimately depends on the DNS plugin (which
+	 * for systemd-resolved currently means "no").
 	 *
+	 * This feature requires a plugin which supports mDNS. Otherwise the
+	 * setting has no effect. One such plugin is dns-systemd-resolved.
+*
 	 * Since: 1.12
 	 **/
 	/* ---ifcfg-rh---
@@ -2206,12 +2223,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
 	 * System (DNS) packet format that allows both IPv4 and IPv6 hosts
 	 * to perform name resolution for hosts on the same local link.
 	 *
-	 * The permitted values are: yes: register hostname and resolving
-	 * for the connection, no: disable LLMNR for the interface, resolve:
-	 * do not register hostname but allow resolving of LLMNR host names.
+	 * The permitted values are: "yes" (2) register hostname and resolving
+	 * for the connection, "no" (0) disable LLMNR for the interface, "resolve"
+	 * (1) do not register hostname but allow resolving of LLMNR host names
+	 * If unspecified, "default" ultimately depends on the DNS plugin (which
+	 * for systemd-resolved currently means "yes").
 	 *
-	 * This feature requires a plugin which supports LLMNR. One such
-	 * plugin is dns-systemd-resolved.
+	 * This feature requires a plugin which supports LLMNR. Otherwise the
+	 * setting has no effect. One such plugin is dns-systemd-resolved.
 	 *
 	 * Since: 1.14
 	 **/
diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c
index d03a7a2a..fcaa1f9a 100644
--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@@ -177,7 +177,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	if (priv->parent) {
 		GError *tmp_error = NULL;
 
-		if (!nm_utils_is_valid_iface_name (priv->parent, &tmp_error)) {
+		if (!nm_utils_ifname_valid_kernel (priv->parent, &tmp_error)) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
@@ -214,7 +214,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 		if (!interface_name)
 			;
-		else if (!nm_utils_is_valid_iface_name (interface_name, &tmp_error)) {
+		else if (!nm_utils_ifname_valid_kernel (interface_name, &tmp_error)) {
 			/* report the error for NMSettingConnection:interface-name, because
 			 * it's that property that is invalid -- although we currently verify()
 			 * NMSettingInfiniband.
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 49a3efbd..7f1690ac 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -4921,7 +4921,7 @@ verify_label (const char *label)
 	if (!p)
 		return FALSE;
 	iface = g_strndup (label, p - label);
-	if (!nm_utils_is_valid_iface_name (iface, NULL)) {
+	if (!nm_utils_ifname_valid_kernel (iface, NULL)) {
 		g_free (iface);
 		return FALSE;
 	}
@@ -5637,10 +5637,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	 * 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.  Negative values have the special
+	 * devices have configurations with the same priority, VPNs will be
+	 * considered first, then devices with the best (lowest metric) default
+	 * route and then all other devices.  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
+	 * so in presence of at least one negative priority, only DNS servers from
 	 * connections with the lowest priority value will be used.
 	 *
 	 * When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or
@@ -5871,7 +5872,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
 	/**
 	 * NMSettingIPConfig:dhcp-timeout:
 	 *
-	 * A timeout for a DHCP transaction in seconds.
+	 * A timeout for a DHCP transaction in seconds. If zero (the default), a
+	 * globally configured default is used. If still unspecified, a device specific
+	 * timeout is used (usually 45 seconds).
+	 *
+	 * Set to 2147483647 (MAXINT32) for infinity.
 	 **/
 	obj_properties[PROP_DHCP_TIMEOUT] =
 	    g_param_spec_int (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", "",
diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c
index 3df89cdd..ae1df194 100644
--- a/libnm-core/nm-setting-ip-tunnel.c
+++ b/libnm-core/nm-setting-ip-tunnel.c
@@ -329,7 +329,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	}
 
 	if (   priv->parent
-	    && !nm_utils_is_valid_iface_name (priv->parent, NULL)
+	    && !nm_utils_ifname_valid_kernel (priv->parent, NULL)
 	    && !nm_utils_is_uuid (priv->parent)) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index 4cbda830..f3306ade 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -43,13 +43,15 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_ADDR_GEN_MODE,
 	PROP_TOKEN,
 	PROP_DHCP_DUID,
+	PROP_RA_TIMEOUT,
 );
 
 typedef struct {
-	NMSettingIP6ConfigPrivacy ip6_privacy;
-	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
 	char *token;
 	char *dhcp_duid;
+	NMSettingIP6ConfigPrivacy ip6_privacy;
+	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
+	gint32 ra_timeout;
 } NMSettingIP6ConfigPrivate;
 
 G_DEFINE_TYPE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING_IP_CONFIG)
@@ -134,6 +136,23 @@ nm_setting_ip6_config_get_dhcp_duid (NMSettingIP6Config *setting)
 	return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->dhcp_duid;
 }
 
+/**
+ * nm_setting_ip6_config_get_ra_timeout:
+ * @setting: the #NMSettingIP6Config
+ *
+ * Returns: The configured %NM_SETTING_IP6_CONFIG_RA_TIMEOUT value with the
+ * timeout for router advertisements in seconds.
+ *
+ * Since: 1.24, 1.22.8
+ **/
+gint32
+nm_setting_ip6_config_get_ra_timeout (NMSettingIP6Config *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), 0);
+
+	return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->ra_timeout;
+}
+
 static gboolean
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -475,6 +494,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_DHCP_DUID:
 		g_value_set_string (value, priv->dhcp_duid);
 		break;
+	case PROP_RA_TIMEOUT:
+		g_value_set_int (value, priv->ra_timeout);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -502,6 +524,9 @@ set_property (GObject *object, guint prop_id,
 		g_free (priv->dhcp_duid);
 		priv->dhcp_duid = g_value_dup_string (value);
 		break;
+	case PROP_RA_TIMEOUT:
+		priv->ra_timeout = g_value_get_int (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -658,6 +683,14 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	 */
 
 	/* ---ifcfg-rh---
+	 * property: dhcp-timeout
+	 * variable: IPV6_DHCP_TIMEOUT(+)
+	 * description: A timeout after which the DHCP transaction fails in case of no response.
+	 * example: IPV6_DHCP_TIMEOUT=10
+	 * ---end---
+	 */
+
+	/* ---ifcfg-rh---
 	 * property: dhcp-hostname-flags
 	 * variable: DHCPV6_HOSTNAME_FLAGS
 	 * description: flags for the DHCP hostname property
@@ -829,6 +862,32 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass)
 	                         G_PARAM_STATIC_STRINGS);
 
 	/**
+	 * NMSettingIP6Config:ra-timeout:
+	 *
+	 * A timeout for waiting Router Advertisements in seconds. If zero (the default), a
+	 * globally configured default is used. If still unspecified, the timeout depends on the
+	 * sysctl settings of the device.
+	 *
+	 * Set to 2147483647 (MAXINT32) for infinity.
+	 *
+	 * Since: 1.24, 1.22.8
+	 **/
+	/* ---ifcfg-rh---
+	 * property: dhcp-timeout
+	 * variable: IPV6_RA_TIMEOUT(+)
+	 * description: A timeout for waiting Router Advertisements in seconds.
+	 * example: IPV6_RA_TIMEOUT=10
+	 * ---end---
+	 */
+
+	obj_properties[PROP_RA_TIMEOUT] =
+	    g_param_spec_int (NM_SETTING_IP6_CONFIG_RA_TIMEOUT, "", "",
+	                      0, G_MAXINT32, 0,
+	                      G_PARAM_READWRITE |
+	                      NM_SETTING_PARAM_FUZZY_IGNORE |
+	                      G_PARAM_STATIC_STRINGS);
+
+	/**
 	 * NMSettingIP6Config:dhcp-duid:
 	 *
 	 * A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp
diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h
index 86a39a8e..4173c3b0 100644
--- a/libnm-core/nm-setting-ip6-config.h
+++ b/libnm-core/nm-setting-ip6-config.h
@@ -31,6 +31,8 @@ G_BEGIN_DECLS
 
 #define NM_SETTING_IP6_CONFIG_DHCP_DUID "dhcp-duid"
 
+#define NM_SETTING_IP6_CONFIG_RA_TIMEOUT "ra-timeout"
+
 /**
  * NM_SETTING_IP6_CONFIG_METHOD_IGNORE:
  *
@@ -159,6 +161,8 @@ NM_AVAILABLE_IN_1_4
 const char *nm_setting_ip6_config_get_token (NMSettingIP6Config *setting);
 NM_AVAILABLE_IN_1_12
 const char *nm_setting_ip6_config_get_dhcp_duid (NMSettingIP6Config *setting);
+NM_AVAILABLE_IN_1_22_8
+gint32 nm_setting_ip6_config_get_ra_timeout (NMSettingIP6Config *setting);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c
index cb7778f1..d62184c2 100644
--- a/libnm-core/nm-setting-macvlan.c
+++ b/libnm-core/nm-setting-macvlan.c
@@ -120,7 +120,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 
 	if (priv->parent) {
 		if (   !nm_utils_is_uuid (priv->parent)
-		    && !nm_utils_is_valid_iface_name (priv->parent, NULL)) {
+		    && !nm_utils_ifname_valid_kernel (priv->parent, NULL)) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
diff --git a/libnm-core/nm-setting-ovs-interface.c b/libnm-core/nm-setting-ovs-interface.c
index ecefd6a5..849b9a4e 100644
--- a/libnm-core/nm-setting-ovs-interface.c
+++ b/libnm-core/nm-setting-ovs-interface.c
@@ -67,6 +67,7 @@ _nm_setting_ovs_interface_verify_interface_type (NMSettingOvsInterface *self,
                                                  NMConnection *connection,
                                                  gboolean normalize,
                                                  gboolean *out_modified,
+                                                 const char **normalized_type,
                                                  GError **error)
 {
 	const char *type;
@@ -82,9 +83,11 @@ _nm_setting_ovs_interface_verify_interface_type (NMSettingOvsInterface *self,
 	} else
 		g_return_val_if_fail (!connection || NM_IS_CONNECTION (connection), FALSE);
 
+	g_return_val_if_fail (!normalized_type || !(*normalized_type), FALSE);
+
 	NM_SET_OUT (out_modified, FALSE);
 
-	type = self ? self->type : NULL;
+	type = self->type;
 
 	if (   type
 	    && !NM_IN_STRSET (type, "internal", "system", "patch", "dpdk")) {
@@ -212,6 +215,10 @@ _nm_setting_ovs_interface_verify_interface_type (NMSettingOvsInterface *self,
 		type = "internal";
 	else
 		type = "system";
+
+	if (normalized_type)
+		*normalized_type = type;
+
 normalize:
 	if (!normalize) {
 		if (!self) {
@@ -246,9 +253,11 @@ static int
 verify (NMSetting *setting, NMConnection *connection, GError **error)
 {
 	NMSettingOvsInterface *self = NM_SETTING_OVS_INTERFACE (setting);
+	NMSettingConnection *s_con = NULL;
+	const char *normalized_type = NULL;
+	int result = NM_SETTING_VERIFY_ERROR;
 
 	if (connection) {
-		NMSettingConnection *s_con;
 		const char *slave_type;
 
 		s_con = nm_connection_get_setting_connection (connection);
@@ -286,11 +295,39 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 		}
 	}
 
-	return _nm_setting_ovs_interface_verify_interface_type (self,
-	                                                        connection,
-	                                                        FALSE,
-	                                                        NULL,
-	                                                        error);
+	result = _nm_setting_ovs_interface_verify_interface_type (self,
+	                                                          connection,
+	                                                          FALSE,
+	                                                          NULL,
+	                                                          &normalized_type,
+	                                                          error);
+
+	/* From 'man ovs-vswitchd.conf.db': OVS patch interfaces do not have
+	 * a limit on interface name length, all the other types do */
+	if (result != NM_SETTING_VERIFY_ERROR && s_con) {
+		gs_free_error GError *ifname_error = NULL;
+		const char *ifname = nm_setting_connection_get_interface_name (s_con);
+
+		normalized_type = self->type ? self->type : normalized_type;
+
+		if (   ifname
+		    && !nm_streq0 (normalized_type, "patch")
+		    && !nm_utils_ifname_valid (ifname,
+		                               NMU_IFACE_KERNEL,
+		                               &ifname_error)) {
+			g_clear_error (error);
+			g_set_error (error,
+			             NM_CONNECTION_ERROR,
+			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             "'%s': %s", ifname, ifname_error->message);
+			g_prefix_error (error, "%s.%s: ",
+			                NM_SETTING_CONNECTION_SETTING_NAME,
+			                NM_SETTING_CONNECTION_INTERFACE_NAME);
+			return NM_SETTING_VERIFY_ERROR;
+		}
+	}
+
+	return result;
 }
 
 /*****************************************************************************/
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c
index d9ff2a80..0fee96a1 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -149,7 +149,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	}
 
 	if (   priv->parent
-	    && !nm_utils_is_valid_iface_name (priv->parent, &local_error)) {
+	    && !nm_utils_ifname_valid_kernel (priv->parent, &local_error)) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
 		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 84b974dc..30f43760 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -603,7 +603,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 					return FALSE;
 				}
 			}
-		} else if (!nm_utils_is_valid_iface_name (priv->parent, NULL)) {
+		} else if (!nm_utils_ifname_valid_kernel (priv->parent, NULL)) {
 			/* parent must be either a UUID or an interface name */
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c
index d363ff20..4e449bc8 100644
--- a/libnm-core/nm-setting-vxlan.c
+++ b/libnm-core/nm-setting-vxlan.c
@@ -358,7 +358,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	}
 
 	if (   priv->parent
-	    && !nm_utils_is_valid_iface_name (priv->parent, NULL)
+	    && !nm_utils_ifname_valid_kernel (priv->parent, NULL)
 	    && !nm_utils_is_uuid (priv->parent)) {
 		g_set_error (error,
 		             NM_CONNECTION_ERROR,
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 4659734b..90ae4070 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -14,7 +14,6 @@
 #include <libintl.h>
 #include <gmodule.h>
 #include <sys/stat.h>
-#include <net/if.h>
 #include <linux/pkt_sched.h>
 
 #if WITH_JSON_VALIDATION
@@ -4697,7 +4696,7 @@ nm_utils_is_valid_iface_name_utf8safe (const char *utf8safe_name)
 		}
 	}
 
-	return nm_utils_is_valid_iface_name (bin, NULL);
+	return nm_utils_ifname_valid_kernel (bin, NULL);
 }
 
 /**
@@ -4718,45 +4717,9 @@ nm_utils_is_valid_iface_name_utf8safe (const char *utf8safe_name)
 gboolean
 nm_utils_is_valid_iface_name (const char *name, GError **error)
 {
-	int i;
-
-	if (!name) {
-		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-		                     _("interface name is missing"));
-		return FALSE;
-	}
-
-	if (name[0] == '\0') {
-		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-		                     _("interface name is too short"));
-		return FALSE;
-	}
-
-	if (   name[0] == '.'
-	    && (   name[1] == '\0'
-	        || (   name[1] == '.'
-	            && name[2] == '\0'))) {
-		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-		                     _("interface name is reserved"));
-		return FALSE;
-	}
-
-	for (i = 0; i < IFNAMSIZ; i++) {
-		char ch = name[i];
-
-		if (ch == '\0')
-			return TRUE;
-		if (   NM_IN_SET (ch, '/', ':')
-		    || g_ascii_isspace (ch)) {
-			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-			                     _("interface name contains an invalid character"));
-			return FALSE;
-		}
-	}
+	g_return_val_if_fail (!error || !*error, FALSE);
 
-	g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
-	                     _("interface name is longer than 15 characters"));
-	return FALSE;
+	return nm_utils_ifname_valid_kernel (name, error);
 }
 
 /**
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 8cb0ac50..3fd2f346 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -229,6 +229,12 @@
 # define NM_AVAILABLE_IN_1_22_2
 #endif
 
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_22_8
+# define NM_AVAILABLE_IN_1_22_8            G_UNAVAILABLE(1,22.8)
+#else
+# define NM_AVAILABLE_IN_1_22_8
+#endif
+
 /*
  * Synchronous API for calling D-Bus in libnm is deprecated. See
  * https://developer.gnome.org/libnm/stable/usage.html#sync-api
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index c1b7b84a..3b75e0f7 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -8319,6 +8319,193 @@ test_integrate_maincontext (gconstpointer test_data)
 	}
 }
 
+static void
+test_connection_ovs_ifname (gconstpointer test_data)
+{
+	const guint TEST_CASE = GPOINTER_TO_UINT (test_data);
+	gs_unref_object NMConnection *con = NULL;
+	NMSettingConnection *s_con = NULL;
+	NMSettingOvsBridge *s_ovs_bridge = NULL;
+	NMSettingOvsPort *s_ovs_port = NULL;
+	NMSettingOvsInterface *s_ovs_iface = NULL;
+	NMSettingOvsPatch *s_ovs_patch = NULL;
+	const char *ovs_iface_type = NULL;
+
+	switch (TEST_CASE) {
+	case 1:
+		con = nmtst_create_minimal_connection ("test_connection_ovs_ifname_bridge",
+		                                       NULL,
+		                                       NM_SETTING_OVS_BRIDGE_SETTING_NAME, &s_con);
+		s_ovs_bridge = nm_connection_get_setting_ovs_bridge (con);
+		g_assert (s_ovs_bridge);
+		break;
+	case 2:
+		con = nmtst_create_minimal_connection ("test_connection_ovs_ifname_port",
+		                                       NULL,
+		                                       NM_SETTING_OVS_PORT_SETTING_NAME, &s_con);
+
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_MASTER,
+		              "master0",
+		              NM_SETTING_CONNECTION_SLAVE_TYPE,
+		              NM_SETTING_OVS_BRIDGE_SETTING_NAME,
+		              NULL);
+
+		s_ovs_port = nm_connection_get_setting_ovs_port (con);
+		g_assert (s_ovs_port);
+		break;
+	case 3:
+		con = nmtst_create_minimal_connection ("test_connection_ovs_ifname_interface_patch",
+		                                       NULL,
+		                                       NM_SETTING_OVS_INTERFACE_SETTING_NAME, &s_con);
+		s_ovs_iface = nm_connection_get_setting_ovs_interface (con);
+		g_assert (s_ovs_iface);
+
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_MASTER,
+		              "master0",
+		              NM_SETTING_CONNECTION_SLAVE_TYPE,
+		              NM_SETTING_OVS_PORT_SETTING_NAME,
+		              NULL);
+
+		g_object_set (s_ovs_iface,
+		              NM_SETTING_OVS_INTERFACE_TYPE,
+		              "patch",
+		              NULL);
+
+		s_ovs_patch = NM_SETTING_OVS_PATCH (nm_setting_ovs_patch_new());
+		g_assert (s_ovs_patch);
+
+		g_object_set (s_ovs_patch,
+		              NM_SETTING_OVS_PATCH_PEER, "1.2.3.4",
+		              NULL);
+
+		nm_connection_add_setting (con, NM_SETTING (s_ovs_patch));
+		s_ovs_patch = nm_connection_get_setting_ovs_patch (con);
+		g_assert (s_ovs_patch);
+		ovs_iface_type = "patch";
+		break;
+	case 4:
+		con = nmtst_create_minimal_connection ("test_connection_ovs_ifname_interface_internal",
+		                                       NULL,
+		                                       NM_SETTING_OVS_INTERFACE_SETTING_NAME, &s_con);
+		s_ovs_iface = nm_connection_get_setting_ovs_interface (con);
+		g_assert (s_ovs_iface);
+
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_MASTER,
+		              "master0",
+		              NM_SETTING_CONNECTION_SLAVE_TYPE,
+		              NM_SETTING_OVS_PORT_SETTING_NAME,
+		              NULL);
+
+		g_object_set (s_ovs_iface,
+		              NM_SETTING_OVS_INTERFACE_TYPE,
+		              "internal",
+		              NULL);
+		ovs_iface_type = "internal";
+		break;
+	case 5:
+		con = nmtst_create_minimal_connection ("test_connection_ovs_ifname_interface_system",
+		                                       NULL,
+		                                       NM_SETTING_WIRED_SETTING_NAME, &s_con);
+
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_MASTER,
+		              "master0",
+		              NM_SETTING_CONNECTION_SLAVE_TYPE,
+		              NM_SETTING_OVS_PORT_SETTING_NAME,
+		              NULL);
+
+		s_ovs_iface = NM_SETTING_OVS_INTERFACE (nm_setting_ovs_interface_new());
+		g_assert (s_ovs_iface);
+
+		g_object_set (s_ovs_iface,
+		              NM_SETTING_OVS_INTERFACE_TYPE,
+		              "system",
+		              NULL);
+
+		nm_connection_add_setting (con, NM_SETTING (s_ovs_iface));
+		s_ovs_iface = nm_connection_get_setting_ovs_interface (con);
+		g_assert (s_ovs_iface);
+
+		ovs_iface_type = "system";
+		break;
+	case 6:
+		con = nmtst_create_minimal_connection ("test_connection_ovs_ifname_interface_dpdk",
+		                                       NULL,
+		                                       NM_SETTING_OVS_INTERFACE_SETTING_NAME, &s_con);
+		s_ovs_iface = nm_connection_get_setting_ovs_interface (con);
+		g_assert (s_ovs_iface);
+
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_MASTER,
+		              "master0",
+		              NM_SETTING_CONNECTION_SLAVE_TYPE,
+		              NM_SETTING_OVS_PORT_SETTING_NAME,
+		              NULL);
+
+		g_object_set (s_ovs_iface,
+		              NM_SETTING_OVS_INTERFACE_TYPE,
+		              "dpdk",
+		              NULL);
+		ovs_iface_type = "dpdk";
+		break;
+	}
+
+	if (!nm_streq0 (ovs_iface_type, "system")) {
+		/* wrong: contains backward slash */
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs\\0",
+		              NULL);
+		nmtst_assert_connection_unnormalizable (con,
+		                                        NM_CONNECTION_ERROR,
+		                                        NM_CONNECTION_ERROR_INVALID_PROPERTY);
+
+		/* wrong: contains forward slash */
+		g_object_set (s_con,
+		              NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs/0",
+		              NULL);
+		nmtst_assert_connection_unnormalizable (con,
+		                                        NM_CONNECTION_ERROR,
+		                                        NM_CONNECTION_ERROR_INVALID_PROPERTY);
+	}
+
+	/* wrong: contains space */
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs 0",
+	              NULL);
+	nmtst_assert_connection_unnormalizable (con,
+	                                        NM_CONNECTION_ERROR,
+	                                        NM_CONNECTION_ERROR_INVALID_PROPERTY);
+
+	/* good */
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs0",
+	              NULL);
+	nmtst_assert_connection_verifies (con);
+
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs-br0",
+	              NULL);
+	nmtst_assert_connection_verifies (con);
+
+	/* good if bridge, port, or patch interface */
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs123123123123130123123",
+	              NULL);
+
+	if (!ovs_iface_type || nm_streq (ovs_iface_type, "patch"))
+		nmtst_assert_connection_verifies (con);
+	else {
+		nmtst_assert_connection_unnormalizable (con,
+		                                        NM_CONNECTION_ERROR,
+		                                        NM_CONNECTION_ERROR_INVALID_PROPERTY);
+	}
+}
+
+
+
 /*****************************************************************************/
 
 NMTST_DEFINE ();
@@ -8411,6 +8598,13 @@ int main (int argc, char **argv)
 	g_test_add_data_func ("/core/general/test_connection_normalize_ovs_interface_type_ovs_interface/11", GUINT_TO_POINTER (11), test_connection_normalize_ovs_interface_type_ovs_interface);
 	g_test_add_data_func ("/core/general/test_connection_normalize_ovs_interface_type_ovs_interface/12", GUINT_TO_POINTER (12), test_connection_normalize_ovs_interface_type_ovs_interface);
 
+	g_test_add_data_func ("/core/general/test_connection_ovs_ifname/1", GUINT_TO_POINTER (1), test_connection_ovs_ifname);
+	g_test_add_data_func ("/core/general/test_connection_ovs_ifname/2", GUINT_TO_POINTER (2), test_connection_ovs_ifname);
+	g_test_add_data_func ("/core/general/test_connection_ovs_ifname/3", GUINT_TO_POINTER (3), test_connection_ovs_ifname);
+	g_test_add_data_func ("/core/general/test_connection_ovs_ifname/4", GUINT_TO_POINTER (4), test_connection_ovs_ifname);
+	g_test_add_data_func ("/core/general/test_connection_ovs_ifname/5", GUINT_TO_POINTER (5), test_connection_ovs_ifname);
+	g_test_add_data_func ("/core/general/test_connection_ovs_ifname/6", GUINT_TO_POINTER (6), test_connection_ovs_ifname);
+
 	g_test_add_func ("/core/general/test_setting_connection_permissions_helpers", test_setting_connection_permissions_helpers);
 	g_test_add_func ("/core/general/test_setting_connection_permissions_property", test_setting_connection_permissions_property);
 
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 5e6dd230..326383c8 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1657,3 +1657,8 @@ libnm_1_22_2 {
 global:
 	nm_client_get_capabilities;
 } libnm_1_22_0;
+
+libnm_1_22_8 {
+global:
+	nm_setting_ip6_config_get_ra_timeout;
+} libnm_1_22_2;
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index aa8504e6..ade2edbe 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -425,6 +425,33 @@ _nm_active_connection_state_changed_commit (NMActiveConnection *self,
 	                                        _notify_event_state_changed,
 	                                        g_object_ref (self));
 }
+/*****************************************************************************/
+
+static gboolean
+is_ready (NMObject *nmobj)
+{
+	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (nmobj);
+
+	/* Usually, we don't want to expose our NMObject instances until they are fully initialized.
+	 * For NMRemoteSetting this means to wait until GetSettings() returns.
+	 *
+	 * Note that most object types reference each other (directly or indirectly). E.g. the
+	 * NMActiveConnection refers to the NMRemoteConnection and the NMDevice instance. So,
+	 * we don't want to hide them too long, otherwise basically the entire set of objects
+	 * will be hidden until they are all initialized. So, usually, when a NMObject references
+	 * objects that are not yet initialized, that reference will just be NULL but the object
+	 * will be considered ready already.
+	 *
+	 * For NMActiveConnection referencing a NMRemoteConnection don't do that. Here we wait for the
+	 * NMRemoteConnection to be ready as well. This is somewhat arbitrary special casing, but
+	 * the effect is that when nm_client_add_and_activate*() returns, the NMActiveConnection already
+	 * references a initialized NMRemoteConnection.
+	 */
+	if (!nml_dbus_property_o_is_ready_fully (&priv->property_o[PROPERTY_O_IDX_CONNECTION]))
+		return FALSE;
+
+	return NM_OBJECT_CLASS (nm_active_connection_parent_class)->is_ready (nmobj);
+}
 
 /*****************************************************************************/
 
@@ -550,6 +577,8 @@ nm_active_connection_class_init (NMActiveConnectionClass *klass)
 	object_class->get_property = get_property;
 	object_class->finalize     = finalize;
 
+	nm_object_class->is_ready = is_ready;
+
 	_NM_OBJECT_CLASS_INIT_PRIV_PTR_INDIRECT (nm_object_class, NMActiveConnection);
 
 	_NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_N (nm_object_class, NMActiveConnectionPrivate, property_o);
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index eabbe022..0c4daab2 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -1256,7 +1256,7 @@ nml_dbus_object_obj_changed_link (NMClient *self,
 	nm_assert (changed_type != NML_DBUS_OBJ_CHANGED_TYPE_NONE);
 
 	if (!NM_FLAGS_ALL ((NMLDBusObjChangedType ) dbobj->obj_changed_type, changed_type))
-		NML_NMCLIENT_LOG_T (self, "[%s] changed-type 0x%02x linked", dbobj->dbus_path->str, (guint) changed_type);
+		NML_NMCLIENT_LOG_T (self, "[%s]: changed-type 0x%02x linked", dbobj->dbus_path->str, (guint) changed_type);
 
 	if (dbobj->obj_changed_type == NML_DBUS_OBJ_CHANGED_TYPE_NONE) {
 		NMClientPrivate *priv;
@@ -1302,7 +1302,7 @@ nml_dbus_object_obj_changed_consume (NMClient *self,
 	if (dbobj->obj_changed_type == NML_DBUS_OBJ_CHANGED_TYPE_NONE) {
 		c_list_unlink (&dbobj->obj_changed_lst);
 		nm_assert (changed_type_res != NML_DBUS_OBJ_CHANGED_TYPE_NONE);
-		NML_NMCLIENT_LOG_T (self, "[%s] changed-type 0x%02x consumed", dbobj->dbus_path->str, (guint) changed_type_res);
+		NML_NMCLIENT_LOG_T (self, "[%s]: changed-type 0x%02x consumed", dbobj->dbus_path->str, (guint) changed_type_res);
 		return changed_type_res;
 	}
 
@@ -1310,7 +1310,7 @@ nml_dbus_object_obj_changed_consume (NMClient *self,
 
 	nm_assert (!c_list_contains (&priv->obj_changed_lst_head, &dbobj->obj_changed_lst));
 	nm_c_list_move_tail (&priv->obj_changed_lst_head, &dbobj->obj_changed_lst);
-	NML_NMCLIENT_LOG_T (self, "[%s] changed-type 0x%02x consumed  (still has 0x%02x)", dbobj->dbus_path->str, (guint) changed_type_res, (guint) dbobj->obj_changed_type);
+	NML_NMCLIENT_LOG_T (self, "[%s]: changed-type 0x%02x consumed  (still has 0x%02x)", dbobj->dbus_path->str, (guint) changed_type_res, (guint) dbobj->obj_changed_type);
 	return changed_type_res;
 }
 
@@ -1567,6 +1567,14 @@ nml_dbus_property_o_is_ready (const NMLDBusPropertyO *pr_o)
 	       || !pr_o->owner_dbobj;
 }
 
+gboolean
+nml_dbus_property_o_is_ready_fully (const NMLDBusPropertyO *pr_o)
+{
+	return    !pr_o->owner_dbobj
+	       || !pr_o->obj_watcher
+	       || pr_o->nmobj;
+}
+
 static void
 nml_dbus_property_o_notify_changed (NMLDBusPropertyO *pr_o,
                                     NMClient *self)
@@ -2988,9 +2996,12 @@ _dbus_handle_interface_removed (NMClient *self,
 }
 
 static void
-_dbus_managed_objects_changed_cb (const char *object_path,
-                                  GVariant *added_interfaces_and_properties,
-                                  const char *const*removed_interfaces,
+_dbus_managed_objects_changed_cb (GDBusConnection *connection,
+                                  const char *sender_name,
+                                  const char *arg_object_path,
+                                  const char *interface_name,
+                                  const char *signal_name,
+                                  GVariant *parameters,
                                   gpointer user_data)
 {
 	NMClient *self = user_data;
@@ -2998,19 +3009,50 @@ _dbus_managed_objects_changed_cb (const char *object_path,
 	const char *log_context;
 	gboolean changed;
 
+	nm_assert (nm_streq0 (interface_name, DBUS_INTERFACE_OBJECT_MANAGER));
+
 	if (priv->get_managed_objects_cancellable) {
 		/* we still wait for the initial GetManagedObjects(). Ignore the event. */
 		return;
 	}
 
-	if (!added_interfaces_and_properties) {
-		log_context = "interfaces-removed";
-		changed = _dbus_handle_interface_removed (self, log_context, object_path, NULL, removed_interfaces);
-	} else {
+	if (nm_streq (signal_name, "InterfacesAdded")) {
+		gs_unref_variant GVariant *interfaces_and_properties = NULL;
+		const char *object_path;
+
+		if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oa{sa{sv}})")))
+			return;
+
+		g_variant_get (parameters,
+		               "(&o@a{sa{sv}})",
+		               &object_path,
+		               &interfaces_and_properties);
+
 		log_context = "interfaces-added";
-		changed = _dbus_handle_interface_added (self, log_context, object_path, added_interfaces_and_properties);
+		changed = _dbus_handle_interface_added (self, log_context, object_path, interfaces_and_properties);
+		goto out;
+	}
+
+	if (nm_streq (signal_name, "InterfacesRemoved")) {
+		gs_free const char **interfaces = NULL;
+		const char *object_path;
+
+		if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(oas)")))
+			return;
+
+		g_variant_get (parameters,
+		               "(&o^a&s)",
+		               &object_path,
+		               &interfaces);
+
+		log_context = "interfaces-removed";
+		changed = _dbus_handle_interface_removed (self, log_context, object_path, NULL, interfaces);
+		goto out;
 	}
 
+	return;
+
+out:
 	if (changed)
 		_dbus_handle_changes (self, log_context, TRUE);
 }
@@ -5143,7 +5185,7 @@ nm_client_add_and_activate_connection2_finish (NMClient *client,
 {
 	return NM_ACTIVE_CONNECTION (_request_wait_finish (client,
 	                                                   result,
-	                                                   nm_client_add_connection2,
+	                                                   nm_client_add_and_activate_connection2,
 	                                                   out_result,
 	                                                   error));
 }
@@ -6512,12 +6554,13 @@ _init_fetch_all (NMClient *self)
 
 	priv->get_managed_objects_cancellable = g_cancellable_new ();
 
-	priv->dbsid_nm_object_manager = nm_dbus_connection_signal_subscribe_object_manager (priv->dbus_connection,
-	                                                                                    priv->name_owner,
-	                                                                                    "/org/freedesktop",
-	                                                                                    _dbus_managed_objects_changed_cb,
-	                                                                                    self,
-	                                                                                    NULL);
+	priv->dbsid_nm_object_manager = nm_dbus_connection_signal_subscribe_object_manager_plain (priv->dbus_connection,
+	                                                                                          priv->name_owner,
+	                                                                                          "/org/freedesktop",
+	                                                                                          NULL,
+	                                                                                          _dbus_managed_objects_changed_cb,
+	                                                                                          self,
+	                                                                                          NULL);
 
 	priv->dbsid_dbus_properties_properties_changed = nm_dbus_connection_signal_subscribe_properties_changed (priv->dbus_connection,
 	                                                                                                         priv->name_owner,
@@ -7398,6 +7441,18 @@ constructed (GObject *object)
 	NML_NMCLIENT_LOG_D (self, "new NMClient instance");
 }
 
+static inline gboolean
+_dispose_cleanup_context_busy_watcher_cb (gpointer user_data)
+{
+	nm_auto_unref_gmaincontext GMainContext *context = NULL;
+	gs_unref_object GObject *context_busy_watcher = NULL;
+
+	nm_utils_user_data_unpack (user_data, &context, &context_busy_watcher);
+
+	nm_assert (G_IS_OBJECT (context_busy_watcher));
+	return G_SOURCE_REMOVE;
+}
+
 static void
 dispose (GObject *object)
 {
@@ -7446,6 +7501,46 @@ dispose (GObject *object)
 
 	nm_clear_pointer (&priv->udev, udev_unref);
 
+	if (   priv->context_busy_watcher
+	    && priv->dbus_context) {
+		GSource *cleanup_source;
+
+		/* Technically, we cancelled all pending actions (and these actions
+		 * (GTask) keep the context_busy_watcher object alive). Also, we passed
+		 * no destroy notify to g_dbus_connection_signal_subscribe().
+		 * That means, there should be no other unaccounted GSource'es left.
+		 *
+		 * However, we really need to be sure that the context_busy_watcher's
+		 * lifetime matches the time that the context is busy. That is especially
+		 * important with synchronous initialization, where the context-busy-watcher
+		 * keeps the inner GMainContext integrated in the caller's.
+		 * We must not g_source_destroy() that integration too early.
+		 *
+		 * So to be really sure all this is given, always schedule one last
+		 * cleanup idle action with low priority. This should be the last
+		 * thing related to this instance that keeps the context busy.
+		 *
+		 * Note that we could also *not* take a reference on priv->dbus_context
+		 * and unref priv->context_busy_watcher via the GDestroyNotify. That would
+		 * allow for the context to be wrapped up early, and when the last user
+		 * gives up the reference to the context, the destroy notify could complete
+		 * without even invoke the idle handler. However, that destroy notify may
+		 * not be called in the right thread. So, we want to be sure that we unref
+		 * the context-busy-watcher in the right context. Hence, we always take an
+		 * additional reference and always cleanup in the idle handler. This means:
+		 * the user *MUST* always keep iterating the context after NMClient got destroyed.
+		 * But that is not a severe limitation, because the user anyway must be prepared
+		 * to do that. That is because in many cases it is necessary anyway (and the user
+		 * wouldn't know a priory when not). This way, it is just always necessary. */
+		cleanup_source = nm_g_idle_source_new (G_PRIORITY_LOW + 10,
+		                                       _dispose_cleanup_context_busy_watcher_cb,
+		                                       nm_utils_user_data_pack (g_main_context_ref (priv->dbus_context),
+		                                                                g_steal_pointer (&priv->context_busy_watcher)),
+		                                       NULL);
+		g_source_attach (cleanup_source, priv->dbus_context);
+		g_source_unref (cleanup_source);
+	}
+
 	nm_clear_pointer (&priv->dbus_context, g_main_context_unref);
 	nm_clear_pointer (&priv->main_context, g_main_context_unref);
 
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
index 191d30eb..aa5089c7 100644
--- a/libnm/nm-device-wifi-p2p.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -165,8 +165,8 @@ nm_device_wifi_p2p_start_find (NMDeviceWifiP2P *device,
 	                      cancellable,
 	                      callback,
 	                      user_data,
-	                      NM_DBUS_PATH,
-	                      NM_DBUS_INTERFACE,
+	                      _nm_object_get_path (device),
+	                      NM_DBUS_INTERFACE_DEVICE_WIFI_P2P,
 	                      "StartFind",
 	                      g_variant_new ("(@a{sv})", options),
 	                      G_VARIANT_TYPE ("()"),
@@ -224,8 +224,8 @@ nm_device_wifi_p2p_stop_find (NMDeviceWifiP2P     *device,
 	                      cancellable,
 	                      callback,
 	                      user_data,
-	                      NM_DBUS_PATH,
-	                      NM_DBUS_INTERFACE,
+	                      _nm_object_get_path (device),
+	                      NM_DBUS_INTERFACE_DEVICE_WIFI_P2P,
 	                      "StopFind",
 	                      g_variant_new ("()"),
 	                      G_VARIANT_TYPE ("()"),
diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 8ac05d70..9138e08c 100644
--- a/libnm/nm-libnm-utils.h
+++ b/libnm/nm-libnm-utils.h
@@ -210,6 +210,8 @@ gpointer nml_dbus_property_o_get_obj (NMLDBusPropertyO *pr_o);
 
 gboolean nml_dbus_property_o_is_ready (const NMLDBusPropertyO *pr_o);
 
+gboolean nml_dbus_property_o_is_ready_fully (const NMLDBusPropertyO *pr_o);
+
 void nml_dbus_property_o_clear (NMLDBusPropertyO *pr_o,
                                 NMClient *client);
 
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index cdf60f8c..fe5672a1 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -13,9 +13,9 @@
     <property name="id" name_upper="ID" type="string" description="A human readable unique identifier for the connection, like &quot;Work Wi-Fi&quot; or &quot;T-Mobile 3G&quot;." />
     <property name="interface-name" name_upper="INTERFACE_NAME" type="string" description="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 (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface." />
     <property name="lldp" name_upper="LLDP" type="int32" default="-1" description="Whether LLDP is enabled for the connection." />
-    <property name="llmnr" name_upper="LLMNR" type="int32" default="-1" description="Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved." />
+    <property name="llmnr" name_upper="LLMNR" type="int32" default="-1" description="Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: &quot;yes&quot; (2) register hostname and resolving for the connection, &quot;no&quot; (0) disable LLMNR for the interface, &quot;resolve&quot; (1) do not register hostname but allow resolving of LLMNR host names If unspecified, &quot;default&quot; ultimately depends on the DNS plugin (which for systemd-resolved currently means &quot;yes&quot;). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved." />
     <property name="master" name_upper="MASTER" type="string" description="Interface name of the master device or UUID of the master connection." />
-    <property name="mdns" name_upper="MDNS" type="int32" default="-1" description="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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved." />
+    <property name="mdns" name_upper="MDNS" type="int32" default="-1" description="Whether mDNS is enabled for the connection. The permitted values are: &quot;yes&quot; (2) register hostname and resolving for the connection, &quot;no&quot; (0) disable mDNS for the interface, &quot;resolve&quot; (1) do not register hostname but allow resolving of mDNS host names and &quot;default&quot; (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, &quot;default&quot; ultimately depends on the DNS plugin (which for systemd-resolved currently means &quot;no&quot;). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved." />
     <property name="metered" name_upper="METERED" type="NMMetered (int32)" description="Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately." />
     <property name="multi-connect" name_upper="MULTI_CONNECT" type="int32" default="0" description="Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect." />
     <property name="permissions" name_upper="PERMISSIONS" type="array of string" description="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 connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form &quot;[type]:[id]:[reserved]&quot;; for example, &quot;user:dcbw:blah&quot;. At this time only the &quot;user&quot; [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the &quot;:&quot; character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8." />
@@ -177,10 +177,10 @@
     <property name="dhcp-hostname-flags" name_upper="DHCP_HOSTNAME_FLAGS" type="uint32" default="0" description="Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests." />
     <property name="dhcp-iaid" name_upper="DHCP_IAID" type="string" description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; and &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address." />
     <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." />
-    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds." />
+    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity." />
     <property name="dns" name_upper="DNS" type="array of uint32" description="Array of IP addresses of DNS servers." />
     <property name="dns-options" name_upper="DNS_OPTIONS" type="array of string" description="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 use default options. This is distinct from an empty list of properties." />
-    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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." />
+    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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." />
     <property name="dns-search" name_upper="DNS_SEARCH" type="array of string" description="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." />
     <property name="gateway" name_upper="GATEWAY" type="string" description="The gateway associated with this configuration. This is only meaningful if &quot;addresses&quot; is also set." />
     <property name="ignore-auto-dns" name_upper="IGNORE_AUTO_DNS" type="boolean" default="FALSE" description="When &quot;method&quot; is set to &quot;auto&quot; and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the &quot;dns&quot; and &quot;dns-search&quot; properties, if any, are used." />
@@ -201,10 +201,10 @@
     <property name="dhcp-hostname-flags" name_upper="DHCP_HOSTNAME_FLAGS" type="uint32" default="0" description="Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests." />
     <property name="dhcp-iaid" name_upper="DHCP_IAID" type="string" description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; and &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address." />
     <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." />
-    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds." />
+    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity." />
     <property name="dns" name_upper="DNS" type="array of byte array" description="Array of IP addresses of DNS servers." />
     <property name="dns-options" name_upper="DNS_OPTIONS" type="array of string" description="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 use default options. This is distinct from an empty list of properties." />
-    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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." />
+    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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." />
     <property name="dns-search" name_upper="DNS_SEARCH" type="array of string" description="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." />
     <property name="gateway" name_upper="GATEWAY" type="string" description="The gateway associated with this configuration. This is only meaningful if &quot;addresses&quot; is also set." />
     <property name="ignore-auto-dns" name_upper="IGNORE_AUTO_DNS" type="boolean" default="FALSE" description="When &quot;method&quot; is set to &quot;auto&quot; and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the &quot;dns&quot; and &quot;dns-search&quot; properties, if any, are used." />
@@ -213,6 +213,7 @@
     <property name="may-fail" name_upper="MAY_FAIL" type="boolean" default="TRUE" description="If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully." />
     <property name="method" name_upper="METHOD" type="string" description="IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support &quot;disabled&quot;, &quot;auto&quot;, &quot;manual&quot;, and &quot;link-local&quot;. See the subclass-specific documentation for other values. In general, for the &quot;auto&quot; method, properties such as &quot;dns&quot; and &quot;routes&quot; specify information that is added on to the information returned from automatic configuration.  The &quot;ignore-auto-routes&quot; and &quot;ignore-auto-dns&quot; properties modify this behavior. For methods that imply no upstream network, such as &quot;shared&quot; or &quot;link-local&quot;, these properties must be empty. For IPv4 method &quot;shared&quot;, the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared." />
     <property name="never-default" name_upper="NEVER_DEFAULT" type="boolean" default="FALSE" description="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." />
+    <property name="ra-timeout" name_upper="RA_TIMEOUT" type="int32" default="0" description="A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity." />
     <property name="route-metric" name_upper="ROUTE_METRIC" type="int64" default="-1" description="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 device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric." />
     <property name="route-table" name_upper="ROUTE_TABLE" type="uint32" default="0" description="Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager." />
     <property name="routes" name_upper="ROUTES" type="array of legacy IPv6 route struct" description="Array of IP routes." />
diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml
index 08178df5..68f09cdb 100644
--- a/libnm/nm-settings-docs.xml
+++ b/libnm/nm-settings-docs.xml
@@ -13,9 +13,9 @@
     <property name="id" name_upper="ID" type="string" description="A human readable unique identifier for the connection, like &quot;Work Wi-Fi&quot; or &quot;T-Mobile 3G&quot;." />
     <property name="interface-name" name_upper="INTERFACE_NAME" type="string" description="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 (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface." />
     <property name="lldp" name_upper="LLDP" type="int32" default="-1" description="Whether LLDP is enabled for the connection." />
-    <property name="llmnr" name_upper="LLMNR" type="int32" default="-1" description="Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved." />
+    <property name="llmnr" name_upper="LLMNR" type="int32" default="-1" description="Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: &quot;yes&quot; (2) register hostname and resolving for the connection, &quot;no&quot; (0) disable LLMNR for the interface, &quot;resolve&quot; (1) do not register hostname but allow resolving of LLMNR host names If unspecified, &quot;default&quot; ultimately depends on the DNS plugin (which for systemd-resolved currently means &quot;yes&quot;). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved." />
     <property name="master" name_upper="MASTER" type="string" description="Interface name of the master device or UUID of the master connection." />
-    <property name="mdns" name_upper="MDNS" type="int32" default="-1" description="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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved." />
+    <property name="mdns" name_upper="MDNS" type="int32" default="-1" description="Whether mDNS is enabled for the connection. The permitted values are: &quot;yes&quot; (2) register hostname and resolving for the connection, &quot;no&quot; (0) disable mDNS for the interface, &quot;resolve&quot; (1) do not register hostname but allow resolving of mDNS host names and &quot;default&quot; (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, &quot;default&quot; ultimately depends on the DNS plugin (which for systemd-resolved currently means &quot;no&quot;). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved." />
     <property name="metered" name_upper="METERED" type="NMMetered (int32)" description="Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately." />
     <property name="multi-connect" name_upper="MULTI_CONNECT" type="int32" default="0" description="Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect." />
     <property name="permissions" name_upper="PERMISSIONS" type="array of string" description="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 connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form &quot;[type]:[id]:[reserved]&quot;; for example, &quot;user:dcbw:blah&quot;. At this time only the &quot;user&quot; [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the &quot;:&quot; character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8." />
@@ -180,10 +180,10 @@
     <property name="dhcp-hostname-flags" name_upper="DHCP_HOSTNAME_FLAGS" type="uint32" default="0" description="Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests." />
     <property name="dhcp-iaid" name_upper="DHCP_IAID" type="string" description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; and &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address." />
     <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." />
-    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds." />
+    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity." />
     <property name="dns" name_upper="DNS" type="array of uint32" description="Array of IP addresses of DNS servers (as network-byte-order integers)" />
     <property name="dns-options" name_upper="DNS_OPTIONS" type="array of string" description="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 use default options. This is distinct from an empty list of properties." />
-    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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." />
+    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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." />
     <property name="dns-search" name_upper="DNS_SEARCH" type="array of string" description="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." />
     <property name="gateway" name_upper="GATEWAY" type="string" description="The gateway associated with this configuration. This is only meaningful if &quot;addresses&quot; is also set." />
     <property name="ignore-auto-dns" name_upper="IGNORE_AUTO_DNS" type="boolean" default="FALSE" description="When &quot;method&quot; is set to &quot;auto&quot; and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the &quot;dns&quot; and &quot;dns-search&quot; properties, if any, are used." />
@@ -206,10 +206,10 @@
     <property name="dhcp-hostname-flags" name_upper="DHCP_HOSTNAME_FLAGS" type="uint32" default="0" description="Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests." />
     <property name="dhcp-iaid" name_upper="DHCP_IAID" type="string" description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; and &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address." />
     <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." />
-    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds." />
+    <property name="dhcp-timeout" name_upper="DHCP_TIMEOUT" type="int32" default="0" description="A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity." />
     <property name="dns" name_upper="DNS" type="array of byte array" description="Array of IP addresses of DNS servers (in network byte order)" />
     <property name="dns-options" name_upper="DNS_OPTIONS" type="array of string" description="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 use default options. This is distinct from an empty list of properties." />
-    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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." />
+    <property name="dns-priority" name_upper="DNS_PRIORITY" type="int32" default="0" description="DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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." />
     <property name="dns-search" name_upper="DNS_SEARCH" type="array of string" description="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." />
     <property name="gateway" name_upper="GATEWAY" type="string" description="The gateway associated with this configuration. This is only meaningful if &quot;addresses&quot; is also set." />
     <property name="ignore-auto-dns" name_upper="IGNORE_AUTO_DNS" type="boolean" default="FALSE" description="When &quot;method&quot; is set to &quot;auto&quot; and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the &quot;dns&quot; and &quot;dns-search&quot; properties, if any, are used." />
@@ -218,6 +218,7 @@
     <property name="may-fail" name_upper="MAY_FAIL" type="boolean" default="TRUE" description="If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully." />
     <property name="method" name_upper="METHOD" type="string" description="IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support &quot;disabled&quot;, &quot;auto&quot;, &quot;manual&quot;, and &quot;link-local&quot;. See the subclass-specific documentation for other values. In general, for the &quot;auto&quot; method, properties such as &quot;dns&quot; and &quot;routes&quot; specify information that is added on to the information returned from automatic configuration.  The &quot;ignore-auto-routes&quot; and &quot;ignore-auto-dns&quot; properties modify this behavior. For methods that imply no upstream network, such as &quot;shared&quot; or &quot;link-local&quot;, these properties must be empty. For IPv4 method &quot;shared&quot;, the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared." />
     <property name="never-default" name_upper="NEVER_DEFAULT" type="boolean" default="FALSE" description="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." />
+    <property name="ra-timeout" name_upper="RA_TIMEOUT" type="int32" default="0" description="A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity." />
     <property name="route-data" name_upper="ROUTE_DATA" type="array of vardict" description="Array of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes." />
     <property name="route-metric" name_upper="ROUTE_METRIC" type="int64" default="-1" description="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 device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric." />
     <property name="route-table" name_upper="ROUTE_TABLE" type="uint32" default="0" description="Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager." />
diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml
index 7bed7f4d..9934e4de 100644
--- a/libnm/nm-settings-ifcfg-rh-docs.xml
+++ b/libnm/nm-settings-ifcfg-rh-docs.xml
@@ -219,6 +219,7 @@ but in route6-* file instead in the form of command line for &apos;ip route add&
 <property name="ignore-auto-routes" variable="IPV6_PEERROUTES(+)" format="" values="" default="yes" example="" description="IPV6_PEERROUTES has the opposite meaning as &apos;ignore-auto-routes&apos; property."/>
 <property name="ignore-auto-dns" variable="IPV6_PEERDNS(+)" format="" values="" default="yes" example="" description="IPV6_PEERDNS has the opposite meaning as &apos;ignore-auto-dns&apos; property."/>
 <property name="dhcp-hostname" variable="DHCPV6_HOSTNAME" format="" values="" default="" example="" description="Hostname to send the DHCP server."/>
+<property name="dhcp-timeout" variable="IPV6_DHCP_TIMEOUT(+)" format="" values="" default="" example="IPV6_DHCP_TIMEOUT=10" description="A timeout after which the DHCP transaction fails in case of no response."/>
 <property name="never-default" variable="IPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)" format="" values="" default="IPV6_DEFROUTE=yes (when no variable specified)" example="DHCPV6_HOSTNAME_FLAGS=5
 */
 " description="IPV6_DEFROUTE=no tells NetworkManager that this connection
@@ -236,6 +237,7 @@ A negative value prevents DNS from other connections with greater values to be u
 IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no" default="no" example="IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes" description="Configure IPv6 Privacy Extensions for SLAAC (RFC4941)."/>
 <property name="addr-gen-mode" variable="IPV6_ADDR_GEN_MODE" format="" values="IPV6_ADDR_GEN_MODE: eui64, stable-privacy" default="eui64" example="IPV6_ADDR_GEN_MODE=stable-privacy" description="Configure IPv6 Stable Privacy addressing for SLAAC (RFC7217)."/>
 <property name="token" variable="IPV6_TOKEN" format="" values="" default="" example="IPV6_TOKEN=::53" description="The IPv6 tokenized interface identifier token"/>
+<property name="dhcp-timeout" variable="IPV6_RA_TIMEOUT(+)" format="" values="" default="" example="IPV6_RA_TIMEOUT=10" description="A timeout for waiting Router Advertisements in seconds."/>
 <property name="dhcp-duid" variable="DHCPV6_DUID(+)" format="" values="" default="" example="DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01" description="A string sent to the DHCPv6 server to identify the local machine.
 Apart from the special values &quot;lease&quot;, &quot;stable-llt&quot;, &quot;stable-ll&quot;, &quot;stable-uuid&quot;,
 &quot;llt&quot; and &quot;ll&quot; a binary value in hex format is expected. An hex string where
diff --git a/libnm/nm-wifi-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
index 50910445..9edf0848 100644
--- a/libnm/nm-wifi-p2p-peer.c
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -409,15 +409,17 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_wifip2ppeer = NML_DBUS_META_IFACE
 	nm_wifi_p2p_peer_get_type,
 	NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH,
 	NML_DBUS_META_IFACE_DBUS_PROPERTIES (
-		NML_DBUS_META_PROPERTY_INIT_U  ("Flags",        PROP_FLAGS,        NMWifiP2PPeer, _priv.flags        ),
-		NML_DBUS_META_PROPERTY_INIT_S  ("HwAddress",    PROP_HW_ADDRESS,   NMWifiP2PPeer, _priv.hw_address   ),
-		NML_DBUS_META_PROPERTY_INIT_I  ("LastSeen",     PROP_LAST_SEEN,    NMWifiP2PPeer, _priv.last_seen    ),
-		NML_DBUS_META_PROPERTY_INIT_S  ("Manufacturer", PROP_MANUFACTURER, NMWifiP2PPeer, _priv.manufacturer ),
-		NML_DBUS_META_PROPERTY_INIT_S  ("Model",        PROP_MODEL,        NMWifiP2PPeer, _priv.model        ),
-		NML_DBUS_META_PROPERTY_INIT_S  ("ModelNumber",  PROP_MODEL_NUMBER, NMWifiP2PPeer, _priv.model_number ),
-		NML_DBUS_META_PROPERTY_INIT_S  ("Serial",       PROP_SERIAL,       NMWifiP2PPeer, _priv.serial       ),
-		NML_DBUS_META_PROPERTY_INIT_Y  ("Strength",     PROP_STRENGTH,     NMWifiP2PPeer, _priv.strength     ),
-		NML_DBUS_META_PROPERTY_INIT_AY ("WfdIEs",       PROP_WFD_IES,      NMWifiP2PPeer, _priv.wfd_ies      ),
+		NML_DBUS_META_PROPERTY_INIT_U      ("Flags",        PROP_FLAGS,        NMWifiP2PPeer, _priv.flags        ),
+		NML_DBUS_META_PROPERTY_INIT_IGNORE ("Groups",       "as"                                                 ),
+		NML_DBUS_META_PROPERTY_INIT_S      ("HwAddress",    PROP_HW_ADDRESS,   NMWifiP2PPeer, _priv.hw_address   ),
+		NML_DBUS_META_PROPERTY_INIT_I      ("LastSeen",     PROP_LAST_SEEN,    NMWifiP2PPeer, _priv.last_seen    ),
+		NML_DBUS_META_PROPERTY_INIT_S      ("Manufacturer", PROP_MANUFACTURER, NMWifiP2PPeer, _priv.manufacturer ),
+		NML_DBUS_META_PROPERTY_INIT_S      ("Model",        PROP_MODEL,        NMWifiP2PPeer, _priv.model        ),
+		NML_DBUS_META_PROPERTY_INIT_S      ("ModelNumber",  PROP_MODEL_NUMBER, NMWifiP2PPeer, _priv.model_number ),
+		NML_DBUS_META_PROPERTY_INIT_S      ("Name",         PROP_NAME,         NMWifiP2PPeer, _priv.name         ),
+		NML_DBUS_META_PROPERTY_INIT_S      ("Serial",       PROP_SERIAL,       NMWifiP2PPeer, _priv.serial       ),
+		NML_DBUS_META_PROPERTY_INIT_Y      ("Strength",     PROP_STRENGTH,     NMWifiP2PPeer, _priv.strength     ),
+		NML_DBUS_META_PROPERTY_INIT_AY     ("WfdIEs",       PROP_WFD_IES,      NMWifiP2PPeer, _priv.wfd_ies      ),
 	),
 );
 
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 893873c0..61b663c4 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.22\&.4" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.22\&.8" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 670d7c10..b2984e0a 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.22\&.4" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.22\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -267,6 +267,12 @@ rc\-manager
 setting below), the name server there will be localhost only\&. NetworkManager also writes a file
 /run/NetworkManager/no\-stub\-resolv\&.conf
 that contains the original name servers pushed to the DNS plugin\&.
+.sp
+When using
+dnsmasq
+and
+systemd\-resolved
+per\-connection added dns servers will always be queried using the device the connection has been activated on\&.
 .RE
 .PP
 \fIrc\-manager\fR
@@ -648,10 +654,12 @@ If left unspecified, the default value is 3 tries before failing the connection\
 .PP
 \fIconnection\&.llmnr\fR
 .RS 4
+If unspecified, the ultimate default values depends on the DNS plugin\&. With systemd\-resolved the default currently is "yes" (2) and for all other plugins "no" (0)\&.
 .RE
 .PP
 \fIconnection\&.mdns\fR
 .RS 4
+If unspecified, the ultimate default values depends on the DNS plugin\&. With systemd\-resolved the default currently is "no" (0) and for all other plugins also "no" (0)\&.
 .RE
 .PP
 \fIconnection\&.stable\-id\fR
@@ -727,6 +735,11 @@ If unspecified or zero, use 50 for VPN profiles and 100 for other profiles\&.
 If left unspecified, routes are only added to the main table\&. Note that this is different from explicitly selecting the main table 254, because of how NetworkManager removes extraneous routes from the tables\&.
 .RE
 .PP
+\fIipv6\&.ra\-timeout\fR
+.RS 4
+If left unspecified, the default value depends on the sysctl solicitation settings\&.
+.RE
+.PP
 \fIipv6\&.dhcp\-duid\fR
 .RS 4
 If left unspecified, it defaults to "lease"\&.
@@ -985,6 +998,13 @@ Note that your distribution might set
 to strict filtering\&. That works badly with per\-device connectivity checking, which uses SO_BINDDEVICE to send requests on all devices\&. A strict rp_filter setting will reject any response and the connectivity check on all but the best route will fail\&.
 .PP
 .PP
+\fIenabled\fR
+.RS 4
+Whether connectivity check is enabled\&. Note that to enable connectivity check, a valid uri must also be configured\&. The value defaults to true, but since the uri is unset by default, connectivity check may be disabled\&. The main purpose of this option is to have a single flag to disable connectivity check\&. Note that this setting can also be set via D\-Bus API at runtime\&. In that case, the value gets stored in
+/var/lib/NetworkManager/NetworkManager\-intern\&.conf
+file\&.
+.RE
+.PP
 \fIuri\fR
 .RS 4
 The URI of a web page to periodically request when connectivity is being checked\&. This page should return the header "X\-NetworkManager\-Status" with a value of "online"\&. Alternatively, its body content should be set to "NetworkManager is online"\&. The body content check can be controlled by the
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index c0c05147..782f1ab5 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -338,6 +338,10 @@ no-auto-default=*
         setting below), the name server there will be localhost only.
         NetworkManager also writes a file <filename>&nmrundir;/no-stub-resolv.conf</filename>
         that contains the original name servers pushed to the DNS plugin.</para>
+
+        <para>When using <literal>dnsmasq</literal> and <literal>systemd-resolved</literal>
+        per-connection added dns servers will always be queried using
+        the device the connection has been activated on.</para>
         </listitem>
       </varlistentry>
 
@@ -677,9 +681,11 @@ ipv6.ip6-privacy=0
         </varlistentry>
         <varlistentry>
           <term><varname>connection.llmnr</varname></term>
+          <listitem><para>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "yes" (2) and for all other plugins "no" (0).</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.mdns</varname></term>
+          <listitem><para>If unspecified, the ultimate default values depends on the DNS plugin. With systemd-resolved the default currently is "no" (0) and for all other plugins also "no" (0).</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.stable-id</varname></term>
@@ -744,6 +750,10 @@ ipv6.ip6-privacy=0
           </para></listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>ipv6.ra-timeout</varname></term>
+          <listitem><para>If left unspecified, the default value depends on the sysctl solicitation settings.</para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>ipv6.dhcp-duid</varname></term>
           <listitem><para>If left unspecified, it defaults to "lease".</para></listitem>
         </varlistentry>
@@ -1081,6 +1091,19 @@ managed=1
     <para>
       <variablelist>
         <varlistentry>
+          <term><varname>enabled</varname></term>
+          <listitem><para>Whether connectivity check is enabled.
+          Note that to enable connectivity check, a valid uri must
+          also be configured. The value defaults to true, but since
+          the uri is unset by default, connectivity check may be disabled.
+          The main purpose of this option is to have a single flag
+          to disable connectivity check. Note that this setting can
+          also be set via D-Bus API at runtime. In that case, the value gets
+          stored in <filename>/var/lib/NetworkManager/NetworkManager-intern.conf</filename>
+          file.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>uri</varname></term>
           <listitem><para>The URI of a web page to periodically
           request when connectivity is being checked.  This page
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index 9d2b6a51..1963d6df 100644
--- a/man/nm-initrd-generator.8
+++ b/man/nm-initrd-generator.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-initrd-generator
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.22\&.4" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.22\&.8" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index d636f312..d2cfdc4c 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.22\&.4" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.22\&.8" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index 48c204f1..c57f125a 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Open vSwitch support overview
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.22\&.4" "Open vSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.22\&.8" "Open vSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 998f2240..79612d78 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.22\&.4" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.22\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1870,6 +1870,8 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
+l l l l
 l l l l.
 T{
 method
@@ -1957,6 +1959,17 @@ T}:T{
 Hostname to send the DHCP server\&.
 T}
 T{
+dhcp\-timeout
+T}:T{
+IPV6_DHCP_TIMEOUT\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+A timeout after which the DHCP transaction fails in case of no response\&.\fB
+
+Example: \fRIPV6_DHCP_TIMEOUT=10
+T}
+T{
 never\-default
 T}:T{
 IPV6_DEFROUTE\fI(+)\fR, (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)
@@ -2054,6 +2067,17 @@ The IPv6 tokenized interface identifier token\fB
 Example: \fRIPV6_TOKEN=::53
 T}
 T{
+dhcp\-timeout
+T}:T{
+IPV6_RA_TIMEOUT\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+A timeout for waiting Router Advertisements in seconds\&.\fB
+
+Example: \fRIPV6_RA_TIMEOUT=10
+T}
+T{
 dhcp\-duid
 T}:T{
 DHCPV6_DUID\fI(+)\fR
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index fa085417..5b780fb1 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.22.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>
+<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.22.8</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
@@ -334,7 +334,9 @@ Example: </emphasis>DHCP_FQDN=foo.bar.com</entry></row></tbody></tgroup></table>
 
 Example: </emphasis>IPV6ADDR=ab12:9876::1 IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3"</entry></row><row><entry align="left">gateway</entry><entry align="left">IPV6_DEFAULTGW</entry><entry align="left"/><entry align="left">Gateway IP address.<emphasis role="bold">
 
-Example: </emphasis>IPV6_DEFAULTGW=abbe::1</entry></row><row><entry align="left">routes</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">List of static routes. They are not stored in ifcfg-* file, but in route6-* file instead in the form of command line for 'ip route add'.</entry></row><row><entry align="left">ignore-auto-routes</entry><entry align="left">IPV6_PEERROUTES<emphasis>(+)</emphasis></entry><entry align="left">yes</entry><entry align="left">IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property.</entry></row><row><entry align="left">ignore-auto-dns</entry><entry align="left">IPV6_PEERDNS<emphasis>(+)</emphasis></entry><entry align="left">yes</entry><entry align="left">IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property.</entry></row><row><entry align="left">dhcp-hostname</entry><entry align="left">DHCPV6_HOSTNAME</entry><entry align="left"/><entry align="left">Hostname to send the DHCP server.</entry></row><row><entry align="left">never-default</entry><entry align="left">IPV6_DEFROUTE<emphasis>(+)</emphasis>, (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)</entry><entry align="left">IPV6_DEFROUTE=yes (when no variable specified)</entry><entry align="left">IPV6_DEFROUTE=no tells NetworkManager that this connection should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property.<emphasis role="bold">
+Example: </emphasis>IPV6_DEFAULTGW=abbe::1</entry></row><row><entry align="left">routes</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">List of static routes. They are not stored in ifcfg-* file, but in route6-* file instead in the form of command line for 'ip route add'.</entry></row><row><entry align="left">ignore-auto-routes</entry><entry align="left">IPV6_PEERROUTES<emphasis>(+)</emphasis></entry><entry align="left">yes</entry><entry align="left">IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property.</entry></row><row><entry align="left">ignore-auto-dns</entry><entry align="left">IPV6_PEERDNS<emphasis>(+)</emphasis></entry><entry align="left">yes</entry><entry align="left">IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property.</entry></row><row><entry align="left">dhcp-hostname</entry><entry align="left">DHCPV6_HOSTNAME</entry><entry align="left"/><entry align="left">Hostname to send the DHCP server.</entry></row><row><entry align="left">dhcp-timeout</entry><entry align="left">IPV6_DHCP_TIMEOUT<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A timeout after which the DHCP transaction fails in case of no response.<emphasis role="bold">
+
+Example: </emphasis>IPV6_DHCP_TIMEOUT=10</entry></row><row><entry align="left">never-default</entry><entry align="left">IPV6_DEFROUTE<emphasis>(+)</emphasis>, (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)</entry><entry align="left">IPV6_DEFROUTE=yes (when no variable specified)</entry><entry align="left">IPV6_DEFROUTE=no tells NetworkManager that this connection should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property.<emphasis role="bold">
 
 Example: </emphasis>DHCPV6_HOSTNAME_FLAGS=5 */ </entry></row><row><entry align="left">may-fail</entry><entry align="left">IPV6_FAILURE_FATAL<emphasis>(+)</emphasis></entry><entry align="left">no</entry><entry align="left">IPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property.</entry></row><row><entry align="left">route-metric</entry><entry align="left">IPV6_ROUTE_METRIC<emphasis>(+)</emphasis></entry><entry align="left">-1</entry><entry align="left">IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection. If set to -1, a default metric based on the device type is used.</entry></row><row><entry align="left">route-table</entry><entry align="left">IPV6_ROUTE_TABLE<emphasis>(+)</emphasis></entry><entry align="left">0</entry><entry align="left">IPV6_ROUTE_TABLE enables policy-routing and sets the default routing table.</entry></row><row><entry align="left">dns-priority</entry><entry align="left">IPV6_DNS_PRIORITY<emphasis>(+)</emphasis></entry><entry align="left">0</entry><entry align="left">The priority for DNS servers of this connection. Lower values have higher priority. If zero, the default value will be used (50 for VPNs, 100 for other connections). A negative value prevents DNS from other connections with greater values to be used.<emphasis role="bold">
 
@@ -350,7 +352,9 @@ Example: </emphasis>IPV6_ADDR_GEN_MODE=stable-privacy<emphasis role="bold">
 
 Allowed values: </emphasis>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</entry></row><row><entry align="left">token</entry><entry align="left">IPV6_TOKEN</entry><entry align="left"/><entry align="left">The IPv6 tokenized interface identifier token<emphasis role="bold">
 
-Example: </emphasis>IPV6_TOKEN=::53</entry></row><row><entry align="left">dhcp-duid</entry><entry align="left">DHCPV6_DUID<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A string sent to the DHCPv6 server to identify the local machine. Apart from the special values "lease", "stable-llt", "stable-ll", "stable-uuid", "llt" and "ll" a binary value in hex format is expected. An hex string where each octet is separated by a colon is also accepted.<emphasis role="bold">
+Example: </emphasis>IPV6_TOKEN=::53</entry></row><row><entry align="left">dhcp-timeout</entry><entry align="left">IPV6_RA_TIMEOUT<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A timeout for waiting Router Advertisements in seconds.<emphasis role="bold">
+
+Example: </emphasis>IPV6_RA_TIMEOUT=10</entry></row><row><entry align="left">dhcp-duid</entry><entry align="left">DHCPV6_DUID<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A string sent to the DHCPv6 server to identify the local machine. Apart from the special values "lease", "stable-llt", "stable-ll", "stable-uuid", "llt" and "ll" a binary value in hex format is expected. An hex string where each octet is separated by a colon is also accepted.<emphasis role="bold">
 
 Example: </emphasis>DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01</entry></row></tbody></tgroup></table><table><title>match setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>ovs-bridge setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>ovs-dpdk setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>ovs-interface setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>ovs-patch setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>ovs-port setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>proxy setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">method</entry><entry align="left">PROXY_METHOD<emphasis>(+)</emphasis></entry><entry align="left">none</entry><entry align="left">Method for proxy configuration. For "auto", WPAD is used for proxy configuration, or set the PAC file via PAC_URL or PAC_SCRIPT.<emphasis role="bold">
 
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index 348b33a7..1cb8ac36 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.22\&.4" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.22\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 496596ee..f0e5797b 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.22.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>
+<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.22.8</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 fba95092..68b5fe35 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.22\&.4" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.22\&.8" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -186,7 +186,7 @@ int32
 T}:T{
 \-1
 T}:T{
-Whether Link\-Local Multicast Name Resolution (LLMNR) is enabled for the connection\&. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link\&. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names\&. This feature requires a plugin which supports LLMNR\&. One such plugin is dns\-systemd\-resolved\&.
+Whether Link\-Local Multicast Name Resolution (LLMNR) is enabled for the connection\&. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link\&. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd\-resolved currently means "yes")\&. This feature requires a plugin which supports LLMNR\&. Otherwise the setting has no effect\&. One such plugin is dns\-systemd\-resolved\&.
 T}
 T{
 master
@@ -204,7 +204,7 @@ int32
 T}:T{
 \-1
 T}:T{
-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\&. This feature requires a plugin which supports mDNS\&. One such plugin is dns\-systemd\-resolved\&.
+Whether mDNS is enabled for the connection\&. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (\-1) to allow lookup of a global default in NetworkManager\&.conf\&. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd\-resolved currently means "no")\&. This feature requires a plugin which supports mDNS\&. Otherwise the setting has no effect\&. One such plugin is dns\-systemd\-resolved\&.
 T}
 T{
 metered
@@ -1829,7 +1829,7 @@ int32
 T}:T{
 0
 T}:T{
-A timeout for a DHCP transaction in seconds\&.
+A timeout for a DHCP transaction in seconds\&. If zero (the default), a globally configured default is used\&. If still unspecified, a device specific timeout is used (usually 45 seconds)\&. Set to 2147483647 (MAXINT32) for infinity\&.
 T}
 T{
 dns
@@ -1856,7 +1856,7 @@ int32
 T}:T{
 0
 T}:T{
-DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&. Zero selects a globally configured default value\&. If the latter is missing or zero too, it defaults to 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\&.  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 Conditional Forwarding 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 \*(Aq~\&.\*(Aq 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\&.
+DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&. Zero selects a globally configured default value\&. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices\&.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used\&. When using a DNS resolver that supports Conditional Forwarding 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 \*(Aq~\&.\*(Aq 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\&.
 T}
 T{
 dns\-search
@@ -2000,6 +2000,7 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 addr\-gen\-mode
@@ -2089,7 +2090,7 @@ int32
 T}:T{
 0
 T}:T{
-A timeout for a DHCP transaction in seconds\&.
+A timeout for a DHCP transaction in seconds\&. If zero (the default), a globally configured default is used\&. If still unspecified, a device specific timeout is used (usually 45 seconds)\&. Set to 2147483647 (MAXINT32) for infinity\&.
 T}
 T{
 dns
@@ -2116,7 +2117,7 @@ int32
 T}:T{
 0
 T}:T{
-DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&. Zero selects a globally configured default value\&. If the latter is missing or zero too, it defaults to 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\&.  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 Conditional Forwarding 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 \*(Aq~\&.\*(Aq 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\&.
+DNS servers priority\&. The relative priority for DNS servers specified by this setting\&.  A lower value is better (higher priority)\&. Zero selects a globally configured default value\&. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices\&.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used\&. When using a DNS resolver that supports Conditional Forwarding 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 \*(Aq~\&.\*(Aq 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\&.
 T}
 T{
 dns\-search
@@ -2191,6 +2192,15 @@ T}:T{
 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\&.
 T}
 T{
+ra\-timeout
+T}:T{
+int32
+T}:T{
+0
+T}:T{
+A timeout for waiting Router Advertisements in seconds\&. If zero (the default), a globally configured default is used\&. If still unspecified, the timeout depends on the sysctl settings of the device\&. Set to 2147483647 (MAXINT32) for infinity\&.
+T}
+T{
 route\-data
 T}:T{
 array of vardict
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index a5c94d69..e86093ba 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.22.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>
+<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.22.8</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
@@ -43,9 +43,9 @@
     <row><entry align="left" id="nm-settings.property.connection.id">id</entry><entry align="left">string</entry><entry align="left"/><entry>A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".</entry></row>
     <row><entry align="left" id="nm-settings.property.connection.interface-name">interface-name</entry><entry align="left">string</entry><entry align="left"/><entry>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 (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.</entry></row>
     <row><entry align="left" id="nm-settings.property.connection.lldp">lldp</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Whether LLDP is enabled for the connection.</entry></row>
-    <row><entry align="left" id="nm-settings.property.connection.llmnr">llmnr</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: yes: register hostname and resolving for the connection, no: disable LLMNR for the interface, resolve: do not register hostname but allow resolving of LLMNR host names. This feature requires a plugin which supports LLMNR. One such plugin is dns-systemd-resolved.</entry></row>
+    <row><entry align="left" id="nm-settings.property.connection.llmnr">llmnr</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable LLMNR for the interface, "resolve" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "yes"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</entry></row>
     <row><entry align="left" id="nm-settings.property.connection.master">master</entry><entry align="left">string</entry><entry align="left"/><entry>Interface name of the master device or UUID of the master connection.</entry></row>
-    <row><entry align="left" id="nm-settings.property.connection.mdns">mdns</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>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. This feature requires a plugin which supports mDNS. One such plugin is dns-systemd-resolved.</entry></row>
+    <row><entry align="left" id="nm-settings.property.connection.mdns">mdns</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Whether mDNS is enabled for the connection. The permitted values are: "yes" (2) register hostname and resolving for the connection, "no" (0) disable mDNS for the interface, "resolve" (1) do not register hostname but allow resolving of mDNS host names and "default" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, "default" ultimately depends on the DNS plugin (which for systemd-resolved currently means "no"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.</entry></row>
     <row><entry align="left" id="nm-settings.property.connection.metered">metered</entry><entry align="left">NMMetered (int32)</entry><entry align="left"/><entry>Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.</entry></row>
     <row><entry align="left" id="nm-settings.property.connection.multi-connect">multi-connect</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.</entry></row>
     <row><entry align="left" id="nm-settings.property.connection.permissions">permissions</entry><entry align="left">array of string</entry><entry align="left"/><entry>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 connection; otherwise users are allowed if and only if they are in this list.  When this is not empty, the connection can be active only when one of the specified users is logged into an active session.  Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.</entry></row>
@@ -210,10 +210,10 @@
     <row><entry align="left" id="nm-settings.property.ipv4.dhcp-hostname-flags">dhcp-hostname-flags</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dhcp-iaid">dhcp-iaid</entry><entry align="left">string</entry><entry align="left"/><entry>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</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>
-    <row><entry align="left" id="nm-settings.property.ipv4.dhcp-timeout">dhcp-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds.</entry></row>
+    <row><entry align="left" id="nm-settings.property.ipv4.dhcp-timeout">dhcp-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dns">dns</entry><entry align="left">array of uint32</entry><entry align="left"/><entry>Array of IP addresses of DNS servers (as network-byte-order integers)</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dns-options">dns-options</entry><entry align="left">array of string</entry><entry align="left"/><entry>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 use default options. This is distinct from an empty list of properties.</entry></row>
-    <row><entry align="left" id="nm-settings.property.ipv4.dns-priority">dns-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</entry></row>
+    <row><entry align="left" id="nm-settings.property.ipv4.dns-priority">dns-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.dns-search">dns-search</entry><entry align="left">array of string</entry><entry align="left"/><entry>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.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.gateway">gateway</entry><entry align="left">string</entry><entry align="left"/><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv4.ignore-auto-dns">ignore-auto-dns</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
@@ -236,10 +236,10 @@
     <row><entry align="left" id="nm-settings.property.ipv6.dhcp-hostname-flags">dhcp-hostname-flags</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.dhcp-iaid">dhcp-iaid</entry><entry align="left">string</entry><entry align="left"/><entry>A string containing the "Identity Association Identifier" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among "mac", "perm-mac", "ifname" and "stable". When set to "mac" (or "perm-mac"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to "ifname", the IAID is computed by hashing the interface name. The special value "stable" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be "ifname". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.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>
-    <row><entry align="left" id="nm-settings.property.ipv6.dhcp-timeout">dhcp-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds.</entry></row>
+    <row><entry align="left" id="nm-settings.property.ipv6.dhcp-timeout">dhcp-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.dns">dns</entry><entry align="left">array of byte array</entry><entry align="left"/><entry>Array of IP addresses of DNS servers (in network byte order)</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.dns-options">dns-options</entry><entry align="left">array of string</entry><entry align="left"/><entry>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 use default options. This is distinct from an empty list of properties.</entry></row>
-    <row><entry align="left" id="nm-settings.property.ipv6.dns-priority">dns-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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.  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 Conditional Forwarding 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.</entry></row>
+    <row><entry align="left" id="nm-settings.property.ipv6.dns-priority">dns-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 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, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding 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.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.dns-search">dns-search</entry><entry align="left">array of string</entry><entry align="left"/><entry>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.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.gateway">gateway</entry><entry align="left">string</entry><entry align="left"/><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.ignore-auto-dns">ignore-auto-dns</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row>
@@ -248,6 +248,7 @@
     <row><entry align="left" id="nm-settings.property.ipv6.may-fail">may-fail</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.method">method</entry><entry align="left">string</entry><entry align="left"/><entry>IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "disabled", "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.never-default">never-default</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>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.</entry></row>
+    <row><entry align="left" id="nm-settings.property.ipv6.ra-timeout">ra-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.route-data">route-data</entry><entry align="left">array of vardict</entry><entry align="left"/><entry>Array of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.route-metric">route-metric</entry><entry align="left">int64</entry><entry align="left">-1</entry><entry>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 device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.</entry></row>
     <row><entry align="left" id="nm-settings.property.ipv6.route-table">route-table</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.</entry></row>
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index 03674e93..9d2c8b7a 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.22\&.4" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.22\&.8" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index 88fccd93..77908f7c 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.22\&.4" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.22\&.8" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index 00e34491..f4591525 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: 01/10/2020
+.\"      Date: 02/18/2020
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.22.4
+.\"    Source: NetworkManager 1.22.8
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.22\&.4" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.22\&.8" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 183b381b..334bf5cc 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.22.4',
+  version: '1.22.8',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -598,7 +598,7 @@ foreach prog_name : ['resolvconf', 'netconfig']
       prog = find_program(prog_name,
                           '/usr/' + prog_name,
                           '/usr/sbin/' + prog_name,
-                          '/usr/local/sbin' + prog_name,
+                          '/usr/local/sbin/' + prog_name,
                           required : false)
       if prog.found()
         prog_path = prog.path()
diff --git a/po/fr.po b/po/fr.po
index 90ab6200..cf3e68b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # French translation of NetworkManager.
 # Copyright (C) 2004-2011 The GNOME Foundation.
 # This file is distributed under the same license as the NetworkManager package.
-# 
+#
 # Raphaël Tournoy <lexpas@free.fr>, 2004.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2006-2008.
 # Jonathan Ernst <jonathan@ernstfamily.ch>, 2007.
@@ -15,31 +15,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-31 17:50+0200\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-12-23 18:47+0100\n"
 "PO-Revision-Date: 2019-08-15 10:06+0000\n"
 "Last-Translator: ljanda <ljanda@redhat.com>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../clients/cli/agent.c:39
+#: ../clients/cli/agent.c:23
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
 "\n"
 "COMMAND := { secret | polkit | all }\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli agent { COMMAND | help }\n"
+msgstr "Syntaxe : nmcli agent { COMMAND | help }\n"
 "\n"
 "COMMAND := { secret | polkit | all }\n"
 "\n"
 
-#: ../clients/cli/agent.c:47
+#: ../clients/cli/agent.c:31
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -49,19 +48,15 @@ msgid ""
 "running\n"
 "and if a password is required asks the user for it.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli agent secret { help }\n"
-"\n"
-"Lance nmcli en tant qu'agent pour secret de NetworkManager. Lorsque "
-"NetworkManager\n"
-"a besoin d'un mot de passe, il en fait la demande aux agents enregistrés. "
-"Cette commande\n"
-"permet à nmcli de tourner en tâche de fond et de demander le cas échéant le "
-"mot de passe\n"
+msgstr "Syntaxe : nmcli agent secret { help }\n"
+"\n"
+"Lance nmcli en tant qu'agent pour secret de NetworkManager. Lorsque NetworkManager\n"
+"a besoin d'un mot de passe, il en fait la demande aux agents enregistrés. Cette commande\n"
+"permet à nmcli de tourner en tâche de fond et de demander le cas échéant le mot de passe\n"
 "à l'utilisateur.\n"
 "\n"
 
-#: ../clients/cli/agent.c:57
+#: ../clients/cli/agent.c:41
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -71,212 +66,214 @@ msgid ""
 "gives\n"
 "the response back to polkit.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli agent polkit { help }\n"
+msgstr "Syntaxe : nmcli agent polkit { help }\n"
 "\n"
 "Enregistre nmcli comme une action polkit pour la session utilisateur.\n"
 "Quand le démon polkit demande une autorisation, nmcli la relaiera à\n"
 "l'utilisateur et donnera la réponse à polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:67
+#: ../clients/cli/agent.c:51
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
 "\n"
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli agent all { help }\n"
+msgstr "Syntaxe : nmcli agent all { help }\n"
 "\n"
-"Lance nmcli à la fois en tant qu'agent de secret NetworkManager et agent "
-"polkit.\n"
+"Lance nmcli à la fois en tant qu'agent de secret NetworkManager et agent polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:143
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
-msgstr ""
-"nmcli est enregistré avec succès comme agent de secret NetworkManager.\n"
+msgstr "nmcli est enregistré avec succès comme agent de secret NetworkManager.\n"
 
-#: ../clients/cli/agent.c:161
+#: ../clients/cli/agent.c:145
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Erreur : l'initialisation de l'agent de secret a échoué"
 
-#: ../clients/cli/agent.c:180
+#: ../clients/cli/agent.c:164
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s"
 
-#: ../clients/cli/agent.c:188
+#: ../clients/cli/agent.c:172
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli est enregistré comme agent polkit.\n"
 
-#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
-#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
-#: ../clients/cli/connections.c:1503
+#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
+#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
+#: ../clients/cli/connections.c:1495
 msgid "GROUP"
 msgstr "GROUPE"
 
-#: ../clients/cli/common.c:644
+#: ../clients/cli/common.c:628
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "Erreur : échec de openconnect : %s\n"
 
-#: ../clients/cli/common.c:651
+#: ../clients/cli/common.c:635
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "Erreur : échec de openconnect avec l'état %d\n"
 
-#: ../clients/cli/common.c:653
+#: ../clients/cli/common.c:637
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "Erreur : échec de openconnect avec le signal %d\n"
 
-#: ../clients/cli/common.c:741
+#: ../clients/cli/common.c:725
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
-msgstr ""
-"Avertissement : le mot de passe pour « %s » n'est pas indiqué dans le "
-"paramètre« passwd-file » et nmcli ne peut le demander à l'utilisateur sans "
-"l'option « --ask ».\n"
+msgstr "Avertissement : le mot de passe pour « %s » n'est pas indiqué dans le paramètre« passwd-file » et nmcli ne peut le demander à l'utilisateur sans l'option « --ask ».\n"
 
-#: ../clients/cli/common.c:1241
+#: ../clients/cli/common.c:1227
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "Erreur : impossible de créer l'objet NMClient : %s."
 
-#: ../clients/cli/common.c:1261
+#: ../clients/cli/common.c:1246
 msgid "Error: NetworkManager is not running."
 msgstr "Erreur : NetworkManager n'est pas lancé."
 
-#: ../clients/cli/common.c:1357
+#: ../clients/cli/common.c:1339
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "Erreur : paramètre « %s » non reconnu. Essayez plutôt --help."
 
-#: ../clients/cli/common.c:1367
+#: ../clients/cli/common.c:1347
 msgid "Error: missing argument. Try passing --help."
 msgstr "Erreur : paramètre manquant. Essayez --help."
 
-#: ../clients/cli/common.c:1436
+#: ../clients/cli/common.c:1414
 msgid "access denied"
 msgstr "accès refusé"
 
-#: ../clients/cli/common.c:1444 ../clients/cli/connections.c:80
-#: ../clients/cli/connections.c:89 ../clients/cli/devices.c:438
-#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:537
-#: ../clients/cli/general.c:40 ../clients/cli/general.c:130
-#: ../clients/cli/general.c:135 ../clients/common/nm-client-utils.c:264
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:281
-#: ../clients/common/nm-client-utils.c:286
-#: ../clients/common/nm-meta-setting-desc.c:1711
-#: ../clients/common/nm-meta-setting-desc.c:1742
-#: ../clients/common/nm-meta-setting-desc.c:2674
-#: ../clients/common/nm-meta-setting-desc.c:2732
+#: ../clients/cli/common.c:1416
+msgid "NetworkManager is not running"
+msgstr "NetworkManager n'est pas en cours d'exécution."
+
+#: ../clients/cli/common.c:1442
+#, c-format
+msgid "Error: error connecting to system bus: %s"
+msgstr "Erreur : erreur de connexion au bus système : %s"
+
+#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
+#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
+#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
+#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
+#: ../clients/common/nm-client-utils.c:263
+#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-meta-setting-desc.c:1724
+#: ../clients/common/nm-meta-setting-desc.c:1755
+#: ../clients/common/nm-meta-setting-desc.c:2687
+#: ../clients/common/nm-meta-setting-desc.c:2745
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../clients/cli/common.c:1445
+#: ../clients/cli/common.c:1469
 msgid "none"
 msgstr "aucun"
 
-#: ../clients/cli/common.c:1446
+#: ../clients/cli/common.c:1470
 msgid "portal"
 msgstr "portail"
 
-#: ../clients/cli/common.c:1447
+#: ../clients/cli/common.c:1471
 msgid "limited"
 msgstr "limité"
 
-#: ../clients/cli/common.c:1448
+#: ../clients/cli/common.c:1472
 msgid "full"
 msgstr "plein"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:64
+#: ../clients/cli/connections.c:50
 msgid "Setting name? "
-msgstr "Nom du paramètre ?"
+msgstr "Nom du paramètre ? "
 
-#: ../clients/cli/connections.c:65
+#: ../clients/cli/connections.c:51
 msgid "Property name? "
-msgstr "Nom de la propriété ?"
+msgstr "Nom de la propriété ? "
 
-#: ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:52
 msgid "Enter connection type: "
 msgstr "Saisissez le type de connexion : "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:56
 msgid "Connection (name, UUID, or path): "
-msgstr "Connexion (nom, UUID, ou chemin) :"
+msgstr "Connexion (nom, UUID, ou chemin) : "
 
-#: ../clients/cli/connections.c:71
+#: ../clients/cli/connections.c:57
 msgid "VPN connection (name, UUID, or path): "
-msgstr "Connexion VPN (nom, UUID, ou chemin) :"
+msgstr "Connexion VPN (nom, UUID, ou chemin) : "
 
-#: ../clients/cli/connections.c:72
+#: ../clients/cli/connections.c:58
 msgid "Connection(s) (name, UUID, or path): "
-msgstr "Connexion(s) (nom, UUID, ou chemin) :"
+msgstr "Connexion(s) (nom, UUID, ou chemin) : "
 
-#: ../clients/cli/connections.c:73
+#: ../clients/cli/connections.c:59
 msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "Connexion(s) (nom, UUID, path ou apath) : "
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:67
 msgid "activating"
 msgstr "activation"
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:68
 msgid "activated"
 msgstr "activé"
 
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:275
+#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
 msgid "deactivating"
 msgstr "désactivation"
 
-#: ../clients/cli/connections.c:84
+#: ../clients/cli/connections.c:70
 msgid "deactivated"
 msgstr "désactivé"
 
-#: ../clients/cli/connections.c:90
+#: ../clients/cli/connections.c:76
 msgid "VPN connecting (prepare)"
 msgstr "Connexion VPN (préparation)"
 
-#: ../clients/cli/connections.c:91
+#: ../clients/cli/connections.c:77
 msgid "VPN connecting (need authentication)"
 msgstr "Connexion VPN (authentification requise)"
 
-#: ../clients/cli/connections.c:92
+#: ../clients/cli/connections.c:78
 msgid "VPN connecting"
 msgstr "Connexion VPN"
 
-#: ../clients/cli/connections.c:93
+#: ../clients/cli/connections.c:79
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Connexion VPN (obtention de la configuration IP)"
 
-#: ../clients/cli/connections.c:94
+#: ../clients/cli/connections.c:80
 msgid "VPN connected"
 msgstr "VPN connecté"
 
-#: ../clients/cli/connections.c:95
+#: ../clients/cli/connections.c:81
 msgid "VPN connection failed"
 msgstr "Échec de la connexion VPN"
 
-#: ../clients/cli/connections.c:96
+#: ../clients/cli/connections.c:82
 msgid "VPN disconnected"
 msgstr "VPN déconnecté"
 
-#: ../clients/cli/connections.c:558
+#: ../clients/cli/connections.c:544
 msgid "never"
 msgstr "jamais"
 
-#: ../clients/cli/connections.c:911
+#: ../clients/cli/connections.c:904
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -292,8 +289,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -315,25 +312,20 @@ msgid ""
 "\n"
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-msgstr ""
-"Usage: nmcli connection { COMMAND | help }\n"
+msgstr "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | clone | edit | delete | "
-"monitor | reload | load | import | export }\n"
+"COMMAND := { show | up | down | add | modify | clone | edit | delete | monitor | reload | load | import | export }\n"
 "\n"
 "  show [--active] [--order <order spec>]\n"
 "  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
-"<file with passwords>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file <file with passwords>]\n"
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
-"<value>)+\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
 "  clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
 "\n"
@@ -353,7 +345,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:926
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -378,33 +370,24 @@ msgid ""
 "When --active option is specified, only the active profiles are taken into\n"
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
-msgstr ""
-"Syntaxe : nmcli connection show { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [--active] [--order <order spec>]\n"
 "\n"
-"Répertorie les profils de connexion sur-disque et en-mémoire, avec certaines "
-"actifs\n"
+"Répertorie les profils de connexion sur-disque et en-mémoire, avec certaines actifs\n"
 "si un périphérique utilise ce profil de connexion. Sans paramètre, tous les\n"
-"les profils sont répertoriés. Lorsque l’option --active est spécifiée, seuls "
-"les profiles\n"
-"actifs sont affichés. --order permet d'ordonnancement des connexions "
-"personnalisées, (voir page de manuel).\n"
+"les profils sont répertoriés. Lorsque l’option --active est spécifiée, seuls les profiles\n"
+"actifs sont affichés. --order permet d'ordonnancement des connexions personnalisées, (voir page de manuel).\n"
 "\n"
 "ARGUMENTS: = [--active] [id | uuid | chemin | apath] <ID>...\n"
 "\n"
-"Affiche les détails pour les connexions spécifiées. Par défaut, la "
-"configuration statique\n"
-"et les données de connexions actives sont affichées. Il est possible de "
-"filtrer la sortie\n"
-"avec un paramètre global '--fields'. Reportez-vous à la page de manuel pour "
-"plus d’informations.\n"
-"Lorsque l'option --active est spécifiée, seuls les profils actifs sont pris "
-"en\n"
-"compte. L'utilisation de l'option --show-secrets révéle également les "
-"secrets associés.\n"
+"Affiche les détails pour les connexions spécifiées. Par défaut, la configuration statique\n"
+"et les données de connexions actives sont affichées. Il est possible de filtrer la sortie\n"
+"avec un paramètre global '--fields'. Reportez-vous à la page de manuel pour plus d’informations.\n"
+"Lorsque l'option --active est spécifiée, seuls les profils actifs sont pris en\n"
+"compte. L'utilisation de l'option --show-secrets révéle également les secrets associés.\n"
 
-#: ../clients/cli/connections.c:954
+#: ../clients/cli/connections.c:947
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -427,31 +410,25 @@ msgid ""
 "nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection up { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection up { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>] [passwd-file <file with passwords>]\n"
+"ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>] [passwd-file <file with passwords>]\n"
 "\n"
-"Active une connexion sur un périphérique. Le profil à activer est identifié "
-"par son\n"
+"Active une connexion sur un périphérique. Le profil à activer est identifié par son\n"
 "nom, UUID ou chemin D-Bus.\n"
 "\n"
-"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
-"with passwords>]\n"
+"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file with passwords>]\n"
 "\n"
-"Active un périphérique avec une connexion. Le profil de connexion est "
-"automatiquement\n"
+"Active un périphérique avec une connexion. Le profil de connexion est automatiquement\n"
 "sélectionné par NetworkManager.\n"
 "\n"
 "ifname - spécifie le périphérique sur lequel activer la connexion\n"
 "ap     - spécifie sur quel AP se connecter (valide pour Wi-Fi uniquement)\n"
 "nsp    - spécifie sur quel NSP se connecter (valide pour WiMAX uniquement)\n"
-"passwd-file - fichier contenant les mots de passe requis pour l'activation "
-"de la connexion\n"
+"passwd-file - fichier contenant les mots de passe requis pour l'activation de la connexion\n"
 "\n"
 
-#: ../clients/cli/connections.c:975
+#: ../clients/cli/connections.c:968
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -463,24 +440,22 @@ msgid ""
 "name,\n"
 "UUID or D-Bus path.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection down { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection down { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path | apath] <ID>\n"
 "\n"
-"Désactive une connexion d'un périphérique (sans empêcher le périphérique "
-"d'utiliser\n"
+"Désactive une connexion d'un périphérique (sans empêcher le périphérique d'utiliser\n"
 "l'activation automatique). Le profil à désactiver est identifié par son nom,\n"
 "UUID ou chemin D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:987
+#: ../clients/cli/connections.c:980
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -567,8 +542,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -631,11 +606,9 @@ msgid ""
 "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
-msgstr ""
-"Usage: nmcli connection add { ARGUMENTS | help }\n"
+msgstr "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -689,10 +662,8 @@ msgstr ""
 "                  [egress <egress priority mapping>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
-"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
-"| broadcast (3) |\n"
-"                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
-"(6)]\n"
+"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+"                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
 "                  [primary <ifname>]\n"
 "                  [miimon <num>]\n"
 "                  [downdelay <num>]\n"
@@ -722,8 +693,7 @@ msgstr ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -787,7 +757,7 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:1111
+#: ../clients/cli/connections.c:1104
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -802,33 +772,27 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
 "nmcli con mod bond0 +bond.options mii=500\n"
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection modify { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection modify { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
 "Modifie une ou plusieurs des propriétés du profil de connexion.\n"
-"Le profil est identifié par son nom, son UUID ou son D-Bus. Pour les "
-"propriétés aux valeurs multiples\n"
-"vous pouvez utiliser en option le préfixe « + » ou « -» préfixe devant le "
-"nom de la propriété.\n"
-"Le signe « + » permet l’ajout d’éléments au lieu d’écraser la valeur entière."
-"\n"
-"Le « - » signe permet de supprimer les éléments sélectionnés, plutôt que la "
-"valeur entière.\n"
+"Le profil est identifié par son nom, son UUID ou son D-Bus. Pour les propriétés aux valeurs multiples\n"
+"vous pouvez utiliser en option le préfixe « + » ou « -» préfixe devant le nom de la propriété.\n"
+"Le signe « + » permet l’ajout d’éléments au lieu d’écraser la valeur entière.\n"
+"Le « - » signe permet de supprimer les éléments sélectionnés, plutôt que la valeur entière.\n"
 "\n"
 "Exemples :\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -836,7 +800,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1134
+#: ../clients/cli/connections.c:1127
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -844,21 +808,19 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) "
+"and\n"
 "id (provided as <new name> argument).\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection clone { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection clone { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
-"Clone un profil de connexion existant. La connexion qui vient d'être créée "
-"sera une copie parfaite de <ID>, sauf pour la propriété uuid (qui va être "
-"générée) et\n"
+"Clone un profil de connexion existant. La connexion qui vient d'être créée sera une copie parfaite de <ID>, sauf pour la propriété uuid (qui va être générée) et\n"
 "l'id (fourni comme argument <new name>).\n"
 "\n"
 
-#: ../clients/cli/connections.c:1146
+#: ../clients/cli/connections.c:1139
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -872,8 +834,7 @@ msgid ""
 "\n"
 "Add a new connection profile in an interactive editor.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
@@ -885,7 +846,7 @@ msgstr ""
 "Ajoute un nouveau profil de connexion dans un éditeur interactif.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1161
+#: ../clients/cli/connections.c:1154
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -895,8 +856,7 @@ msgid ""
 "Delete a connection profile.\n"
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
@@ -904,7 +864,7 @@ msgstr ""
 "Le profil est identifié par son nom, UUID ou chemin D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1172
+#: ../clients/cli/connections.c:1165
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -915,31 +875,28 @@ msgid ""
 "This command prints a line whenever the specified connection changes.\n"
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection edit { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID>\n"
 "\n"
 "Surveille les activités d'un profil de connexion.\n"
-"Cette commande affiche une ligne à chaque fois que la connection spécifiée "
-"est modifiée.\n"
+"Cette commande affiche une ligne à chaque fois que la connection spécifiée est modifiée.\n"
 "Surveille tous les profils de connexion si rien n'est spécifié \n"
 "\n"
 
-#: ../clients/cli/connections.c:1184
+#: ../clients/cli/connections.c:1177
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
 "\n"
 "Reload all connection files from disk.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection reload { help }\n"
+msgstr "Syntaxe : nmcli connection reload { help }\n"
 "\n"
 "Recharge tous les fichiers de connexion à partir du disque.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1192
+#: ../clients/cli/connections.c:1185
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -951,19 +908,16 @@ msgid ""
 "latest\n"
 "state.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection load { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection load { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <filename> [<filename>...]\n"
 "\n"
-"Charge/recharge un ou plusieurs fichier(s) de connexion à partir du disque. "
-"Utilise ceci après\n"
-"avoir manuellement modifié un fichier de connexion afin de vous assurer que "
-"NetworkManager est\n"
+"Charge/recharge un ou plusieurs fichier(s) de connexion à partir du disque. Utilise ceci après\n"
+"avoir manuellement modifié un fichier de connexion afin de vous assurer que NetworkManager est\n"
 "conscient de l'état le plus récent.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1204
+#: ../clients/cli/connections.c:1197
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -976,20 +930,17 @@ msgid ""
 "Only VPN configurations are supported at the moment. The configuration\n"
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection import { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection import { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [--temporary] type <type> file <file to import>\n"
 "\n"
-"Importe une configuration externe/étrangère comme profil de connexion de "
-"NetworkManager.\n"
+"Importe une configuration externe/étrangère comme profil de connexion de NetworkManager.\n"
 "Le type de fichier d'entrée est spécifié par l'option de type.\n"
-"Seules les configurations VPN sont prises en charge actuellement. La "
-"configuration\n"
+"Seules les configurations VPN sont prises en charge actuellement. La configuration\n"
 "est importée par les greffons de VPN du NetworkManager.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1217
+#: ../clients/cli/connections.c:1210
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -999,440 +950,430 @@ msgid ""
 "Export a connection. Only VPN connections are supported at the moment.\n"
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli connection delete { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-"Exporte une connexion. Les connexions VPN uniquement sont prises en charge "
-"actuellement.\n"
-"Les données sont dirigées vers la sortie standard ou vers un fichier si un "
-"nom est donné.\n"
+"Exporte une connexion. Les connexions VPN uniquement sont prises en charge actuellement.\n"
+"Les données sont dirigées vers la sortie standard ou vers un fichier si un nom est donné.\n"
 "\n"
 
-#: ../clients/cli/connections.c:1307
+#: ../clients/cli/connections.c:1301
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Erreur lors de la mise à jour des secrets pour l'objet %s : %s\n"
 
-#: ../clients/cli/connections.c:1356
+#: ../clients/cli/connections.c:1348
 msgid "Connection profile details"
 msgstr "Informations de profil de connexion"
 
-#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1454
+#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Erreur : « connection show » : %s"
 
-#: ../clients/cli/connections.c:1444
+#: ../clients/cli/connections.c:1436
 msgid "Activate connection details"
 msgstr "Informations d'activation de connexion"
 
-#: ../clients/cli/connections.c:1552 ../clients/cli/devices.c:1452
-#: ../clients/cli/devices.c:1466 ../clients/cli/devices.c:1481
-#: ../clients/cli/devices.c:1539 ../clients/cli/devices.c:1641
+#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
+#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
+#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
+#: ../clients/cli/devices.c:1688
 msgid "NAME"
 msgstr "NOM"
 
-#: ../clients/cli/connections.c:1645
+#: ../clients/cli/connections.c:1637
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "champ invalide « %s » ; champs autorisés : %s et %s, ou %s,%s"
 
-#: ../clients/cli/connections.c:1655 ../clients/cli/connections.c:1663
+#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "« %s » doit être seul"
 
-#: ../clients/cli/connections.c:1923
+#: ../clients/cli/connections.c:1915
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "chaîne incorrecte « %s » de l'option « --order »"
 
-#: ../clients/cli/connections.c:1948
+#: ../clients/cli/connections.c:1940
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "élément incorrect « %s » de l'option « --order »"
 
-#: ../clients/cli/connections.c:1986
+#: ../clients/cli/connections.c:1978
 msgid "No connection specified"
 msgstr "Aucune connexion spécifiée."
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:1989
 #, c-format
 msgid "%s argument is missing"
 msgstr "le paramètre %s est manquant"
 
-#: ../clients/cli/connections.c:2015
+#: ../clients/cli/connections.c:2007
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "connexion inconnue : « %s »"
 
-#: ../clients/cli/connections.c:2044
+#: ../clients/cli/connections.c:2036
 msgid "'--order' argument is missing"
 msgstr "l'argument de « --order » est manquant"
 
-#: ../clients/cli/connections.c:2104
+#: ../clients/cli/connections.c:2096
 msgid "NetworkManager active profiles"
 msgstr "Profils actifs NetworkManager"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/connections.c:2105
+#: ../clients/cli/connections.c:2097
 msgid "NetworkManager connection profiles"
 msgstr "Profils de connexion NetworkManager"
 
-#: ../clients/cli/connections.c:2157 ../clients/cli/connections.c:2902
-#: ../clients/cli/connections.c:2914 ../clients/cli/connections.c:2926
-#: ../clients/cli/connections.c:3155 ../clients/cli/connections.c:8873
-#: ../clients/cli/connections.c:8894 ../clients/cli/devices.c:2974
-#: ../clients/cli/devices.c:2986 ../clients/cli/devices.c:2999
-#: ../clients/cli/devices.c:3193 ../clients/cli/devices.c:3204
-#: ../clients/cli/devices.c:3222 ../clients/cli/devices.c:3231
-#: ../clients/cli/devices.c:3252 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3281 ../clients/cli/devices.c:3725
-#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743
-#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770
-#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3953
-#: ../clients/cli/devices.c:3964 ../clients/cli/devices.c:4135
+#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
+#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
+#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
+#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
+#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
+#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
+#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
+#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
+#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
+#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
+#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
+#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
+#: ../clients/cli/devices.c:4495
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erreur : le paramètre %s est manquant."
 
-#: ../clients/cli/connections.c:2185
+#: ../clients/cli/connections.c:2177
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Erreur : %s - profil de connexion introuvable."
 
-#: ../clients/cli/connections.c:2276 ../clients/cli/connections.c:2889
-#: ../clients/cli/connections.c:2953 ../clients/cli/connections.c:8417
-#: ../clients/cli/connections.c:8508 ../clients/cli/connections.c:8994
-#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:1993
-#: ../clients/cli/devices.c:2166 ../clients/cli/devices.c:2274
-#: ../clients/cli/devices.c:2466 ../clients/cli/devices.c:3916
-#: ../clients/cli/devices.c:4141 ../clients/cli/general.c:896
+#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
+#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
+#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
+#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
+#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
+#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
+#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
+#: ../clients/cli/general.c:982
 #, c-format
 msgid "Error: %s."
 msgstr "Erreur : %s."
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "aucune connexion active sur le périphérique « %s »"
 
-#: ../clients/cli/connections.c:2377
+#: ../clients/cli/connections.c:2369
 msgid "no active connection or device"
 msgstr "aucune connexion ou périphérique actif"
 
-#: ../clients/cli/connections.c:2397
+#: ../clients/cli/connections.c:2389
 #, c-format
 msgid "device '%s' not compatible with connection '%s': "
-msgstr "périphérique « %s » incompatible avec la connexion « %s » :"
+msgstr "périphérique « %s » incompatible avec la connexion « %s » : "
 
-#: ../clients/cli/connections.c:2430
+#: ../clients/cli/connections.c:2422
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "périphérique « %s » incompatible avec la connexion « %s »"
 
-#: ../clients/cli/connections.c:2433
+#: ../clients/cli/connections.c:2425
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "aucun périphérique trouvé pour la connexion « %s »"
 
-#: ../clients/cli/connections.c:2484
+#: ../clients/cli/connections.c:2476
 #, c-format
 msgid "Hint: use '%s' to get more details."
 msgstr "Astuce : utiliser « %s » pour obtenir plus d'informations."
 
-#: ../clients/cli/connections.c:2502
+#: ../clients/cli/connections.c:2494
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "Connexion activée (%s) (Chemin D-Bus actif : %s)\n"
 
-#: ../clients/cli/connections.c:2506 ../clients/cli/connections.c:2656
-#: ../clients/cli/connections.c:6738
+#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
+#: ../clients/cli/connections.c:6798
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Connexion activée (chemin D-Bus actif : %s)\n"
 
-#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2635
+#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erreur : l'activation de la connexion a échoué : %s"
 
-#: ../clients/cli/connections.c:2550
+#: ../clients/cli/connections.c:2542
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "Erreur : le délai d'attente a expiré (%d secondes)"
 
-#: ../clients/cli/connections.c:2718
+#: ../clients/cli/connections.c:2709
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "Erreur : échec de lecture du fichier de mot de passe « %s » : %s"
 
-#: ../clients/cli/connections.c:2731
+#: ../clients/cli/connections.c:2722
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "Virgule manquant dans la saisie du mot de passe  « %s »"
 
-#: ../clients/cli/connections.c:2739
+#: ../clients/cli/connections.c:2730
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "Point manquant dans la saisie du mot de passe « %s »"
 
-#: ../clients/cli/connections.c:2752
+#: ../clients/cli/connections.c:2743
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "Nom du paramètre non valide dans la saisie du mot de passe « %s »"
 
-#: ../clients/cli/connections.c:2806
+#: ../clients/cli/connections.c:2800
 #, c-format
 msgid "unknown device '%s'."
 msgstr "périphérique inconnu « %s »."
 
-#: ../clients/cli/connections.c:2811
+#: ../clients/cli/connections.c:2805
 msgid "neither a valid connection nor device given"
 msgstr "pas de connexion ni de périphérique valide n'a été donné"
 
-#: ../clients/cli/connections.c:2936 ../clients/cli/devices.c:1685
-#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3294
-#: ../clients/cli/devices.c:3970
+#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
+#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
+#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
+#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
+#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
+#: ../clients/cli/devices.c:4505
 #, c-format
-msgid "Unknown parameter: %s\n"
-msgstr "Paramètre inconnu : %s\n"
+msgid "Error: invalid extra argument '%s'."
+msgstr "Erreur : argument supplémentaire « %s » non valide."
 
-#: ../clients/cli/connections.c:2961
+#: ../clients/cli/connections.c:2955
 msgid "preparing"
 msgstr "préparation"
 
-#: ../clients/cli/connections.c:3070
+#: ../clients/cli/connections.c:3064
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Connexion « %s » (%s) supprimée.\n"
 
-#: ../clients/cli/connections.c:3086
+#: ../clients/cli/connections.c:3080
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "Connexion « %s » désactivée (chemin D-Bus actif : %s)\n"
 
-#: ../clients/cli/connections.c:3137 ../clients/cli/connections.c:8604
-#: ../clients/cli/connections.c:8635 ../clients/cli/connections.c:8794
+#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
+#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Erreur : aucune connexion spécifiée."
 
-#: ../clients/cli/connections.c:3167
+#: ../clients/cli/connections.c:3161
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Erreur : « %s » n'est pas une connexion active.\n"
 
-#: ../clients/cli/connections.c:3168
+#: ../clients/cli/connections.c:3162
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Erreur : les connexions n'ont pas toutes été trouvées."
 
-#: ../clients/cli/connections.c:3176
+#: ../clients/cli/connections.c:3170
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Erreur : aucune connexion fournie."
 
-#: ../clients/cli/connections.c:3207
+#: ../clients/cli/connections.c:3201
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "La désactivation de la connexion « %s » a échoué : %s\n"
 
-#: ../clients/cli/connections.c:3458 ../clients/cli/connections.c:3515
-#: ../clients/common/nm-client-utils.c:225
+#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
+#: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "« %s » ne fait pas partie de [%s]"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3478 ../clients/cli/connections.c:3538
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
+#: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../clients/cli/connections.c:3672
+#: ../clients/cli/connections.c:3675
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
-msgstr ""
-"Avertissement : master=« %s » ne correspond à un aucun profil existant.\n"
+msgstr "Avertissement : master=« %s » ne correspond à un aucun profil existant.\n"
 
-#: ../clients/cli/connections.c:4027
+#: ../clients/cli/connections.c:4038
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Erreur : propriété « %s » non valide : %s."
 
-#: ../clients/cli/connections.c:4041
+#: ../clients/cli/connections.c:4053
 #, c-format
 msgid "Error: failed to %s %s.%s: %s."
 msgstr "Erreur : échec %s %s.%s: %s."
 
-#: ../clients/cli/connections.c:4076
+#: ../clients/cli/connections.c:4095
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "Erreur : « %s » est obligatoire."
 
-#: ../clients/cli/connections.c:4103
+#: ../clients/cli/connections.c:4122
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "Erreur : type esclave invalide ; %s."
 
-#: ../clients/cli/connections.c:4111
+#: ../clients/cli/connections.c:4130
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Erreur : type de connexion non valide ; %s."
 
-#: ../clients/cli/connections.c:4188
+#: ../clients/cli/connections.c:4207
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "Erreur : type de connexion invalide : %s."
 
-#: ../clients/cli/connections.c:4234
+#: ../clients/cli/connections.c:4263
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "Erreur : « %s » : %s"
 
-#: ../clients/cli/connections.c:4255
+#: ../clients/cli/connections.c:4290
 msgid "Error: master is required"
 msgstr "Erreur : « master » requis."
 
-#: ../clients/cli/connections.c:4314
+#: ../clients/cli/connections.c:4359
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "Erreur : erreur à l'ajout de l'option d'agrégation de lien « %s=%s »."
 
-#: ../clients/cli/connections.c:4345
+#: ../clients/cli/connections.c:4390
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
-msgstr ""
-"Erreur : « %s » n'est pas un mode de contrôle valide ; utilisez « %s » ou "
-"« %s ».\n"
+msgstr "Erreur : « %s » n'est pas un mode de contrôle valide ; utilisez « %s » ou « %s ».\n"
 
-#: ../clients/cli/connections.c:4376
+#: ../clients/cli/connections.c:4421
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
-msgstr ""
-"Erreur:'bt-type' : ' ' '%s non valide ; utiliser [%s, %s, %s (%s), ]%s."
+msgstr "Erreur:'bt-type' : ' ' '%s non valide ; utiliser [%s, %s, %s (%s), ]%s."
 
-#: ../clients/cli/connections.c:4625
+#: ../clients/cli/connections.c:4686
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Erreur : la valeur de l'argument « %s » est requise."
 
-#: ../clients/cli/connections.c:4671
+#: ../clients/cli/connections.c:4730
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Erreur : l'argument <setting>.<property> est manquant."
 
-#: ../clients/cli/connections.c:4694
+#: ../clients/cli/connections.c:4756
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Erreur : non valide, ou le paramètre « %s » n'est pas autorisé : %s."
 
-#: ../clients/cli/connections.c:4742 ../clients/cli/connections.c:4758
+#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "Erreur : « %s » est ambigu (%s.%s ou %s.%s)."
 
-#: ../clients/cli/connections.c:4776
+#: ../clients/cli/connections.c:4837
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Erreur : <setting>.<property> non valide '%s’."
 
-#: ../clients/cli/connections.c:4815 ../clients/cli/connections.c:8456
+#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Erreur: impossible d'ajouter la connexion « %s » : %s"
 
-#: ../clients/cli/connections.c:4833
+#: ../clients/cli/connections.c:4894
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
 "connection by its uuid '%2$s'\n"
-msgid_plural ""
-"Warning: There are %3$u other connections with the name '%1$s'. Reference "
-"the connection by its uuid '%2$s'\n"
-msgstr[0] ""
-"Attention : il y a une autre connexion avec le nom '%1$s’. Référez-vous à la "
-"connexion par son uuid '%2$s'\n"
-msgstr[1] ""
-"Attention : il y a %3$u autres connexions avec le nom '%1$s’. Référez-vous à "
-"la connexion par son uuid '%2$s'\n"
-
-#: ../clients/cli/connections.c:4842
+msgid_plural "Warning: There are %3$u other connections with the name '%1$s'. Reference the connection by its uuid '%2$s'\n"
+msgstr[0] "Attention : il y a une autre connexion avec le nom '%1$s’. Référez-vous à la connexion par son uuid '%2$s'\n"
+msgstr[1] "Attention : il y a %3$u autres connexions avec le nom '%1$s’. Référez-vous à la connexion par son uuid '%2$s'\n"
+
+#: ../clients/cli/connections.c:4903
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Connexion « %s » (%s) ajoutée avec succès.\n"
 
-#: ../clients/cli/connections.c:4904 ../clients/cli/connections.c:6861
-#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:529
-#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1206
-#: ../clients/cli/general.c:137 ../clients/cli/utils.h:297
-#: ../clients/common/nm-client-utils.c:283
-#: ../clients/common/nm-meta-setting-desc.c:871
-#: ../clients/common/nm-meta-setting-desc.c:2669
+#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
+#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
+#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
+#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
+#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-meta-setting-desc.c:866
+#: ../clients/common/nm-meta-setting-desc.c:2682
 msgid "no"
 msgstr "non"
 
-#: ../clients/cli/connections.c:4905 ../clients/cli/connections.c:6861
-#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:528
-#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1206
-#: ../clients/cli/general.c:136 ../clients/cli/utils.h:297
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:871
-#: ../clients/common/nm-meta-setting-desc.c:2666
+#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
+#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
+#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
+#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
+#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-meta-setting-desc.c:866
+#: ../clients/common/nm-meta-setting-desc.c:2679
 msgid "yes"
 msgstr "oui"
 
-#: ../clients/cli/connections.c:4991
+#: ../clients/cli/connections.c:5052
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done."
-"\n"
-msgstr ""
-"Vous pouvez spécifier cette option plus d'une fois. Tapez <Entrée> quand "
-"vous avez terminé.\n"
+"You can specify this option more than once. Press <Enter> when you're done.\n"
+msgstr "Vous pouvez spécifier cette option plus d'une fois. Tapez <Entrée> quand vous avez terminé.\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5093
+#: ../clients/cli/connections.c:5154
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
 msgstr[0] "Il existe %d paramètre optionnel pour %s.\n"
 msgstr[1] "Il existe %d paramètres optionnels pour %s.\n"
 
-#: ../clients/cli/connections.c:5099
+#: ../clients/cli/connections.c:5160
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] "Souhaitez-vous le fournir ? %s"
 msgstr[1] "Souhaitez-vous les fournir ? %s"
 
-#: ../clients/cli/connections.c:5231 ../clients/cli/utils.c:293
+#: ../clients/cli/connections.c:5292 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Erreur : la valeur de l'argument « %s » est requise."
 
-#: ../clients/cli/connections.c:5238
+#: ../clients/cli/connections.c:5299
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Erreur: « save » : %s."
 
-#: ../clients/cli/connections.c:5324 ../clients/cli/connections.c:5335
+#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "Erreur : l'argument « %s » est requis."
 
-#: ../clients/cli/connections.c:6294
+#: ../clients/cli/connections.c:6354
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[« %s » setting values]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:6403
+#.
+#: ../clients/cli/connections.c:6463
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1449,25 +1390,21 @@ msgid ""
 "help/?   [<command>]                 :: print this help\n"
 "nmcli    <conf-option> <value>       :: nmcli configuration\n"
 "quit                                 :: exit nmcli\n"
-msgstr ""
-"---[ Menu principal ]---\n"
-"goto     [<setting> | <prop>]        :: aller sur un réglage ou une "
-"propriété\n"
-"remove   <setting>[.<prop>] | <prop> :: supprimer la valeur d'un réglage ou "
-"d'une propriété\n"
+msgstr "---[ Menu principal ]---\n"
+"goto     [<setting> | <prop>]        :: aller sur un réglage ou une propriété\n"
+"remove   <setting>[.<prop>] | <prop> :: supprimer la valeur d'un réglage ou d'une propriété\n"
 "set      [<setting>.<prop> <value>]  :: définir la valeur d'une propriété\n"
 "describe [<setting>.<prop>]          :: décrire une propriété\n"
 "print    [all | <setting>[.<prop>]]  :: afficher la connexion\n"
 "verify   [all | fix]                 :: vérifier la connexion\n"
 "save     [persistent|temporary]      :: enregistrer la connexion\n"
 "activate [<ifname>] [/<ap>|<nsp>]    :: activer la connexion\n"
-"back                                 :: remonter d'un niveau (retour "
-"arrière)\n"
+"back                                 :: remonter d'un niveau (retour arrière)\n"
 "help/?   [<command>]                 :: afficher cette aide\n"
 "nmcli    <conf-option> <value>       :: configuration de nmcli\n"
 "quit                                 :: quitter nmcli\n"
 
-#: ../clients/cli/connections.c:6430
+#: ../clients/cli/connections.c:6490
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1477,9 +1414,7 @@ msgid ""
 "Examples: nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
-msgstr ""
-"goto <setting>[.<prop>] | <prop>  :: saisir le paramètre ou la propriété "
-"pour la modification\n"
+msgstr "goto <setting>[.<prop>] | <prop>  :: saisir le paramètre ou la propriété pour la modification\n"
 "\n"
 "Cette commande entre dans un paramètre ou une propriété pour le/la modifier.\n"
 "\n"
@@ -1487,28 +1422,26 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6437
+#: ../clients/cli/connections.c:6497
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
-msgstr ""
-"remove <setting>[.<prop>]  :: supprimer le paramètre ou réinitialiser la "
-"valeur de la propriété\n"
+msgstr "remove <setting>[.<prop>]  :: supprimer le paramètre ou réinitialiser la valeur de la propriété\n"
 "\n"
-"Cette commande supprime un paramètre entier de la connexion, ou si une "
-"propriété est donnée, \n"
+"Cette commande supprime un paramètre entier de la connexion, ou si une propriété est donnée, \n"
 "celle-ci sera réinitialisée à la valeur par défaut.\n"
 "\n"
 "Exemples : nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6444
+#: ../clients/cli/connections.c:6504
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1516,27 +1449,24 @@ msgid ""
 "This command sets property value.\n"
 "\n"
 "Example: nmcli> set con.id My connection\n"
-msgstr ""
-"set [<setting>.<prop> <value>]  :: définir la valeur de la propriété\n"
+msgstr "set [<setting>.<prop> <value>]  :: définir la valeur de la propriété\n"
 "\n"
 "Cette commande définit la valeur de la propriété.\n"
 "\n"
 "Exemple : nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:6449
+#: ../clients/cli/connections.c:6509
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
 "\n"
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
-msgstr ""
-"describe [<setting>.<prop>]  :: décrire la propriété\n"
+msgstr "describe [<setting>.<prop>]  :: décrire la propriété\n"
 "\n"
-"Affiche la description de la propriété. Vous pouvez consulter la page du "
-"manuel nm-settings(5) pour afficher tous les paramètres et propriétés NM.\n"
+"Affiche la description de la propriété. Vous pouvez consulter la page du manuel nm-settings(5) pour afficher tous les paramètres et propriétés NM.\n"
 
-#: ../clients/cli/connections.c:6454
+#: ../clients/cli/connections.c:6514
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1544,39 +1474,36 @@ msgid ""
 "Shows current property or the whole connection.\n"
 "\n"
 "Example: nmcli ipv4> print all\n"
-msgstr ""
-"print [all]  :: imprimer le paramètre ou les valeurs de la connexion\n"
+msgstr "print [all]  :: imprimer le paramètre ou les valeurs de la connexion\n"
 "\n"
 "Affiche la propriété actuelle ou la connexion entière.\n"
 "\n"
 "Exemple : nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6459
+#: ../clients/cli/connections.c:6519
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed automatically\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
-msgstr ""
-"verify [all]  : vérifier le paramètre ou la validité de la connexion\n"
+msgstr "verify [all]  : vérifier le paramètre ou la validité de la connexion\n"
 "\n"
-"Vérifie si le paramètre ou la connexion est valide et peut être enregistré "
-"plus tard.\n"
-"Indique les valeurs non valides sur les erreurs. Certaines erreurs peuvent "
-"être corrigées automatiquement\n"
+"Vérifie si le paramètre ou la connexion est valide et peut être enregistré plus tard.\n"
+"Indique les valeurs non valides sur les erreurs. Certaines erreurs peuvent être corrigées automatiquement\n"
 "par l'option «fix ».\n"
 "\n"
 "Exemples : nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verifyerify\n"
 
-#: ../clients/cli/connections.c:6468
+#: ../clients/cli/connections.c:6528
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1590,23 +1517,17 @@ msgid ""
 "restart. If you want to fully remove the persistent connection, the "
 "connection\n"
 "profile must be deleted.\n"
-msgstr ""
-"save [persistent|temporary]  : sauvegarder la connexion\n"
+msgstr "save [persistent|temporary]  : sauvegarder la connexion\n"
 "Envoie le profil de connexion au NetworkManager qui le sauvegardera\n"
-"de manière persistante, ou qui le gardera en mémoire. Une sauvegarde sans "
-"argument\n"
+"de manière persistante, ou qui le gardera en mémoire. Une sauvegarde sans argument\n"
 "correspond à une sauvegarde persistante.\n"
-"Notez qu'une fois que vous aurez sauvegardé le profil de façon persistante, "
-"ces\n"
-"configurations seront conservées à l'amorçage et au démarrage. Les "
-"changements\n"
-"peuvent donc être persistants ou temporaires, mais tout changement "
-"temporaire ne\n"
-"persitera pas à l'amorçage ou au démarrage. Si vous souhaitez supprimer la "
-"connexion\n"
+"Notez qu'une fois que vous aurez sauvegardé le profil de façon persistante, ces\n"
+"configurations seront conservées à l'amorçage et au démarrage. Les changements\n"
+"peuvent donc être persistants ou temporaires, mais tout changement temporaire ne\n"
+"persitera pas à l'amorçage ou au démarrage. Si vous souhaitez supprimer la connexion\n"
 "persitante, le profil de connexion devra être supprimé.\n"
 
-#: ../clients/cli/connections.c:6479
+#: ../clients/cli/connections.c:6539
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1617,31 +1538,31 @@ msgid ""
 "<ifname>    - device the connection will be activated on\n"
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
-msgstr ""
-"activate [<ifname>] [/<ap>|<nsp>]  :: activer la connexion\n"
+msgstr "activate [<ifname>] [/<ap>|<nsp>]  :: activer la connexion\n"
 "\n"
 "Active la connexion.\n"
 "\n"
 "Options disponibles :\n"
 "<ifname>    - périphérique sur lequel la connexion sera activée\n"
-"/<ap>|<nsp> - AP (Wi-Fi) ou NSP (WiMAX) (ajouter avec ou lorsque <ifname> "
-"n'est pas spécifié)\n"
+"/<ap>|<nsp> - AP (Wi-Fi) ou NSP (WiMAX) (ajouter avec ou lorsque <ifname> n'est pas spécifié)\n"
 
-#: ../clients/cli/connections.c:6486 ../clients/cli/connections.c:6644
+#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
 #, c-format
-msgid "back  :: go to upper menu level\n"
+msgid ""
+"back  :: go to upper menu level\n"
 "\n"
 msgstr "back  :: aller au niveau supérieur du menu\n"
 "\n"
 
-#: ../clients/cli/connections.c:6489
+#: ../clients/cli/connections.c:6549
 #, c-format
-msgid "help/? [<command>]  :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
 msgstr "help/? [<command>]  :: aide pour les commandes nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6492
+#: ../clients/cli/connections.c:6552
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1655,8 +1576,7 @@ msgid ""
 "Examples: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
-msgstr ""
-"nmcli [<conf-option> <value>]  :: nmcli configuration\n"
+msgstr "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
 "Configure nmcli. Les options suivantes sont disponibles :\n"
 "status-line yes | no          [default: no]\n"
@@ -1667,30 +1587,27 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6514 ../clients/cli/connections.c:6650
+#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
 "\n"
 "This command exits nmcli. When the connection being edited is not saved, the "
 "user is asked to confirm the action.\n"
-msgstr ""
-"quit  :: quitter nmcli\n"
+msgstr "quit  :: quitter nmcli\n"
 "\n"
-"Cette commande permet de quitter nmcli. Lorsque la connexion en cours de "
-"modification n'est pas enregistrée, il est demandé à l'utilisateur de "
-"confirmer l'action.\n"
+"Cette commande permet de quitter nmcli. Lorsque la connexion en cours de modification n'est pas enregistrée, il est demandé à l'utilisateur de confirmer l'action.\n"
 
-#: ../clients/cli/connections.c:6519 ../clients/cli/connections.c:6655
-#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:8043
+#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
+#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Commande inconnue : « %s »\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:6584
+#.
+#: ../clients/cli/connections.c:6644
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1704,33 +1621,28 @@ msgid ""
 "back                             :: go to upper level\n"
 "help/?   [<command>]             :: print this help or command description\n"
 "quit                             :: exit nmcli\n"
-msgstr ""
-"---[ Menu des propriétés ]---\n"
+msgstr "---[ Menu des propriétés ]---\n"
 "set      [<value>]               :: définir une nouvelle valeur\n"
-"add      [<value>]               :: ajouter une nouvelle option à la "
-"propriété\n"
+"add      [<value>]               :: ajouter une nouvelle option à la propriété\n"
 "change                           :: modifier la valeur actuelle\n"
 "remove   [<index> | <option>]    :: supprimer la valeur\n"
 "describe                         :: décrire la propriété\n"
-"print    [setting | connection]  :: imprimer la(les) valeur(s) de la "
-"propriété (paramètre/connexion)\n"
+"print    [setting | connection]  :: imprimer la(les) valeur(s) de la propriété (paramètre/connexion)\n"
 "back                             :: se rendre sur le niveau supérieur\n"
-"help/?   [<command>]             :: imprimer cette description d'aide ou de "
-"commande\n"
+"help/?   [<command>]             :: imprimer cette description d'aide ou de commande\n"
 "quit                             :: quitter nmcli\n"
 
-#: ../clients/cli/connections.c:6609
+#: ../clients/cli/connections.c:6669
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
 "\n"
 "This command sets provided <value> to this property\n"
-msgstr ""
-"set [<value>]  :: définir une nouvelle valeur\n"
+msgstr "set [<value>]  :: définir une nouvelle valeur\n"
 "\n"
 "Cette commande définit la <value> (valeur) fournie à cette propriété\n"
 
-#: ../clients/cli/connections.c:6613
+#: ../clients/cli/connections.c:6673
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1738,25 +1650,21 @@ msgid ""
 "This command adds provided <value> to this property, if the property is of a "
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
-msgstr ""
-"add [<value>]  :: ajouter une nouvelle valeur à la propriété\n"
+msgstr "add [<value>]  :: ajouter une nouvelle valeur à la propriété\n"
 "\n"
-"Cette commande ajoute une <value> (valeur) fournie à cette propriété si la "
-"propriété est d'un type de conteneur. Pour les propriétés à valeur unique, "
-"ceci remplace la valeur (comme « set »).\n"
+"Cette commande ajoute une <value> (valeur) fournie à cette propriété si la propriété est d'un type de conteneur. Pour les propriétés à valeur unique, ceci remplace la valeur (comme « set »).\n"
 
-#: ../clients/cli/connections.c:6619
+#: ../clients/cli/connections.c:6679
 #, c-format
 msgid ""
 "change  :: change current value\n"
 "\n"
 "Displays current value and allows editing it.\n"
-msgstr ""
-"change  :: modifie la valeur actuelle\n"
+msgstr "change  :: modifie la valeur actuelle\n"
 "\n"
 "Affiche la valeur actuelle et permet sa modification.\n"
 
-#: ../clients/cli/connections.c:6623
+#: ../clients/cli/connections.c:6683
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1774,40 +1682,31 @@ msgid ""
 "          nmcli ipv4.dns> remove 2\n"
 "          nmcli bond.options> remove downdelay\n"
 "\n"
-msgstr ""
-"remove [<value>|<index>|<option name>]  :: supprime la valeur\n"
-"\n"
-"Supprime la valeur de la propriété. Pour les propriétés à valeur unique, "
-"cela ramène\n"
-"la propriété à sa valeur par défaut. Pour les propriétés de type conteneur, "
-"cela supprime\n"
-"toutes les valeurs de cette propriété, ou bien, vous pouvez spécifier un "
-"argument pour\n"
-"supprimer un seul élément ou une option. L'argument est soit à une valeur ou "
-"à index\n"
-"à supprimer, ou un nom d'option (pour les propriétés avec des options ayant "
-"des noms).\n"
+msgstr "remove [<value>|<index>|<option name>]  :: supprime la valeur\n"
+"\n"
+"Supprime la valeur de la propriété. Pour les propriétés à valeur unique, cela ramène\n"
+"la propriété à sa valeur par défaut. Pour les propriétés de type conteneur, cela supprime\n"
+"toutes les valeurs de cette propriété, ou bien, vous pouvez spécifier un argument pour\n"
+"supprimer un seul élément ou une option. L'argument est soit à une valeur ou à index\n"
+"à supprimer, ou un nom d'option (pour les propriétés avec des options ayant des noms).\n"
 "\n"
 "Exemples: nmcli ipv4.dns> remove 8.8.8.8\n"
 "          nmcli ipv4.dns> remove 2\n"
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6634
+#: ../clients/cli/connections.c:6694
 #, c-format
 msgid ""
 "describe  :: describe property\n"
 "\n"
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
-msgstr ""
-"describe  :: décrire la propriété\n"
+msgstr "describe  :: décrire la propriété\n"
 "\n"
-"Affiche la description de la propriété. Vous pouvez consulter la page du "
-"manuel nm-settings(5) pour voir tous les paramètres et toutes les propriétés "
-"NM.\n"
+"Affiche la description de la propriété. Vous pouvez consulter la page du manuel nm-settings(5) pour voir tous les paramètres et toutes les propriétés NM.\n"
 
-#: ../clients/cli/connections.c:6639
+#: ../clients/cli/connections.c:6699
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1815,595 +1714,564 @@ msgid ""
 "\n"
 "Shows property value. Providing an argument you can also display values for "
 "the whole setting or connection.\n"
-msgstr ""
-"print [property|setting|connection]  :: imprimer la(les) valeur(s) de la "
-"propriété (paramètre, connexion)\n"
+msgstr "print [property|setting|connection]  :: imprimer la(les) valeur(s) de la propriété (paramètre, connexion)\n"
 "\n"
-"Affiche la(les) valeur(s) de la propriété. En fournissant un argument, vous "
-"pourrez aussi afficher les valeurs de la totalité du paramètre ou de la "
-"connexion.\n"
+"Affiche la(les) valeur(s) de la propriété. En fournissant un argument, vous pourrez aussi afficher les valeurs de la totalité du paramètre ou de la connexion.\n"
 
-#: ../clients/cli/connections.c:6647
+#: ../clients/cli/connections.c:6707
 #, c-format
-msgid "help/? [<command>]  :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 msgstr "help/? [<command>]  :: aide pour les commandes nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6744
+#: ../clients/cli/connections.c:6804
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Erreur : échec de l'activation de la connexion.\n"
 
-#: ../clients/cli/connections.c:6841
+#: ../clients/cli/connections.c:6901
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
-msgstr ""
-"Erreur : le paramètre « %s » est obligatoire et ne peut pas être supprimé.\n"
+msgstr "Erreur : le paramètre « %s » est obligatoire et ne peut pas être supprimé.\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6859
+#: ../clients/cli/connections.c:6919
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 
-#: ../clients/cli/connections.c:6895
+#: ../clients/cli/connections.c:6955
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
-msgstr ""
-"La connexion n'est pas enregistrée. Souhaitez-vous réellement quitter ? %s"
+msgstr "La connexion n'est pas enregistrée. Souhaitez-vous réellement quitter ? %s"
 
-#: ../clients/cli/connections.c:6936
+#: ../clients/cli/connections.c:6996
 #, 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 ""
-"Le profil de connexion a été supprimé à partir d'un autre client. Vous "
-"pouvez saisir « enregistrer » dans le menu principal pour le restaurer.\n"
+msgstr "Le profil de connexion a été supprimé à partir d'un autre client. Vous pouvez saisir « enregistrer » dans le menu principal pour le restaurer.\n"
 
-#: ../clients/cli/connections.c:6970 ../clients/cli/connections.c:7359
-#: ../clients/cli/connections.c:7418
+#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
+#: ../clients/cli/connections.c:7488
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "Valeurs autorisées pour la propriété « %s » : %s\n"
 
-#: ../clients/cli/connections.c:6974 ../clients/cli/connections.c:7363
-#: ../clients/cli/connections.c:7422
+#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
+#: ../clients/cli/connections.c:7492
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Saisissez la valeur « %s » : "
 
-#: ../clients/cli/connections.c:6988 ../clients/cli/connections.c:7001
-#: ../clients/cli/connections.c:7367 ../clients/cli/connections.c:7433
+#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
+#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Erreur : échec du paramétrage de la propriété « %s » : %s\n"
 
-#: ../clients/cli/connections.c:6997
+#: ../clients/cli/connections.c:7057
 #, c-format
 msgid "Edit '%s' value: "
-msgstr "Paramétrer la valeur « %s » :"
+msgstr "Paramétrer la valeur « %s » : "
 
-#: ../clients/cli/connections.c:7015 ../clients/cli/settings.c:414
+#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erreur : %s\n"
 
-#: ../clients/cli/connections.c:7034
+#: ../clients/cli/connections.c:7099
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argument de commande inconnu : « %s »\n"
 
-#: ../clients/cli/connections.c:7125
+#: ../clients/cli/connections.c:7190
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Paramètres disponibles : %s\n"
 
-#: ../clients/cli/connections.c:7137
+#: ../clients/cli/connections.c:7202
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Erreur : nom de paramètre non valide ; %s\n"
 
-#: ../clients/cli/connections.c:7155
+#: ../clients/cli/connections.c:7220
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propriétés disponibles : %s\n"
 
-#: ../clients/cli/connections.c:7163
+#: ../clients/cli/connections.c:7228
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Erreur : propriété %s\n"
 
-#: ../clients/cli/connections.c:7208
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
 "Do you still want to save? %s"
-msgstr ""
-"Enregistrer la connexion avec « autoconnect=yes ». Ceci pourrait entraîner "
-"l'activation immédiate de la connexion.\n"
+msgstr "Enregistrer la connexion avec « autoconnect=yes ». Ceci pourrait entraîner l'activation immédiate de la connexion.\n"
 "Souhaitez-vous tout de même enregistrer ? %s"
 
-#: ../clients/cli/connections.c:7293
+#: ../clients/cli/connections.c:7358
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Vous pouvez modifier les paramètres suivants : %s\n"
 
-#: ../clients/cli/connections.c:7324
+#: ../clients/cli/connections.c:7389
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
-msgstr ""
-"Le profil de connexion a été supprimé à partir d'un autre client. Vous "
-"pouvez saisir « enregistrer » pour le restaurer.\n"
+msgstr "Le profil de connexion a été supprimé à partir d'un autre client. Vous pouvez saisir « enregistrer » pour le restaurer.\n"
 
-#: ../clients/cli/connections.c:7371 ../clients/cli/connections.c:7625
-#: ../clients/cli/connections.c:7657
+#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
+#: ../clients/cli/connections.c:7741
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Erreur : aucun paramètre sélectionné ; [%s] sont valides\n"
 
-#: ../clients/cli/connections.c:7372
+#: ../clients/cli/connections.c:7442
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "utilisez d'abord « goto <setting> » ou « set <setting>.<property> »\n"
 
-#: ../clients/cli/connections.c:7387 ../clients/cli/connections.c:7557
-#: ../clients/cli/connections.c:7647
+#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
+#: ../clients/cli/connections.c:7731
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Erreur : argument de paramètre « %s » non valide ; [%s] sont valides\n"
 
-#: ../clients/cli/connections.c:7396
+#: ../clients/cli/connections.c:7466
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Erreur : paramètre manquant pour la propriété « %s »\n"
 
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7473
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Erreur : propriété non valide : %s\n"
 
-#: ../clients/cli/connections.c:7465
+#: ../clients/cli/connections.c:7537
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Erreur : paramètre inconnu « %s »\n"
 
-#: ../clients/cli/connections.c:7490
+#: ../clients/cli/connections.c:7562
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Vous pouvez modifier les propriétés suivantes : %s\n"
 
-#: ../clients/cli/connections.c:7530 ../clients/cli/connections.c:7580
+#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Erreur : échec de la suppression de la valeur de « %s » : %s\n"
 
-#: ../clients/cli/connections.c:7535
+#: ../clients/cli/connections.c:7612
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Erreur : aucun argument donné ; [%s] sont valides\n"
 
-#: ../clients/cli/connections.c:7554
+#: ../clients/cli/connections.c:7631
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "Le paramètre « %s » n'est pas présent dans la connexion.\n"
 
-#: ../clients/cli/connections.c:7601
+#: ../clients/cli/connections.c:7685
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
-msgstr ""
-"Erreur : %s propriétés, il ne s'agit pas non plus d'un nom de paramètre.\n"
+msgstr "Erreur : %s propriétés, il ne s'agit pas non plus d'un nom de paramètre.\n"
 
-#: ../clients/cli/connections.c:7626 ../clients/cli/connections.c:7658
+#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr ""
-"utilisez d'abord « goto <setting> » ou « describe <setting>.<property> »\n"
+msgstr "utilisez d'abord « goto <setting> » ou « describe <setting>.<property> »\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:7765
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
-msgstr ""
-"Erreur : propriété non valide : %s, il ne s'agit pas non plus d'un nom de "
-"paramètre valide.\n"
+msgstr "Erreur : propriété non valide : %s, il ne s'agit pas non plus d'un nom de paramètre valide.\n"
 
-#: ../clients/cli/connections.c:7711
+#: ../clients/cli/connections.c:7795
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Erreur : paramètre inconnu : « %s »\n"
 
-#: ../clients/cli/connections.c:7716
+#: ../clients/cli/connections.c:7800
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "Erreur : le paramètre « %s » n'est pas présent dans la connexion.\n"
 
-#: ../clients/cli/connections.c:7747
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "Erreur : propriété non valide : %s%s,\n"
 
-#: ../clients/cli/connections.c:7749
+#: ../clients/cli/connections.c:7833
 msgid ", neither a valid setting name"
 msgstr "il ne s'agit pas non plus d'un nom de paramètre valide."
 
-#: ../clients/cli/connections.c:7765
+#: ../clients/cli/connections.c:7849
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "Option de vérification non valide : %s\n"
 
-#: ../clients/cli/connections.c:7773
+#: ../clients/cli/connections.c:7858
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Vérifier le paramètre « %s » : %s\n"
 
-#: ../clients/cli/connections.c:7788
+#: ../clients/cli/connections.c:7874
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Vérifier la connexion : %s\n"
 
-#: ../clients/cli/connections.c:7791
+#: ../clients/cli/connections.c:7877
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "L'erreur ne peut pas être résolue automatiquement.\n"
 
-#: ../clients/cli/connections.c:7812
+#: ../clients/cli/connections.c:7897
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "Erreur : argument « %s » non valideerify\n"
 
-#: ../clients/cli/connections.c:7862
+#: ../clients/cli/connections.c:7947
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Erreur : échec de l'enregistrement de la connexion « %s » (%s) : %s\n"
 
-#: ../clients/cli/connections.c:7868
+#: ../clients/cli/connections.c:7953
 #, c-format
 msgid "Error: Timeout saving '%s' (%s) connection\n"
 msgstr "Erreur : échec lors de l'enregistrement de la connexion '%s' (%s)\n"
 
-#: ../clients/cli/connections.c:7873
+#: ../clients/cli/connections.c:7958
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Connexion « %s » (%s) enregistrée.\n"
 
-#: ../clients/cli/connections.c:7874
+#: ../clients/cli/connections.c:7959
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "Connexion « %s » (%s) mise à jour.\n"
 
-#: ../clients/cli/connections.c:7907
+#: ../clients/cli/connections.c:7992
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Erreur : échec de la vérification de la connexion : %s\n"
 
-#: ../clients/cli/connections.c:7908
+#: ../clients/cli/connections.c:7993
 msgid "(unknown error)"
 msgstr "(erreur inconnue)"
 
-#: ../clients/cli/connections.c:7909
+#: ../clients/cli/connections.c:7994
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "Vous devriez exécuter « verify fix » pour régler les erreurs.erify\n"
 
-#: ../clients/cli/connections.c:7931
+#. TRANSLATORS: do not translate 'save', leave it as it is
+#: ../clients/cli/connections.c:8017
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
-msgstr ""
-"Erreur : la connexion n'est pas enregistrée. Commencez par saisir « save »."
-"\n"
+msgstr "Erreur : la connexion n'est pas enregistrée. Commencez par saisir « save ».\n"
 
-#: ../clients/cli/connections.c:7935
+#: ../clients/cli/connections.c:8021
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Erreur : la connexion n'est pas valide : %s\n"
 
-#: ../clients/cli/connections.c:7945
+#: ../clients/cli/connections.c:8031
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Erreur : impossible d'activer la connexion : %s.\n"
 
-#: ../clients/cli/connections.c:7954
+#: ../clients/cli/connections.c:8040
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Erreur : échec de l'activation de la connexion « %s » (%s) : %s\n"
 
-#: ../clients/cli/connections.c:7961
+#: ../clients/cli/connections.c:8047
 msgid "Monitoring connection activation (press any key to continue)\n"
-msgstr ""
-"Contrôle de l'activation de la connexion (appuyez sur n'importe quelle "
-"touche pour continuer)\n"
+msgstr "Contrôle de l'activation de la connexion (appuyez sur n'importe quelle touche pour continuer)\n"
 
-#: ../clients/cli/connections.c:7997
+#: ../clients/cli/connections.c:8083
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Erreur : statut ligne : %s\n"
 
-#: ../clients/cli/connections.c:8005
+#: ../clients/cli/connections.c:8091
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Erreur : sauvegarder confirmation : %s\n"
 
-#: ../clients/cli/connections.c:8013
+#: ../clients/cli/connections.c:8099
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "Erreur : afficher les secrets : %s\n"
 
-#: ../clients/cli/connections.c:8020
+#: ../clients/cli/connections.c:8106
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuration nmcli actuelle :\n"
 
-#: ../clients/cli/connections.c:8028
+#: ../clients/cli/connections.c:8114
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Option de configuration « %s » non valide ; [%s] autorisé\n"
 
-#: ../clients/cli/connections.c:8249
+#: ../clients/cli/connections.c:8335
 #, c-format
 msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
-msgstr ""
-"Erreur : une seule des valeurs 'id', 'filename' (nom de fichier) ,'uuid’ ou "
-"'path' (chemin) peut être fournie."
+msgstr "Erreur : une seule des valeurs 'id', 'filename' (nom de fichier) ,'uuid’ ou 'path' (chemin) peut être fournie."
 
-#: ../clients/cli/connections.c:8263 ../clients/cli/connections.c:8424
+#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Erreur : connexion inconnue : « %s »."
 
-#: ../clients/cli/connections.c:8279
+#: ../clients/cli/connections.c:8365
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
-msgstr ""
-"Avertissement : modification de la connexion existante « %s » ; l'argument "
-"« type » est ignoré\n"
+msgstr "Avertissement : modification de la connexion existante « %s » ; l'argument « type » est ignoré\n"
 
-#: ../clients/cli/connections.c:8282
+#: ../clients/cli/connections.c:8368
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
-msgstr ""
-"Avertissement : modification de la connexion existante « %s » ; l'argument "
-"« con-name » est ignoré\n"
+msgstr "Avertissement : modification de la connexion existante « %s » ; l'argument « con-name » est ignoré\n"
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:8395
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Types de connexion valides : %s\n"
 
-#: ../clients/cli/connections.c:8311
+#: ../clients/cli/connections.c:8397
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Erreur : type de connexion non valide ; %s\n"
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:8433
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| éditeur de connexions interactives nmcli |==="
 
-#: ../clients/cli/connections.c:8350
+#: ../clients/cli/connections.c:8436
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modification de la connexion « %s » : « %s »"
 
-#: ../clients/cli/connections.c:8352
+#: ../clients/cli/connections.c:8438
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Ajout d'une nouvelle connexion « %s »"
 
-#: ../clients/cli/connections.c:8354
+#. TRANSLATORS: do not translate 'help', leave it as it is
+#: ../clients/cli/connections.c:8441
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Saisissez « help » ou « ? » pour les commandes disponibles."
 
-#: ../clients/cli/connections.c:8356
+#. TRANSLATORS: do not translate 'print', leave it as it is
+#: ../clients/cli/connections.c:8444
 #, c-format
 msgid "Type 'print' to show all the connection properties."
-msgstr ""
-"Saisissez « print » (imprimer) pour afficher toutes les propriétés de "
-"connexion."
+msgstr "Saisissez « print » (imprimer) pour afficher toutes les propriétés de connexion."
 
-#: ../clients/cli/connections.c:8358
+#. TRANSLATORS: do not translate 'describe', leave it as it is
+#: ../clients/cli/connections.c:8447
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
-msgstr ""
-"Saisissez « describe [<setting>.<prop>] »  pour une description de propriété "
-"détaillée."
+msgstr "Saisissez « describe [<setting>.<prop>] »  pour une description de propriété détaillée."
 
-#: ../clients/cli/connections.c:8386
+#: ../clients/cli/connections.c:8475
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Erreur : la modification de la connexion « %s » a échoué : %s"
 
-#: ../clients/cli/connections.c:8392
+#: ../clients/cli/connections.c:8481
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Connexion « %s » (%s) modifiée.\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8549
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) clonée en tant que %s (%s).\n"
 
-#: ../clients/cli/connections.c:8519
+#: ../clients/cli/connections.c:8608
 msgid "New connection name: "
-msgstr "Nom de la nouvelle connexion :"
+msgstr "Nom de la nouvelle connexion : "
 
-#: ../clients/cli/connections.c:8521
+#: ../clients/cli/connections.c:8610
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "Erreur : le paramètre <new name> est manquant."
 
-#: ../clients/cli/connections.c:8526 ../clients/cli/connections.c:9005
+#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "Erreur : argument supplémentaire « %s » inconnu."
 
-#: ../clients/cli/connections.c:8559
+#: ../clients/cli/connections.c:8648
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "Erreur : les connexions n'ont pas toutes été supprimées."
 
-#: ../clients/cli/connections.c:8560
+#: ../clients/cli/connections.c:8649
 #, c-format
 msgid "Error: Connection deletion failed: %s\n"
 msgstr "Erreur : la suppression de la connexion a échoué : %s\n"
 
-#: ../clients/cli/connections.c:8616 ../clients/cli/connections.c:8737
+#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
 #, c-format
 msgid "Error: %s.\n"
 msgstr "Erreur : %s.\n"
 
-#: ../clients/cli/connections.c:8617 ../clients/cli/connections.c:8738
+#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
 #, c-format
 msgid "Error: not all connections found."
 msgstr "Erreur : les connexions n'ont pas toutes été trouvées."
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8668
+#: ../clients/cli/connections.c:8757
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
-msgstr ""
-"Erreur : impossible de supprimer la(les) connexion(s) inconnue(s) : %s."
+msgstr "Erreur : impossible de supprimer la(les) connexion(s) inconnue(s) : %s."
 
-#: ../clients/cli/connections.c:8678
+#: ../clients/cli/connections.c:8767
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: le profil de connexion a changé\n"
 
-#: ../clients/cli/connections.c:8704
+#: ../clients/cli/connections.c:8793
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: profil de connection créé\n"
 
-#: ../clients/cli/connections.c:8713
+#: ../clients/cli/connections.c:8802
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: profil de connexion supprimé\n"
 
-#: ../clients/cli/connections.c:8776
+#: ../clients/cli/connections.c:8873
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "Erreur : échec lors du rechargement des connexions : %s."
 
-#: ../clients/cli/connections.c:8809
+#: ../clients/cli/connections.c:8905
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "Erreur : échec lors du rechargement de la connexion : %s."
 
-#: ../clients/cli/connections.c:8817
+#: ../clients/cli/connections.c:8913
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "Impossible de charger le fichier « %s »\n"
 
-#: ../clients/cli/connections.c:8824
+#: ../clients/cli/connections.c:8920
 msgid "File to import: "
-msgstr "Fichier à importer :"
+msgstr "Fichier à importer : "
 
-#: ../clients/cli/connections.c:8857
+#: ../clients/cli/connections.c:8953
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Erreur : aucun argument fourni."
 
-#: ../clients/cli/connections.c:8888
+#: ../clients/cli/connections.c:8984
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "Avertissement : 'type' déjà spécifié, le second sera ignoré.\n"
 
-#: ../clients/cli/connections.c:8902
+#: ../clients/cli/connections.c:8998
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "Avertissement : 'fichier' déjà spécifié, le second sera ignoré.\n"
 
-#: ../clients/cli/connections.c:8904
-#, c-format
-msgid "Unknown parameter: %s"
-msgstr "Paramètre inconnu : %s"
-
-#: ../clients/cli/connections.c:8915
+#: ../clients/cli/connections.c:9011
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Erreur : l'argument « type » est requis."
 
-#: ../clients/cli/connections.c:8919
+#: ../clients/cli/connections.c:9015
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "Erreur : l'argument «fichier » est requis."
 
-#: ../clients/cli/connections.c:8928
+#: ../clients/cli/connections.c:9024
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "Erreur : impossible de trouver le greffon VPN pour %s."
 
-#: ../clients/cli/connections.c:8935 ../clients/cli/connections.c:9026
+#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "Erreur : échec du chargement du greffon de VPN : %s."
 
-#: ../clients/cli/connections.c:8944
+#: ../clients/cli/connections.c:9040
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "Erreur : n'a pas pu importer « %s »: %s."
 
-#: ../clients/cli/connections.c:9012
+#: ../clients/cli/connections.c:9108
 msgid "Output file name: "
-msgstr "Nom du fichier de sortie :"
+msgstr "Nom du fichier de sortie : "
 
-#: ../clients/cli/connections.c:9017
+#: ../clients/cli/connections.c:9113
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "Erreur : la connexion n'est pas VPN."
 
-#: ../clients/cli/connections.c:9039
+#: ../clients/cli/connections.c:9135
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "Erreur : impossible de créer le fichier temporaire %s"
 
-#: ../clients/cli/connections.c:9047
+#: ../clients/cli/connections.c:9143
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "Erreur : n'a pas pu exporter « %s » : %s."
 
-#: ../clients/cli/connections.c:9059
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "Erreur : n'a pas pu lire le fichier temporaire « %s » : %s."
 
 #. define some prompts
-#: ../clients/cli/devices.c:37
+#: ../clients/cli/devices.c:23
 msgid "Interface: "
 msgstr "Interface : "
 
-#: ../clients/cli/devices.c:38
+#: ../clients/cli/devices.c:24
 msgid "Interface(s): "
 msgstr "Interface(s) : "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1234
+#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
+#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: ../clients/cli/devices.c:333
+#: ../clients/cli/devices.c:322
 #, c-format
 msgid "<invisible> | %s"
 msgstr "<invisible> | %s"
 
-#: ../clients/cli/devices.c:334
+#: ../clients/cli/devices.c:323
 msgid "<invisible>"
 msgstr "<invisible>"
 
-#: ../clients/cli/devices.c:435
+#: ../clients/cli/devices.c:424
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:693
+#: ../clients/cli/devices.c:725
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2441,13 +2309,13 @@ msgid ""
 "\n"
 "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
+"  wifi show-password [ifname <ifname>]\n"
+"\n"
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
-msgstr ""
-"Usage: nmcli device { COMMAND | help }\n"
+msgstr "Usage: nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | set | connect | reapply | modify | disconnect | "
-"delete | monitor | wifi | lldp }\n"
+"COMMAND := { status | show | set | connect | reapply | modify | disconnect | delete | monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
@@ -2467,22 +2335,21 @@ msgstr ""
 "\n"
 "  monitor <ifname> ...\n"
 "\n"
-"  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
+"  wifi [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
 "\n"
-"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no] "
-"[hidden yes|no]\n"
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n"
 "\n"
-"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
-"[channel <channel>] [password <password>]\n"
+"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] [channel <channel>] [password <password>]\n"
 "\n"
 "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
+"  wifi show-password [ifname <ifname>]\n"
+"\n"
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:716
+#: ../clients/cli/devices.c:749
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2493,11 +2360,12 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device status { help }\n"
+msgstr "Syntaxe : nmcli device status { help }\n"
 "\n"
 "Affiche le statut de tous les périphériques.\n"
 "Par défaut, on peut voir les colonnes suivantes :\n"
@@ -2505,13 +2373,11 @@ msgstr ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Les colonnes affichées peuvent être modifiées en utilisant l'option globale "
-"'--fields'. status'\n"
-"est la commande par défaut, c-a-d que 'nmcli device' appelle 'nmcli device "
-"status'.\n"
+"Les colonnes affichées peuvent être modifiées en utilisant l'option globale '--fields'. status'\n"
+"est la commande par défaut, c-a-d que 'nmcli device' appelle 'nmcli device status'.\n"
 "\n"
 
-#: ../clients/cli/devices.c:731
+#: ../clients/cli/devices.c:764
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2521,17 +2387,15 @@ msgid ""
 "Show details of device(s).\n"
 "The command lists details for all devices, or for a given device.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device show { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<ifname>]\n"
 "\n"
 "Affiche les informations sur les périphériques.\n"
-"La commande afficher tous les détails de tous les périphériques, ou pour un "
-"périphérique donné.\n"
+"La commande afficher tous les détails de tous les périphériques, ou pour un périphérique donné.\n"
 "\n"
 
-#: ../clients/cli/devices.c:742
+#: ../clients/cli/devices.c:775
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2539,22 +2403,20 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device connect { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device connect { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connecte le périphérique.\n"
 "NetworkManager tentera de trouver une connexion convenable qui sera activée.\n"
-"NetworkManager envisagera aussi les connexions qui ne sont pas réglées sur "
-"auto-connect.\n"
+"NetworkManager envisagera aussi les connexions qui ne sont pas réglées sur auto-connect.\n"
 "\n"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:787
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2564,16 +2426,14 @@ msgid ""
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
-msgstr ""
-"Usage: nmcli device reapply { ARGUMENTS | help }\n"
+msgstr "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
-"Tentatives de mettre à jour le périphérique avec les modifications apportées "
-"à la connexion active depuis sa dernière application.\n"
+"Tentatives de mettre à jour le périphérique avec les modifications apportées à la connexion active depuis sa dernière application.\n"
 "\n"
 
-#: ../clients/cli/devices.c:765
+#: ../clients/cli/devices.c:798
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2588,32 +2448,26 @@ msgid ""
 "The '-' sign allows removing selected items instead of the whole value.\n"
 "\n"
 "Examples:\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-msgstr ""
-"Usage: nmcli device modify { ARGUMENTS | --help }\n"
+msgstr "Usage: nmcli device modify { ARGUMENTS | --help }\n"
 "\n"
 "ARGUMENTS := <ifname> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
-"Modifie une ou plusieurs propriétés actuellement actives sur le périphérique "
-"sans modifier le profil de connexion. Ces modifications ont un effet "
-"immédiat. Pour les propriétés à valeurs multiples, vous pouvez ajouter les "
-"préfixes « + » ou « - » optionnels au nom de la propriété. \n"
-"Le signe « - » permet de supprimer des éléments sélectionnés au lieu de tout "
-"supprimer.\n"
+"Modifie une ou plusieurs propriétés actuellement actives sur le périphérique sans modifier le profil de connexion. Ces modifications ont un effet immédiat. Pour les propriétés à valeurs multiples, vous pouvez ajouter les préfixes « + » ou « - » optionnels au nom de la propriété. \n"
+"Le signe « - » permet de supprimer des éléments sélectionnés au lieu de tout supprimer.\n"
 "Le signe « + » permet d'ajouter des éléments au lieu de tout remplacer.\n"
 "\n"
 "Exemples :\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
 "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:785
+#: ../clients/cli/devices.c:818
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2624,19 +2478,16 @@ msgid ""
 "The command disconnects the device and prevents it from auto-activating\n"
 "further connections without user/manual intervention.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device disconnect { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Déconnecte le périphérique.\n"
-"La commande déconnecte le périphérique et l'empêche d'activer "
-"automatiquement\n"
-"des connexions supplémentaires sans une intervention manuelle de "
-"l'utilisateur.\n"
+"La commande déconnecte le périphérique et l'empêche d'activer automatiquement\n"
+"des connexions supplémentaires sans une intervention manuelle de l'utilisateur.\n"
 "\n"
 
-#: ../clients/cli/devices.c:797
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2648,20 +2499,17 @@ msgid ""
 "(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
 "command.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device show { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<ifname>]\n"
 "\n"
 "Affiche les détails du (ou des) périphérique(s).\n"
-"La commande supprime les interfaces. Elle fonctionne uniquement pour les "
-"péréphériques\n"
-"(bonds, ponts, etc.). Les périphériques physiques ne peuvent pas être "
-"supprimés par la\n"
+"La commande supprime les interfaces. Elle fonctionne uniquement pour les péréphériques\n"
+"(bonds, ponts, etc.). Les périphériques physiques ne peuvent pas être supprimés par la\n"
 "commande.\n"
 "\n"
 
-#: ../clients/cli/devices.c:810
+#: ../clients/cli/devices.c:843
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2673,8 +2521,7 @@ msgid ""
 "\n"
 "Modify device properties.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device set { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device set { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
 "DEVICE    := [ifname] <ifname> \n"
@@ -2684,7 +2531,7 @@ msgstr ""
 "Modifie les propriétés du périphérique.\n"
 "\n"
 
-#: ../clients/cli/devices.c:823
+#: ../clients/cli/devices.c:856
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2695,32 +2542,31 @@ msgid ""
 "This command prints a line whenever the specified devices change state.\n"
 "Monitors all devices in case no interface is specified.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device show { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device show { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<ifname>]\n"
 "\n"
 "Surveille l'activité du périphérique.\n"
-"Cette commande affiche une ligne quand les périphériques indiqués changent "
-"d'état.\n"
+"Cette commande affiche une ligne quand les périphériques indiqués changent d'état.\n"
 "Surveille tous les périphériques si aucune interface n'est spécifiée.\n"
 "\n"
 
-#: ../clients/cli/devices.c:835
+#: ../clients/cli/devices.c:868
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Perform operation on Wi-Fi devices.\n"
 "\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
+"auto]]\n"
 "\n"
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID. The\n"
 "--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
 "                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -2747,50 +2593,37 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
 "given. Note that this command does not show the APs,\n"
 "use 'nmcli device wifi list' for that.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device wifi { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Effectue des opérations sur des périphériques Wi-Fi.\n"
 "\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan "
-"yes|no|auto]]]\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]]\n"
 "\n"
-"Répertorie les points d'accès Wi-Fi disponibles. Les options « ifname » et "
-"« bssid » peuvent être utilisées pour répertorier les points d'accès pour "
-"une interface en particulier, ou avec un BSSID spécifique. L'argument --"
-"rescan indique si on on doit scanner à nouveau le Wi-FI.\n"
+"Répertorie les points d'accès Wi-Fi disponibles. Les options « ifname » et « bssid » peuvent être utilisées pour répertorier les points d'accès pour une interface en particulier, ou avec un BSSID spécifique. L'argument --rescan indique si on on doit scanner à nouveau le Wi-FI.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
-"yes|no]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n"
+"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n"
 "\n"
-"Se connecte à un réseau Wi-Fi spécifié par SSID ou BSSID. La commande crée "
-"une nouvelle connexion, puis l'active sur un périphérique. Ceci correspond "
-"en ligne de commande à un clic sur un SSID dans un client GUI.\n"
+"Se connecte à un réseau Wi-Fi spécifié par SSID ou BSSID. La commande crée une nouvelle connexion, puis l'active sur un périphérique. Ceci correspond en ligne de commande à un clic sur un SSID dans un client GUI.\n"
 "Si une connexion au réseau existe déjà, il vaut mieux ouvrir\n"
-"le profil existant comme suit : nmcli con up id <name>. Remarquez que seuls "
-"les réseaux ouverts, WEP et WPA-PSK sont pris en charge s'il n’existe pas de "
-"connexion déjà existante.  Il est aussi supposé que la configuration IP est "
-"obtenue via DHCP.\n"
+"le profil existant comme suit : nmcli con up id <name>. Remarquez que seuls les réseaux ouverts, WEP et WPA-PSK sont pris en charge s'il n’existe pas de connexion déjà existante.  Il est aussi supposé que la configuration IP est obtenue via DHCP.\n"
 "\n"
-"ARGUMENTS := wifi hotspot [ifname <nom d'interface>] [con-name <nom>] [ssid "
-"<SSID>]\n"
-"                          [band a|bg] [channel <canal>] [password <mot de "
-"passe>]\n"
+"ARGUMENTS := wifi hotspot [ifname <nom d'interface>] [con-name <nom>] [ssid <SSID>]\n"
+"                          [band a|bg] [channel <canal>] [password <mot de passe>]\n"
 "\n"
 "Crée un hotspot Wi-Fi. Utiliser 'connection down' or 'device disconnect'\n"
 "pour vous déconnecter du hotspot.\n"
-"Les paramètres du hotspot peuvent être influencés par les paramètres "
-"optionnels :\n"
+"Les paramètres du hotspot peuvent être influencés par les paramètres optionnels :\n"
 "ifname - périphérique Wi-Fi à utiliser\n"
 "con-name - nom du profil de connexion hotspot créé\n"
 "ssid - SSID du hotspot\n"
@@ -2800,496 +2633,488 @@ msgstr ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Requiert que NetworkManager effectue immédiatement un nouveau scan pour "
-"trouver les points d'accès disponibles.\n"
-"NetworkManager scanne les réseaux Wi-Fi de manière périodique, mais dans "
-"certains cas il peut être utile d'effectuer le scan manuellement. 'ssid' "
-"autorise le scan d'un SSID spécifique, ce qui est utile pour les point "
-"d'accès dont le SSID est masqué. Plusieurs paramètres 'ssid' peuvent être "
-"passés. Remarquez que cette commande n'affiche pas les points d'accès, "
-"veuillez utiliser « nmcli device wifi list » pour cela.\n"
+"Requiert que NetworkManager effectue immédiatement un nouveau scan pour trouver les points d'accès disponibles.\n"
+"NetworkManager scanne les réseaux Wi-Fi de manière périodique, mais dans certains cas il peut être utile d'effectuer le scan manuellement. 'ssid' autorise le scan d'un SSID spécifique, ce qui est utile pour les point d'accès dont le SSID est masqué. Plusieurs paramètres 'ssid' peuvent être passés. Remarquez que cette commande n'affiche pas les points d'accès, veuillez utiliser « nmcli device wifi list » pour cela.\n"
 "\n"
 
-#: ../clients/cli/devices.c:882
+#: ../clients/cli/devices.c:915
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can "
+"be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli device lldp { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"Fait la liste de tous les périphériques à proximité via LLDP. L'option "
-"'ifname' peut être\n"
+"Fait la liste de tous les périphériques à proximité via LLDP. L'option 'ifname' peut être\n"
 "utilisée pour dresser cette liste pour une interface donnée.\n"
 "\n"
 
-#: ../clients/cli/devices.c:980
+#: ../clients/cli/devices.c:1013
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Erreur : aucune interface spécifiée."
 
-#: ../clients/cli/devices.c:1003
+#: ../clients/cli/devices.c:1036
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "Avertissement : l'argument « %s » est dupliqué.\n"
 
-#: ../clients/cli/devices.c:1006
+#: ../clients/cli/devices.c:1039
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "Erreur : périphérique « %s » introuvable.\n"
 
-#: ../clients/cli/devices.c:1007
+#: ../clients/cli/devices.c:1040
 #, c-format
 msgid "Error: not all devices found."
 msgstr "Erreur : les périphériques n'ont pas tous été trouvés."
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:1071
 msgid "No interface specified"
 msgstr "Aucune interface spécifiée"
 
-#: ../clients/cli/devices.c:1057
+#: ../clients/cli/devices.c:1090
 #, c-format
 msgid "Device '%s' not found"
 msgstr "Périphérique « %s » introuvable"
 
-#: ../clients/cli/devices.c:1153
+#: ../clients/cli/devices.c:1186
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1154
+#: ../clients/cli/devices.c:1187
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:1193
+#: ../clients/cli/devices.c:1226
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:1194
+#: ../clients/cli/devices.c:1227
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:1195 ../src/devices/wifi/nm-device-olpc-mesh.c:133
+#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../clients/cli/devices.c:1196
+#: ../clients/cli/devices.c:1229
 msgid "N/A"
 msgstr "N/A"
 
-#: ../clients/cli/devices.c:1391
+#: ../clients/cli/devices.c:1424
 msgid "Device details"
 msgstr "Détails de périphérique"
 
-#: ../clients/cli/devices.c:1402
+#: ../clients/cli/devices.c:1435
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Erreur : « device show » : %s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1747
 msgid "Status of devices"
 msgstr "État des périphériques"
 
-#: ../clients/cli/devices.c:1704
+#: ../clients/cli/devices.c:1751
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Erreur : « device status » : %s"
 
-#: ../clients/cli/devices.c:1731 ../clients/cli/devices.c:2171
-#: ../clients/cli/devices.c:4145
-#, c-format
-msgid "Error: invalid extra argument '%s'."
-msgstr "Erreur : argument supplémentaire « %s » non valide."
-
-#: ../clients/cli/devices.c:1767 ../clients/cli/general.c:519
+#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erreur : le délai d'attente de %d sec a expiré."
 
-#: ../clients/cli/devices.c:1816
+#: ../clients/cli/devices.c:1886
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Périphérique « %s » activé avec « %s ».\n"
 
-#: ../clients/cli/devices.c:1822
+#: ../clients/cli/devices.c:1891
+#, c-format
+msgid ""
+"Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
+msgstr "Indice utile : \"nmcli dev wifi show-password\" affiche le nom et le mot de passe Wi-Fi.\n"
+
+#: ../clients/cli/devices.c:1895
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "Erreur : échec de l'activation de la connexion : (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1861
+#: ../clients/cli/devices.c:1925
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "Erreur : échec lors de l'installation du Wi-Fi Hotspot : %s"
 
-#: ../clients/cli/devices.c:1864
+#: ../clients/cli/devices.c:1928
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
-msgstr ""
-"Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
+msgstr "Erreur : échec de l'ajout ou de l'activation de la nouvelle connexion : %s"
 
-#: ../clients/cli/devices.c:1867
+#: ../clients/cli/devices.c:1931
 #, c-format
 msgid "Error: Failed to activate connection: %s"
 msgstr "Erreur : échec d'activation de la connexion : %s"
 
-#: ../clients/cli/devices.c:1936
+#: ../clients/cli/devices.c:1996
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Erreur : l'activation du périphérique a échoué : %s"
 
-#: ../clients/cli/devices.c:1945
-#, c-format
-msgid "Error: Device activation failed: device was disconnected"
-msgstr ""
-"Erreur : l'activation du périphérique a échoué : le périphérique a été "
-"disconnecté"
-
-#: ../clients/cli/devices.c:1998
+#: ../clients/cli/devices.c:2046
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Erreur : argument supplémentaire non autorisé : « %s »."
 
-#: ../clients/cli/devices.c:2071 ../clients/cli/devices.c:2086
-#: ../clients/cli/devices.c:2323
+#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
+#: ../clients/cli/devices.c:2368
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "Périphérique « %s » déconnecté.\n"
 
-#: ../clients/cli/devices.c:2074 ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "Périphérique « %s »supprimé.\n"
 
-#: ../clients/cli/devices.c:2136 ../clients/cli/devices.c:2206
+#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "Erreur : échec de reconnexion du périphérique « %s » (%s) : %s"
 
-#: ../clients/cli/devices.c:2146 ../clients/cli/devices.c:2215
+#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "Connexion au périphérique réactivée : %s)\n"
 
-#: ../clients/cli/devices.c:2240
+#: ../clients/cli/devices.c:2285
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
-msgstr ""
-"Erreur : échec de lecture de la connexion actuelle du périphérique « %s » "
-"(%s) : %s"
+msgstr "Erreur : échec de lecture de la connexion actuelle du périphérique « %s » (%s) : %s"
 
-#: ../clients/cli/devices.c:2307
+#: ../clients/cli/devices.c:2352
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "Erreur : tous les périphériques ne sont pas déconnectés."
 
-#: ../clients/cli/devices.c:2308
+#: ../clients/cli/devices.c:2353
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s\n"
 
-#: ../clients/cli/devices.c:2388
+#: ../clients/cli/devices.c:2433
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "Erreur : les périphériques n'ont pas tous été supprimés."
 
-#: ../clients/cli/devices.c:2389
+#: ../clients/cli/devices.c:2434
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "Erreur : la suppression du périphérique « %s » (%s) a échoué : %s\n"
 
-#: ../clients/cli/devices.c:2471
+#: ../clients/cli/devices.c:2516
 #, c-format
 msgid "Error: No property specified."
 msgstr "Erreur : aucune propriété n'a été spécifiée."
 
-#: ../clients/cli/devices.c:2486 ../clients/cli/devices.c:2503
-#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
+#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
+#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Erreur&nbsp;: l'argument « %s » est manquant."
 
-#: ../clients/cli/devices.c:2492
+#: ../clients/cli/devices.c:2537
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "Erreur: 'géré': %s."
 
-#: ../clients/cli/devices.c:2509
+#: ../clients/cli/devices.c:2554
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Erreur : « autoconnect » : %s."
 
-#: ../clients/cli/devices.c:2517 ../clients/cli/general.c:718
+#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "Erreur : propriété « %s » inconnue."
 
-#: ../clients/cli/devices.c:2566
+#: ../clients/cli/devices.c:2611
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: utilisation de la connection « %s »\n"
 
-#: ../clients/cli/devices.c:2592
+#: ../clients/cli/devices.c:2637
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: périphérique créé\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/cli/devices.c:2599
+#: ../clients/cli/devices.c:2644
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: périphérique supprimé\n"
 
-#: ../clients/cli/devices.c:2779
+#: ../clients/cli/devices.c:2824
 msgid "Wi-Fi scan list"
 msgstr "Liste de balayage Wi-Fi"
 
-#: ../clients/cli/devices.c:2866
+#: ../clients/cli/devices.c:2911
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Erreur : point d'accès avec bssid « %s » introuvable."
 
-#: ../clients/cli/devices.c:3022
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Erreur : « device wifi » : %s"
 
-#: ../clients/cli/devices.c:3040
+#: ../clients/cli/devices.c:3087
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
-msgstr ""
-"Erreur : argument de rescan non valide : « %s » pas parmi [auto, non, oui]"
+msgstr "Erreur : argument de rescan non valide : « %s » pas parmi [auto, non, oui]"
 
-#: ../clients/cli/devices.c:3047
+#: ../clients/cli/devices.c:3094
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Erreur : périphérique « %s » introuvable."
 
-#: ../clients/cli/devices.c:3058
+#: ../clients/cli/devices.c:3105
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr ""
-"Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi. Vérifier le "
-"greffon Wi-Fi du NetworkManager."
+msgstr "Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi. Vérifier le greffon Wi-Fi du NetworkManager."
 
-#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3322
-#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3983
+#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
+#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
+#: ../clients/cli/devices.c:4266
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "Erreur : le périphérique « %s » n'est pas un périphérique Wi-Fi."
 
-#: ../clients/cli/devices.c:3171
+#: ../clients/cli/devices.c:3277
 msgid "SSID or BSSID: "
 msgstr "SSID ou BSSID : "
 
-#: ../clients/cli/devices.c:3176
+#: ../clients/cli/devices.c:3282
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Erreur : SSID ou BSSID sont manquants."
 
-#: ../clients/cli/devices.c:3213
+#: ../clients/cli/devices.c:3319
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
-msgstr ""
-"Erreur : la valeur de l'argument bssid « %s » n'est pas une valeur BSSID "
-"valide."
+msgstr "Erreur : la valeur de l'argument bssid « %s » n'est pas une valeur BSSID valide."
 
-#: ../clients/cli/devices.c:3243
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
-msgstr ""
-"Erreur : la valeur de l'argument wep-key-type « %s » est non valide, "
-"veuillez utiliser « key » ou « phrase »."
+msgstr "Erreur : la valeur de l'argument wep-key-type « %s » est non valide, veuillez utiliser « key » ou « phrase »."
 
-#: ../clients/cli/devices.c:3270 ../clients/cli/devices.c:3288
+#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Erreur : %s : %s."
 
-#: ../clients/cli/devices.c:3305
+#: ../clients/cli/devices.c:3413
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
-msgstr ""
-"Erreur : le BSSID devant se connecter à (%s) diffère de l'argument bssid "
-"(%s)."
+msgstr "Erreur : le BSSID devant se connecter à (%s) diffère de l'argument bssid (%s)."
 
-#: ../clients/cli/devices.c:3311
+#: ../clients/cli/devices.c:3419
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Erreur : le paramètre « %s » est ni un SSID, ni un BSSID."
 
-#: ../clients/cli/devices.c:3324 ../clients/cli/devices.c:3825
-#: ../clients/cli/devices.c:3985
+#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
+#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Erreur : aucun périphérique Wi-Fi trouvé."
 
-#: ../clients/cli/devices.c:3344
+#: ../clients/cli/devices.c:3452
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "Erreur : impossible de scanner le SSID caché : %s."
 
-#: ../clients/cli/devices.c:3371
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Erreur : aucun réseau avec le SSID « %s » trouvé."
 
-#: ../clients/cli/devices.c:3373
+#: ../clients/cli/devices.c:3481
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Erreur : aucun point d'accès avec le BSSID « %s » trouvé."
 
-#: ../clients/cli/devices.c:3401
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Connection '%s' exists but properties don't match."
-msgstr ""
-"Erreur : la connexion « %s » existe mais les propriétés ne correspondent pas."
-""
+msgstr "Erreur : la connexion « %s » existe mais les propriétés ne correspondent pas."
 
-#: ../clients/cli/devices.c:3444
+#: ../clients/cli/devices.c:3551
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
-msgstr ""
-"Attention : « %s » doit correspondre à un SSID pour les points d'accès "
-"cachés ; mais il correspond à un BSSID.\n"
+msgstr "Attention : « %s » doit correspondre à un SSID pour les points d'accès cachés ; mais il correspond à un BSSID.\n"
 
-#: ../clients/cli/devices.c:3481
+#: ../clients/cli/devices.c:3588
 msgid "Password: "
-msgstr "Mot de passe :"
+msgstr "Mot de passe : "
 
-#: ../clients/cli/devices.c:3644
+#: ../clients/cli/devices.c:3729
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "« %s » n'est pas un WPA PSK valide"
 
-#: ../clients/cli/devices.c:3661
+#: ../clients/cli/devices.c:3746
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
-msgstr ""
-"« %s » n'est pas une clé WEP valide (devrait faire 5 ou 13 caractères ASCI)"
+msgstr "« %s » n'est pas une clé WEP valide (devrait faire 5 ou 13 caractères ASCI)"
 
-#: ../clients/cli/devices.c:3677
+#: ../clients/cli/devices.c:3762
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "Mot de passe hotspot : %s\n"
 
-#: ../clients/cli/devices.c:3748
+#: ../clients/cli/devices.c:3927
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "Erreur : « ssid » est trop long."
 
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3942
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
-msgstr ""
-"Erreur : la valeur de l'argument de bande « %s » est non valide, veuillez "
-"utiliser « a » ou « bg »."
+msgstr "Erreur : la valeur de l'argument de bande « %s » est non valide, veuillez utiliser « a » ou « bg »."
 
-#: ../clients/cli/devices.c:3787
-#, c-format
-msgid "Error: Unknown parameter %s."
-msgstr "Erreur : paramètre inconnu : %s."
-
-#: ../clients/cli/devices.c:3807
+#: ../clients/cli/devices.c:3989
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "Erreur : le canal requiert une bande également."
 
-#: ../clients/cli/devices.c:3812
+#: ../clients/cli/devices.c:3994
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "Erreur : « canal» : « %s » est non valide pour la bande « %s »."
 
-#: ../clients/cli/devices.c:3836
+#: ../clients/cli/devices.c:4019
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
-msgstr ""
-"Erreur : le périphérique « %s » ne supporte ni les modes AP ou Ad-Hoc."
+msgstr "Erreur : le périphérique « %s » ne supporte ni les modes AP ou Ad-Hoc."
 
-#: ../clients/cli/devices.c:3870
+#: ../clients/cli/devices.c:4041
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "Erreur : le mot de passe est non valide : « %s »"
 
-#: ../clients/cli/devices.c:3946
+#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "Erreur : le paramètre « %s » ne peut pas être répété."
 
+#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
+#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
+msgid "Security"
+msgstr "Sécurité"
+
+#: ../clients/cli/devices.c:4227
+msgid "None"
+msgstr "Aucun"
+
+#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:333
+#: ../clients/common/nm-secret-agent-simple.c:366
+#: ../clients/common/nm-secret-agent-simple.c:903
+#: ../clients/common/nm-secret-agent-simple.c:938
+#: ../clients/common/nm-secret-agent-simple.c:961
+#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:114
+#: ../clients/common/nm-vpn-helpers.c:120
+#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
+#: ../clients/tui/nmt-page-wifi.c:330
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../clients/cli/devices.c:4355
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #. Main header name
-#: ../clients/cli/devices.c:4051
+#: ../clients/cli/devices.c:4411
 msgid "Device LLDP neighbors"
 msgstr "Voisins du périphérique LLDP"
 
-#: ../clients/cli/devices.c:4161
+#: ../clients/cli/devices.c:4521
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "Erreur : « liste des périphériques lldp » : %s"
 
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:27
 msgid "asleep"
 msgstr "veille"
 
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:28
 msgid "connecting"
 msgstr "connexion"
 
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:29
 msgid "connected (local only)"
 msgstr "connecté (local seulement)"
 
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:30
 msgid "connected (site only)"
 msgstr "connecté (site seulement)"
 
-#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
+#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr "connecté"
 
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:32
 msgid "disconnecting"
 msgstr "déconnexion"
 
-#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
+#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ../clients/cli/general.c:138
+#: ../clients/cli/general.c:124
 msgid "auth"
 msgstr "auth"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:152
 msgid "running"
 msgstr "actif"
 
-#: ../clients/cli/general.c:180
+#: ../clients/cli/general.c:166
 msgid "starting"
 msgstr "démarrage"
 
-#: ../clients/cli/general.c:180
+#: ../clients/cli/general.c:166
 msgid "started"
 msgstr "démarré"
 
-#: ../clients/cli/general.c:214
+#: ../clients/cli/general.c:200
 msgid "enabled"
 msgstr "activé"
 
-#: ../clients/cli/general.c:214
+#: ../clients/cli/general.c:200
 msgid "disabled"
 msgstr "désactivé"
 
-#: ../clients/cli/general.c:332
+#: ../clients/cli/general.c:318
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3304,8 +3129,7 @@ msgid ""
 "\n"
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli general { COMMAND | help }\n"
+msgstr "Syntaxe : nmcli general { COMMAND | help }\n"
 "\n"
 "COMMAND := { status | hostname | permissions | logging }\n"
 "\n"
@@ -3318,7 +3142,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../clients/cli/general.c:343
+#: ../clients/cli/general.c:329
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3327,15 +3151,13 @@ msgid ""
 "'status' is the default action, which means 'nmcli gen' calls 'nmcli gen "
 "status'\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli general status { help }\n"
+msgstr "Syntaxe : nmcli general status { help }\n"
 "\n"
 "Affiche le statut général de NetworkManager.\n"
-"« status » est l'action par défaut, ce qui signifie que « nmcli gen » "
-"appelle « nmcli gen status »\n"
+"« status » est l'action par défaut, ce qui signifie que « nmcli gen » appelle « nmcli gen status »\n"
 "\n"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:338
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3344,35 +3166,88 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli general hostname { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli general hostname { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [<hostname>]\n"
 "\n"
 "Obtient ou modifie le nom d'hôte persistant du système.\n"
-"Sans arguments, ceci imprime le nom d'hôte actuellement configuré. Lorsque "
-"vous passez\n"
-"un nom d'hôte, NetworkManager va le définir comme étant le nouveau nom "
-"d'hôte persistant du système.\n"
+"Sans arguments, ceci imprime le nom d'hôte actuellement configuré. Lorsque vous passez\n"
+"un nom d'hôte, NetworkManager va le définir comme étant le nouveau nom d'hôte persistant du système.\n"
 "\n"
 
-#: ../clients/cli/general.c:364
+#: ../clients/cli/general.c:350
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
 "\n"
 "Show caller permissions for authenticated operations.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli general permissions { help }\n"
+msgstr "Syntaxe : nmcli general permissions { help }\n"
 "\n"
 "Affiche les permissions de l'appelant pour les opérations authentifiées.\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:358
+#, c-format
+msgid ""
+"Usage: nmcli general reload { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<flag>[,<flag>...]]\n"
+"\n"
+"Reload NetworkManager's configuration and perform certain updates, like\n"
+"flushing caches or rewriting external state to disk. This is similar to\n"
+"sending SIGHUP to NetworkManager but it allows for more fine-grained\n"
+"control over what to reload through the flags argument. It also allows\n"
+"non-root access via PolicyKit and contrary to signals it is synchronous.\n"
+"\n"
+"Available flags are:\n"
+"\n"
+"  'conf'        Reload the NetworkManager.conf configuration from\n"
+"                disk. Note that this does not include connections, which\n"
+"                can be reloaded through 'nmcli connection reload' instead.\n"
+"\n"
+"  'dns-rc'      Update DNS configuration, which usually involves writing\n"
+"                /etc/resolv.conf anew.\n"
+"\n"
+"  'dns-full'    Restart the DNS plugin. This is for example useful when\n"
+"                using dnsmasq plugin, which uses additional configuration\n"
+"                in /etc/NetworkManager/dnsmasq.d. If you edit those files,\n"
+"                you can restart the DNS plugin. This action shortly\n"
+"                interrupts name resolution.\n"
+"\n"
+"With no flags, everything that is supported is reloaded, which is\n"
+"identical to sending a SIGHUP.\n"
+msgstr "Utilisation : nmcli general reload { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<flag>[,<flag>...]]\n"
+"\n"
+"Rechargez la configuration de NetworkManager et effectuez certaines mises à jour, comme\n"
+"de vider les caches ou de réécrire l'état externe sur le disque. Cela ressemble à\n"
+"envoyer SIGHUP à NetworkManager, mais cela permet de contrôler de ce qu'il faut recharger grâce à l'argument des drapeaux. Il permet également\n"
+"l'accès non root via PolicyKit et contrairement aux signaux, il est synchrone.\n"
+"\n"
+"Les drapeaux disponibles sont :\n"
+"\n"
+"  conf' Rechargez la configuration de NetworkManager.conf depuis\n"
+"                disque. Notez que cela n'inclut pas les connexions,\n"
+"                peut être rechargé par 'nmcli connection reload' à la place.\n"
+"\n"
+"  dns-rc' met à jour la configuration DNS, ce qui implique généralement d'écrire\n"
+"                /etc/resolv.conf à nouveau.\n"
+"\n"
+"  dns-full' Redémarrez le plugin DNS. Ceci est par exemple utile lorsqu’on\n"
+"                utilise le plugin dnsmasq, qui utilise une configuration supplémentaire\n"
+"                dans /etc/NetworkManager/dnsmasq.d. Si vous éditez ces fichiers,\n"
+"                vous pouvez redémarrer le plugin DNS. Cette action\n"
+"                interrompt momentanément la résolution des noms.\n"
+"\n"
+"Sans drapeau, tout ce qui est pris en charge est rechargé, ce qui\n"
+"identique à l'envoi d'un SIGHUP.\n"
+
+#: ../clients/cli/general.c:390
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3386,20 +3261,17 @@ msgid ""
 "page\n"
 "for the list of possible logging domains.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli general logging { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli general logging { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [level <log level>] [domains <log domains>]\n"
 "\n"
 "Obtient ou modifie le niveau et les domaines de connexion de NetworkManager.\n"
-"Sans arguments, le niveau et les domaines de connexion sont affichés. Pour "
-"modifier\n"
-"l'état de connexion, fournissez le niveau et/ou le domaine. Veuillez "
-"consulter la page man\n"
+"Sans arguments, le niveau et les domaines de connexion sont affichés. Pour modifier\n"
+"l'état de connexion, fournissez le niveau et/ou le domaine. Veuillez consulter la page man\n"
 "pour obtenir la liste des domaines de connexion possibles.\n"
 "\n"
 
-#: ../clients/cli/general.c:385
+#: ../clients/cli/general.c:403
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3412,8 +3284,7 @@ msgid ""
 "\n"
 "  connectivity [check]\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli networking { COMMAND | help }\n"
+msgstr "Syntaxe : nmcli networking { COMMAND | help }\n"
 "\n"
 "COMMAND := { [ on | off | connectivity ] }\n"
 "\n"
@@ -3424,9 +3295,10 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:395
+#: ../clients/cli/general.c:413
 #, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
@@ -3435,19 +3307,19 @@ msgstr "Syntaxe : nmcli networking on { help }\n"
 "Active la mise en réseau.\n"
 "\n"
 
-#: ../clients/cli/general.c:403
+#: ../clients/cli/general.c:421
 #, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli networking off { help }\n"
+msgstr "Syntaxe : nmcli networking off { help }\n"
 "\n"
 "Désactive la mise en réseau.\n"
 "\n"
 
-#: ../clients/cli/general.c:411
+#: ../clients/cli/general.c:429
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3455,20 +3327,18 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
 "\n"
-"\n"
-msgstr ""
-"Syntaxe : nmcli networking connectivity { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli networking connectivity { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [check]\n"
 "\n"
 "Obtient l'état de connectivité du réseau.\n"
-"L'argument optionnel « check » fait que NetworkManager vérifie à nouveau la "
-"connectivité.\n"
+"L'argument optionnel « check » fait que NetworkManager vérifie à nouveau la connectivité.\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3477,15 +3347,14 @@ msgid ""
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli radio { COMMAND | help }\n"
+msgstr "Syntaxe : nmcli radio { COMMAND | help }\n"
 "\n"
 "COMMAND := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan | wimax [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:432
+#: ../clients/cli/general.c:450
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3494,16 +3363,14 @@ msgid ""
 "\n"
 "Get status of all radio switches, or turn them on/off.\n"
 "\n"
-msgstr ""
-"Usage: nmcli radio all { ARGUMENTS | help }\n"
+msgstr "Usage: nmcli radio all { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [on | off]\n"
 "\n"
-"Obtient le statut de tous les interrupteurs radios, les activer ou "
-"désactiver.\n"
+"Obtient le statut de tous les interrupteurs radios, les activer ou désactiver.\n"
 "\n"
 
-#: ../clients/cli/general.c:442
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3512,15 +3379,14 @@ msgid ""
 "\n"
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli radio wifi { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli radio wifi { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [on | off]\n"
 "\n"
 "Obtient le statut de l'interrupteur radio Wi-Fi, l'activer ou le désactiver.\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:470
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3529,16 +3395,14 @@ msgid ""
 "\n"
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli radio wwan { ARGUMENTS | help }\n"
+msgstr "Syntaxe : nmcli radio wwan { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [on | off]\n"
 "\n"
-"Obtient le statut de l'interrupteur radio du haut débit mobile, l'activer ou "
-"le désactiver.\n"
+"Obtient le statut de l'interrupteur radio du haut débit mobile, l'activer ou le désactiver.\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:480
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3546,187 +3410,223 @@ msgid ""
 "Monitor NetworkManager changes.\n"
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
-msgstr ""
-"Syntaxe : nmcli monitor\n"
+msgstr "Syntaxe : nmcli monitor\n"
 "\n"
 "Surveille les changements du NetworkManager.\n"
 "Imprime une ligne à chaque changement du NetworkManager\n"
 "\n"
 
-#: ../clients/cli/general.c:492
+#: ../clients/cli/general.c:510
 msgid "NetworkManager status"
 msgstr "État de NetworkManager"
 
-#: ../clients/cli/general.c:496
+#: ../clients/cli/general.c:514
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Erreur : seuls ces champs sont autorisés : %s"
 
-#: ../clients/cli/general.c:549
+#: ../clients/cli/general.c:567
 msgid "NetworkManager permissions"
 msgstr "Permissions NetworkManager"
 
-#: ../clients/cli/general.c:553
+#: ../clients/cli/general.c:571
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Erreur : « general permissions » : %s"
 
-#: ../clients/cli/general.c:642
+#: ../clients/cli/general.c:664
+#, c-format
+msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
+msgstr "Erreur : drapeau de rechargement non valide «%s». Les drapeaux autorisés sont : "
+
+#: ../clients/cli/general.c:674
+#, c-format
+msgid "Error: extra argument '%s'"
+msgstr "Erreur : argument supplémentaire « %s »."
+
+#: ../clients/cli/general.c:688
+#, c-format
+msgid "Error: failed to reload: %s"
+msgstr "Erreur : n'a pas pu cherger à nouveau « %s »"
+
+#: ../clients/cli/general.c:727
 msgid "NetworkManager logging"
 msgstr "Journalisation NetworkManager"
 
-#: ../clients/cli/general.c:646
+#: ../clients/cli/general.c:731
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Erreur : « general logging » : %s"
 
-#: ../clients/cli/general.c:728
+#: ../clients/cli/general.c:813
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "Erreur : accès refusé pour définir la journalisation : %s"
 
-#: ../clients/cli/general.c:745
+#: ../clients/cli/general.c:830
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "Erreur : n'a pas pu définir le nom d'hôte : %s"
 
-#: ../clients/cli/general.c:814
+#: ../clients/cli/general.c:900
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
-msgstr ""
-"Erreur : « la valeur --fields » « %s » n'est pas valide ici (champ autorisé :"
-" %s)"
+msgstr "Erreur : « la valeur --fields » « %s » n'est pas valide ici (champ autorisé : %s)"
 
-#: ../clients/cli/general.c:839
+#: ../clients/cli/general.c:925
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Erreur : argument « %s » non valide : « %s » (utilisez marche/arrêt)."
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:887 ../clients/cli/general.c:899
+#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
 msgid "Connectivity"
 msgstr "Connectivité"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:988
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Erreur : commande « networking » « %s » non valide."
 
-#: ../clients/cli/general.c:916
+#: ../clients/cli/general.c:1002
 msgid "Networking"
 msgstr "Réseau"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:951
+#: ../clients/cli/general.c:1037
 msgid "Radio switches"
 msgstr "Interrupteurs radio"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:981
+#: ../clients/cli/general.c:1067
 msgid "Wi-Fi radio switch"
 msgstr "Interrupteur radio Wi-Fi"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1008
+#: ../clients/cli/general.c:1094
 msgid "WWAN radio switch"
 msgstr "Interrupteur radio WWAN"
 
-#: ../clients/cli/general.c:1056
+#: ../clients/cli/general.c:1142
 msgid "NetworkManager has started"
 msgstr "Le NetworkManager a démarré"
 
-#: ../clients/cli/general.c:1056
+#: ../clients/cli/general.c:1142
 msgid "NetworkManager has stopped"
 msgstr "Le NetworkManager est arrêté"
 
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1153
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "Nom d'hôte défini à « %s »\n"
 
-#: ../clients/cli/general.c:1082
+#: ../clients/cli/general.c:1168
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "« %s » est la connexion primaire.\n"
 
-#: ../clients/cli/general.c:1084
+#: ../clients/cli/general.c:1170
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "Il n'y a pas de connexion primaire\n"
 
-#: ../clients/cli/general.c:1096
+#: ../clients/cli/general.c:1182
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "La connectivité est « %s » maintenant\n"
 
-#: ../clients/cli/general.c:1110
+#: ../clients/cli/general.c:1196
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Le Networlmanager est dans l'état « %s » maintenant\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1216
 msgid "connection available"
 msgstr "connexion disponible"
 
-#: ../clients/cli/general.c:1132
+#: ../clients/cli/general.c:1218
 msgid "connections available"
 msgstr "connexions disponibles"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1236
 msgid "autoconnect"
 msgstr "connexion automatique"
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1238
 msgid "fw missing"
 msgstr "fw manquant"
 
-#: ../clients/cli/general.c:1157
+#: ../clients/cli/general.c:1243
 msgid "plugin missing"
 msgstr "greffon manquant"
 
-#: ../clients/cli/general.c:1162
+#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
+msgid "sw disabled"
+msgstr "sw désactivé"
+
+#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
+msgid "hw disabled"
+msgstr "hw désactivé"
+
+#: ../clients/cli/general.c:1283
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1164
+#: ../clients/cli/general.c:1285
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1169
+#: ../clients/cli/general.c:1290
 msgid "iface"
 msgstr "iface"
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1293
 msgid "port"
 msgstr "port"
 
-#: ../clients/cli/general.c:1175
+#: ../clients/cli/general.c:1296
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1313
 msgid "master"
 msgstr "master"
 
-#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:247
-#: ../clients/tui/nmt-connect-connection-list.c:406
+#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
+#: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1198
+#: ../clients/cli/general.c:1319
 msgid "ip4 default"
 msgstr "ip4 par défaut"
 
-#: ../clients/cli/general.c:1200
+#: ../clients/cli/general.c:1321
 msgid "ip6 default"
 msgstr "ip6 par défaut"
 
-#: ../clients/cli/general.c:1282
+#: ../clients/cli/general.c:1403
 #, c-format
 msgid "%s VPN connection"
 msgstr "Connexion VPN « %s »"
 
-#: ../clients/cli/general.c:1350
+#. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
+#. * "<interface-name>: <device-state> to <connection-id>"
+#: ../clients/cli/general.c:1423
+#, c-format
+msgctxt "nmcli-overview"
+msgid "%s: %s to %s"
+msgstr "%s: %s à %s"
+
+#. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
+#. * "<interface-name>: <device-state>"
+#: ../clients/cli/general.c:1430
+#, c-format
+msgctxt "nmcli-overview"
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../clients/cli/general.c:1480
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3735,24 +3635,20 @@ msgid ""
 "\n"
 "Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
-msgstr ""
-"Utilisez « nmcli device show » pour obtenir des informations complètes sur "
-"les périphériques connus et « nmcli connection show » pour obtenir une vue "
-"d'ensemble des profils de connexions actifs.\n"
+msgstr "Utilisez « nmcli device show » pour obtenir des informations complètes sur les périphériques connus et « nmcli connection show » pour obtenir une vue d'ensemble des profils de connexions actifs.\n"
 "\n"
-"Consultez les pages de manuel nmcli(1) et nmcli-examples(7) pour les détails "
-"complets d'utilisation.\n"
+"Consultez les pages de manuel nmcli(1) et nmcli-examples(7) pour les détails complets d'utilisation.\n"
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1501
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "Erreur : commande « monitor » « %s » non valide."
 
-#: ../clients/cli/general.c:1383
+#: ../clients/cli/general.c:1513
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager n'est pas en cours d'exécution (attendons)\n"
 
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:230
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -3783,14 +3679,12 @@ msgid ""
 "  a[gent]         NetworkManager secret agent or polkit agent\n"
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
-msgstr ""
-"Usage : nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
+msgstr "Usage : nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -a, --ask                                ask for missing parameters\n"
 "  -c, --colors auto|yes|no                 whether to use colors in output\n"
-"  -e, --escape yes|no                      escape columns separators in "
-"values\n"
+"  -e, --escape yes|no                      escape columns separators in values\n"
 "  -f, --fields <field,...>|all|common      specify fields to output\n"
 "  -g, --get-values <field,...>|all|common  shortcut for -m tabular -t -f\n"
 "  -h, --help                               print this help\n"
@@ -3800,8 +3694,7 @@ msgstr ""
 "  -s, --show-secrets                       allow displaying passwords\n"
 "  -t, --terse                              terse output\n"
 "  -v, --version                            show program version\n"
-"  -w, --wait <seconds>                     set timeout waiting for finishing "
-"operations\n"
+"  -w, --wait <seconds>                     set timeout waiting for finishing operations\n"
 "\n"
 "OBJECT\n"
 "  g[eneral]       NetworkManager's general status and operations\n"
@@ -3813,922 +3706,908 @@ msgstr ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:324
+#: ../clients/cli/nmcli.c:310
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Erreur : paramètre manquant pour l'option « %s »."
 
-#: ../clients/cli/nmcli.c:625
+#: ../clients/cli/nmcli.c:618
 #, c-format
 msgid "Unexpected end of file following '%s'\n"
 msgstr "Fin inattendue du fichier après « %s »\n"
 
-#: ../clients/cli/nmcli.c:633
+#: ../clients/cli/nmcli.c:626
 #, c-format
 msgid "Expected whitespace following '%s'\n"
 msgstr "Espacement prévu après « %s »\n"
 
-#: ../clients/cli/nmcli.c:645
+#: ../clients/cli/nmcli.c:638
 #, c-format
 msgid "Expected a value for '%s'\n"
 msgstr "Valeur attendue pour « %s »\n"
 
-#: ../clients/cli/nmcli.c:659
+#: ../clients/cli/nmcli.c:652
 #, c-format
 msgid "Expected a line break following '%s'\n"
 msgstr "On s'attend à un saut de ligne après « %s »\n"
 
-#: ../clients/cli/nmcli.c:748
+#: ../clients/cli/nmcli.c:741
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Erreur : option « --terse » est spécifiée la seconde fois."
 
-#: ../clients/cli/nmcli.c:753
+#: ../clients/cli/nmcli.c:746
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Erreur : option « --terse » mutuellement exclusive avec « --pretty »."
 
-#: ../clients/cli/nmcli.c:761
+#: ../clients/cli/nmcli.c:754
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Erreur : option « --pretty » est spécifiée la seconde fois."
 
-#: ../clients/cli/nmcli.c:766
+#: ../clients/cli/nmcli.c:759
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Erreur : option « --pretty » mutuellement exclusive avec « --terse »."
 
-#: ../clients/cli/nmcli.c:781
+#: ../clients/cli/nmcli.c:774
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "Erreur : « %s » n'est pas un argument valide pour l'option « %s »."
 
-#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
+#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr ""
-"Erreur : « %s » est n'est pas un paramètre valide pour l'option « %s »."
+msgstr "Erreur : « %s » est n'est pas un paramètre valide pour l'option « %s »."
 
-#: ../clients/cli/nmcli.c:831
+#: ../clients/cli/nmcli.c:824
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "Erreur : « %s » n'est pas un délai d'attente valide."
 
-#: ../clients/cli/nmcli.c:838
+#: ../clients/cli/nmcli.c:831
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "outil nmcli, version %s\n"
 
-#: ../clients/cli/nmcli.c:846
+#: ../clients/cli/nmcli.c:839
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Erreur : option « %s » inconnue, essayez « nmcli -help »."
 
-#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
+#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "Erreur : nmcli terminé par le signal %s (%d)"
 
-#: ../clients/cli/nmcli.c:975
+#: ../clients/cli/nmcli.c:968
 msgid "Success"
 msgstr "Succès"
 
-#: ../clients/cli/polkit-agent.c:68
+#: ../clients/cli/polkit-agent.c:54
 #, c-format
 msgid "Authentication message: %s\n"
 msgstr "Message d'authentication : %s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:62
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "Erreur d'authentication : %s\n"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:122
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "Warning: l'initialisation de l'agent polkit a échoué : %s\n"
 
-#: ../clients/cli/settings.c:46
+#: ../clients/cli/settings.c:32
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "Souhaitez-vous aussi définir « %s » sur « %s » ? [yes] : "
 
-#: ../clients/cli/settings.c:48
+#: ../clients/cli/settings.c:34
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "Souhaitez-vous aussi supprimer « %s » ? [yes] : "
 
-#: ../clients/cli/settings.c:243
+#: ../clients/cli/settings.c:229
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
-msgstr ""
-"Attention : %s.%s défini à '%s', mais il est possible que ce soit ignoré en "
-"mode d'infrastructure\n"
+msgstr "Attention : %s.%s défini à '%s', mais il est possible que ce soit ignoré en mode d'infrastructure\n"
 
-#: ../clients/cli/settings.c:262
+#: ../clients/cli/settings.c:248
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
-msgstr ""
-"Atttention : configuration %s.%s exige que l'on supprime les configurations "
-"ipv4 et ipv6\n"
+msgstr "Atttention : configuration %s.%s exige que l'on supprime les configurations ipv4 et ipv6\n"
 
-#: ../clients/cli/settings.c:264
+#: ../clients/cli/settings.c:250
 msgid "Do you want to remove them? [yes] "
-msgstr "Souhaitez-vous les supprimer ? [oui]"
+msgstr "Souhaitez-vous les supprimer ? [oui] "
 
-#: ../clients/cli/settings.c:352
+#: ../clients/cli/settings.c:338
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "Avertissement : %s n'est pas un UUID de profil de connexion existant\n"
 
-#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
+#: ../clients/cli/settings.c:343 ../clients/cli/settings.c:356
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "« %s » n'est pas un profil de connexion VPN"
 
-#: ../clients/cli/settings.c:364
+#: ../clients/cli/settings.c:350
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "« %s » n'est pas un nom de profil existant"
 
-#: ../clients/cli/settings.c:408
+#: ../clients/cli/settings.c:394
 #, c-format
 msgid "Warning: %s\n"
 msgstr "Avertissement : %s\n"
 
-#: ../clients/cli/settings.c:411
+#: ../clients/cli/settings.c:397
 #, c-format
 msgid "Info: %s\n"
 msgstr "Info : %s\n"
 
-#: ../clients/cli/settings.c:504
+#: ../clients/cli/settings.c:490
 msgid "don't know how to get the property value"
 msgstr "je ne sais pas comment obtenir la valeur de la propriété"
 
-#: ../clients/cli/settings.c:593
+#: ../clients/cli/settings.c:580
 msgid "the property can't be changed"
 msgstr "la propriété ne peut pas être modifiée"
 
-#: ../clients/cli/settings.c:671
+#: ../clients/cli/settings.c:658
 msgid "[NM property description]"
 msgstr "[description de la propriété NM]"
 
-#: ../clients/cli/settings.c:681
+#: ../clients/cli/settings.c:668
 msgid "[nmcli specific description]"
 msgstr "[description spécifique de nmcli]"
 
-#: ../clients/cli/utils.c:318
+#: ../clients/cli/utils.c:304
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "Erreur : l'argument « %s » était attendu, mais « %s » a été fourni."
 
-#: ../clients/cli/utils.c:321
+#: ../clients/cli/utils.c:307
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "Erreur : argument « %s » inattendu"
 
-#: ../clients/cli/utils.c:709
+#: ../clients/cli/utils.c:695
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "champ « %s%s%s » invalide ; champ inconnu"
 
-#: ../clients/cli/utils.c:713
+#: ../clients/cli/utils.c:699
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "champ « %s%s%s » invalide ; champs autorisés : [%s]"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/cli/utils.c:809
+#: ../clients/cli/utils.c:795
 #, c-format
 msgid "failure to select field"
 msgstr "Impossible de sélectionner le champ"
 
-#: ../clients/cli/utils.c:1438
+#: ../clients/cli/utils.c:1424
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "Erreur de lecture de la sortie nmcli : %s\n"
 
-#: ../clients/cli/utils.c:1443
+#: ../clients/cli/utils.c:1429
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "Erreur d'écriture de la sortie nmcli : %s\n"
 
-#: ../clients/cli/utils.c:1469
+#: ../clients/cli/utils.c:1455
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "Échec de la création du pager pipe : %s\n"
 
-#: ../clients/cli/utils.c:1478
+#: ../clients/cli/utils.c:1464
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "Échec du fork pager : %s\n"
 
-#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
+#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "Il n'a pas réussi à dupliquer le pager pipe : %s\n"
 
-#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4123
+#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
 msgid "on"
 msgstr "marche"
 
-#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4125
+#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
 msgid "off"
 msgstr "arrêt"
 
-#: ../clients/cli/utils.h:329
+#: ../clients/cli/utils.h:323
 #, c-format
 msgid "%lld (%s)"
 msgstr "%lld (%s)"
 
-#: ../clients/cli/utils.h:336
+#: ../clients/cli/utils.h:330
 #, 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:121
-#: ../clients/common/nm-client-utils.c:152
+#.
+#: ../clients/common/nm-client-utils.c:107
+#: ../clients/common/nm-client-utils.c:138
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "« %s » est ambigu (%s)"
 
-#: ../clients/common/nm-client-utils.c:131
+#: ../clients/common/nm-client-utils.c:117
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "« %s » n'est pas valide ; utilisez [%s] ou [%s]"
 
-#: ../clients/common/nm-client-utils.c:164
+#: ../clients/common/nm-client-utils.c:150
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "« %s » n'est pas valide ; utilisez [%s], [%s] ou [%s]"
 
-#: ../clients/common/nm-client-utils.c:213
+#: ../clients/common/nm-client-utils.c:199
 #, c-format
 msgid "'%s' is ambiguous: %s"
 msgstr "« %s » est ambigu : %s"
 
-#: ../clients/common/nm-client-utils.c:223
+#: ../clients/common/nm-client-utils.c:209
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "nom manquant, essayez l'un de [%s]"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:251
 msgid "unmanaged"
 msgstr "non-géré"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:252
 msgid "unavailable"
 msgstr "indisponible"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:254
 msgid "connecting (prepare)"
 msgstr "connexion (préparation)"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:255
 msgid "connecting (configuring)"
 msgstr "connexion (configuration)"
 
-#: ../clients/common/nm-client-utils.c:270
+#: ../clients/common/nm-client-utils.c:256
 msgid "connecting (need authentication)"
 msgstr "connexion (authentification requise)"
 
-#: ../clients/common/nm-client-utils.c:271
+#: ../clients/common/nm-client-utils.c:257
 msgid "connecting (getting IP configuration)"
 msgstr "connexion (obtention de la configuration IP)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:258
 msgid "connecting (checking IP connectivity)"
 msgstr "connexion (contrôle de la connectivité IP)"
 
-#: ../clients/common/nm-client-utils.c:273
+#: ../clients/common/nm-client-utils.c:259
 msgid "connecting (starting secondary connections)"
 msgstr "connexion (démarrage des connexions secondaires)"
 
-#: ../clients/common/nm-client-utils.c:276
+#: ../clients/common/nm-client-utils.c:262
 msgid "connection failed"
 msgstr "échec de la connexion"
 
-#: ../clients/common/nm-client-utils.c:284
+#: ../clients/common/nm-client-utils.c:270
 msgid "yes (guessed)"
 msgstr "oui (deviné)"
 
-#: ../clients/common/nm-client-utils.c:285
+#: ../clients/common/nm-client-utils.c:271
 msgid "no (guessed)"
 msgstr "non (deviné)"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:291
-#: ../clients/common/nm-client-utils.c:364 ../libnm/nm-device.c:1438
+#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:278
 msgid "No reason given"
 msgstr "Aucun raison donnée"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:280
 msgid "Device is now managed"
 msgstr "Le périphérique est maintenant géré"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:281
 msgid "Device is now unmanaged"
 msgstr "Le périphérique n'est pas géré actuellement"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:282
 msgid "The device could not be readied for configuration"
 msgstr "Le périphérique n'a pas pu être apprêté pour la configuration"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:283
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
-msgstr ""
-"La configuration IP n'a pas pu être réservée (aucun adresse disponible, "
-"délai d'expiration, etc. )"
+msgstr "La configuration IP n'a pas pu être réservée (aucun adresse disponible, délai d'expiration, etc. )"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:284
 msgid "The IP configuration is no longer valid"
 msgstr "La configuration IP n'est plus valide"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-client-utils.c:285
 msgid "Secrets were required, but not provided"
 msgstr "Des secrets étaient requis, mais aucun n'a été fourni"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:286
 msgid "802.1X supplicant disconnected"
 msgstr "supplicant 802.1X déconnecté"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:287
 msgid "802.1X supplicant configuration failed"
 msgstr "Échec de la configuration du supplicant 802.1X"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:288
 msgid "802.1X supplicant failed"
 msgstr "Échec du supplicant 802.1X"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:289
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "Le supplicant 802.1X a pris trop longtemps pour s'authentifier"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:290
 msgid "PPP service failed to start"
 msgstr "Échec du démarrage du service PPP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:291
 msgid "PPP service disconnected"
 msgstr "Service PPP déconnecté"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:292
 msgid "PPP failed"
 msgstr "Échec de PPP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:293
 msgid "DHCP client failed to start"
 msgstr "Échec du démarrage du client DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:294
 msgid "DHCP client error"
 msgstr "Erreur du client DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:295
 msgid "DHCP client failed"
 msgstr "Échec du client DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:296
 msgid "Shared connection service failed to start"
 msgstr "Le démarrage du service de connexion partagée a échoué"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:297
 msgid "Shared connection service failed"
 msgstr "Le service de connexion partagée a échoué"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:298
 msgid "AutoIP service failed to start"
 msgstr "Le service autoIP n'a pas réussi à démarrer"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:299
 msgid "AutoIP service error"
 msgstr "Erreur du service autoIP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:300
 msgid "AutoIP service failed"
 msgstr "Le service autoIP a échoué"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:301
 msgid "The line is busy"
 msgstr "La ligne est occupée"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:302
 msgid "No dial tone"
 msgstr "Pas de tonalité"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:303
 msgid "No carrier could be established"
 msgstr "Aucune porteuse n'a pu être établie"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:304
 msgid "The dialing request timed out"
 msgstr "Délai de requête de numérotation dépassé"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:305
 msgid "The dialing attempt failed"
 msgstr "La tentative de numérotation a échoué"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:306
 msgid "Modem initialization failed"
 msgstr "L'initialisation du modem a échoué"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:307
 msgid "Failed to select the specified APN"
 msgstr "Échec de la sélection de l'APN spécifié"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:308
 msgid "Not searching for networks"
 msgstr "Aucune recherche de réseau en cours"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:309
 msgid "Network registration denied"
 msgstr "Enregistrement au réseau refusé"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:310
 msgid "Network registration timed out"
 msgstr "Délai dépassé pour l'enregistrement au réseau"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:311
 msgid "Failed to register with the requested network"
 msgstr "Échec de l'enregistrement au réseau demandé"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:312
 msgid "PIN check failed"
 msgstr "La vérification du code PIN a échoué"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:313
 msgid "Necessary firmware for the device may be missing"
 msgstr "Le micrologiciel nécessaire du périphérique pourrait être manquant"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:314
 msgid "The device was removed"
 msgstr "Le périphérique a été supprimé"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:315
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager est en veille"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:316
 msgid "The device's active connection disappeared"
 msgstr "La connexion active du périphérique a disparu"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:317
 msgid "Device disconnected by user or client"
 msgstr "Le périphérique a été déconnecté par l'utilisateur ou le client"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:318
 msgid "Carrier/link changed"
 msgstr "Porteuse ou lien modifié(e)"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:319
 msgid "The device's existing connection was assumed"
 msgstr "La connexion existante du périphérique a été supposée"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:320
 msgid "The supplicant is now available"
 msgstr "Le demandeur est maintenant disponible"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:321
 msgid "The modem could not be found"
 msgstr "Le modem est introuvable"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:322
 msgid "The Bluetooth connection failed or timed out"
 msgstr "La connexion Bluetooth a échoué ou son délai d'attente a été dépassé"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:323
 msgid "GSM Modem's SIM card not inserted"
 msgstr "La carte SIM du modem GSM n'est pas insérée"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:324
 msgid "GSM Modem's SIM PIN required"
 msgstr "Le code PIN de la SIM du modem GSM est nécessaire"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:325
 msgid "GSM Modem's SIM PUK required"
 msgstr "Le code PUK de la SIM du modem GSM est requis"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:326
 msgid "GSM Modem's SIM wrong"
 msgstr "La carte SIM du modem GSM est incorrecte"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:327
 msgid "InfiniBand device does not support connected mode"
 msgstr "Le périphérique InfiniBand ne prend pas en charge le mode connecté"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:328
 msgid "A dependency of the connection failed"
 msgstr "Une dépendance de la connexion a échoué"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:329
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Problème avec Ethernet RFC 2684 sur pont ADSL"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:330
 msgid "ModemManager is unavailable"
 msgstr "ModemManager est indisponible"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:331
 msgid "The Wi-Fi network could not be found"
 msgstr "Le réseau Wi-Fi est introuvable"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:332
 msgid "A secondary connection of the base connection failed"
 msgstr "Une connexion secondaire à la connexion de base a échoué"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:333
 msgid "DCB or FCoE setup failed"
 msgstr "L'installation DCB ou FCoE a échoué"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:334
 msgid "teamd control failed"
 msgstr "échec du contrôle teamd"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:335
 msgid "Modem failed or no longer available"
 msgstr "Le modem est en échec ou n'est plus disponible"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:336
 msgid "Modem now ready and available"
 msgstr "Le modem est prêt et disponible"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:337
 msgid "SIM PIN was incorrect"
 msgstr "Le code PIN de la SIM est incorrect"
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:338
 msgid "New connection activation was enqueued"
 msgstr "L'activation de la nouvelle connexion a été mise en file d'attente"
 
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:339
 msgid "The device's parent changed"
 msgstr "Le parent du périphérique a changé"
 
-#: ../clients/common/nm-client-utils.c:354
+#: ../clients/common/nm-client-utils.c:340
 msgid "The device parent's management changed"
 msgstr "Le gestionnaire du périphérique parent a changé"
 
-#: ../clients/common/nm-client-utils.c:355
+#: ../clients/common/nm-client-utils.c:341
 msgid "Open vSwitch database connection failed"
 msgstr "Echec de la connexion à la base de données Open vSwitch"
 
-#: ../clients/common/nm-client-utils.c:356
+#: ../clients/common/nm-client-utils.c:342
 msgid "A duplicate IP address was detected"
 msgstr "Une adresse IP en double a été détectée"
 
-#: ../clients/common/nm-client-utils.c:357
+#: ../clients/common/nm-client-utils.c:343
 msgid "The selected IP method is not supported"
 msgstr "La méthode IP sélectionnée n'est pas prise en charge"
 
-#: ../clients/common/nm-client-utils.c:358
+#: ../clients/common/nm-client-utils.c:344
 msgid "Failed to configure SR-IOV parameters"
 msgstr "Échec de la configuration des paramètres SR-IOV"
 
-#: ../clients/common/nm-client-utils.c:359
+#: ../clients/common/nm-client-utils.c:345
 msgid "The Wi-Fi P2P peer could not be found"
 msgstr "L'homologue Wi-Fi P2P n'a pas pu être trouvé"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:351
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:352
 msgid "The connection was disconnected"
 msgstr "La connexion a été déconnectée"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:353
 msgid "Disconnected by user"
 msgstr "Déconnecté par l'utilisateur"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:354
 msgid "The base network connection was interrupted"
 msgstr "La connexion réseau de base a été interrompue"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:355
 msgid "The VPN service stopped unexpectedly"
 msgstr "Arrêt inattendu du service VPN"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:356
 msgid "The VPN service returned invalid configuration"
 msgstr "Le service VPN a retourné une configuration non valide"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:357
 msgid "The connection attempt timed out"
 msgstr "Le délai d'attente de la tentative de connexion a été dépassé"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:358
 msgid "The VPN service did not start in time"
 msgstr "Le service VPN n'a pas démarré à temps"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:359
 msgid "The VPN service failed to start"
 msgstr "Échec du démarrage du service VPN"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:360
 msgid "No valid secrets"
 msgstr "Aucun secret valide"
 
-#: ../clients/common/nm-client-utils.c:375
+#: ../clients/common/nm-client-utils.c:361
 msgid "Invalid secrets"
 msgstr "Secrets non valides"
 
-#: ../clients/common/nm-client-utils.c:376
+#: ../clients/common/nm-client-utils.c:362
 msgid "The connection was removed"
 msgstr "La connexion a été supprimée"
 
-#: ../clients/common/nm-client-utils.c:377
+#: ../clients/common/nm-client-utils.c:363
 msgid "Master connection failed"
 msgstr "Échec de la connexion maître"
 
-#: ../clients/common/nm-client-utils.c:378
+#: ../clients/common/nm-client-utils.c:364
 msgid "Could not create a software link"
 msgstr "Impossible de créer un lien logiciel"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:379
+#: ../clients/common/nm-client-utils.c:365
 msgid "The device disappeared"
 msgstr "Le périphérique a disparu"
 
-#: ../clients/common/nm-meta-setting-access.c:510
+#: ../clients/common/nm-meta-setting-access.c:496
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "champ « %s » doit être seul"
 
-#: ../clients/common/nm-meta-setting-access.c:525
+#: ../clients/common/nm-meta-setting-access.c:511
 #, c-format
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "champ « %s%s%s%s%s » invalide ; %s%s%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:311
-#: ../clients/common/nm-meta-setting-desc.c:372
+#: ../clients/common/nm-meta-setting-desc.c:297
+#: ../clients/common/nm-meta-setting-desc.c:358
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "préfixe invalide « %s »; <1-%d> autorisé"
 
-#: ../clients/common/nm-meta-setting-desc.c:319
+#: ../clients/common/nm-meta-setting-desc.c:305
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "adresse IP invalide : %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:344
+#: ../clients/common/nm-meta-setting-desc.c:330
 msgid ""
-"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
-"[,ip[/prefix] ...]'"
-msgstr ""
-"La syntaxe valide est : 'ip[/prefix][next-hop][metric][attribute=val]... "
-"[,ip[/prefix] ....]’"
+"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
+"ip[/prefix] ...]'"
+msgstr "La syntaxe valide est : 'ip[/prefix][next-hop][metric][attribute=val]... [,ip[/prefix] ....]’"
 
-#: ../clients/common/nm-meta-setting-desc.c:383
+#: ../clients/common/nm-meta-setting-desc.c:369
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "le saut suivant (« %s ») doit être le premier"
 
-#: ../clients/common/nm-meta-setting-desc.c:389
+#: ../clients/common/nm-meta-setting-desc.c:375
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "la métrique (« %s ») doit être avant les attributs"
 
-#: ../clients/common/nm-meta-setting-desc.c:437
+#: ../clients/common/nm-meta-setting-desc.c:423
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "route non valide : %s. %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:503
+#: ../clients/common/nm-meta-setting-desc.c:489
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "ne peut pas lire pac-script dans le fichier « %s »"
 
-#: ../clients/common/nm-meta-setting-desc.c:510
+#: ../clients/common/nm-meta-setting-desc.c:496
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "fichier « %s » contient un utf-8 non valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:523
+#: ../clients/common/nm-meta-setting-desc.c:509
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "« %s » ne contient pas de script PAC valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:526
+#: ../clients/common/nm-meta-setting-desc.c:512
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "Script PAC non valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:579
+#: ../clients/common/nm-meta-setting-desc.c:565
 #, c-format
 msgid "cannot read team config from file '%s'"
-msgstr ""
-"ne peut pas lire la configuration de l'équipe à partir du fichier « %s »"
+msgstr "ne peut pas lire la configuration de l'équipe à partir du fichier « %s »"
 
-#: ../clients/common/nm-meta-setting-desc.c:586
+#: ../clients/common/nm-meta-setting-desc.c:572
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
-msgstr ""
-"le fichier de configuration de l'équipe « %s » contient l'utf-8 non valide"
+msgstr "le fichier de configuration de l'équipe « %s » contient l'utf-8 non valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:1034
+#: ../clients/common/nm-meta-setting-desc.c:1029
 msgid "auto"
 msgstr "auto"
 
-#: ../clients/common/nm-meta-setting-desc.c:1186
+#: ../clients/common/nm-meta-setting-desc.c:1181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
-#: ../clients/common/nm-meta-setting-desc.c:1338
+#: ../clients/common/nm-meta-setting-desc.c:1329
+#: ../clients/common/nm-meta-setting-desc.c:1333
 msgid "'%s' is out of range [%"
 msgstr "« %s » est en dehors de la plage [%"
 
-#: ../clients/common/nm-meta-setting-desc.c:1343
+#: ../clients/common/nm-meta-setting-desc.c:1338
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "« %s » n'est pas un nombre valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:1400
+#: ../clients/common/nm-meta-setting-desc.c:1395
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "« %s » est en dehors de la plage [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1446
+#: ../clients/common/nm-meta-setting-desc.c:1441
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "« %s » n'est pas une adresse Ethernet MAC valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:1554
+#: ../clients/common/nm-meta-setting-desc.c:1567
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "option non valide « %s » ; utiliser une combinaison de [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1559 ../libnm-core/nm-keyfile.c:930
+#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "option non valide « %s » ; utiliser un parmi [%s]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1678
+#: ../clients/common/nm-meta-setting-desc.c:1691
 #, c-format
 msgid "%d (key)"
 msgstr "%d (clé)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1693
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (phrase de passe)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1683
+#: ../clients/common/nm-meta-setting-desc.c:1696
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (inconnu)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1696
+#: ../clients/common/nm-meta-setting-desc.c:1709
 msgid "0 (NONE)"
 msgstr "0 (AUCUN)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1702
+#: ../clients/common/nm-meta-setting-desc.c:1715
 msgid "REORDER_HEADERS, "
 msgstr "REORDER_HEADERS, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1704
+#: ../clients/common/nm-meta-setting-desc.c:1717
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1719
 msgid "LOOSE_BINDING, "
 msgstr "LOOSE_BINDING, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1708
+#: ../clients/common/nm-meta-setting-desc.c:1721
 msgid "MVRP, "
 msgstr "MVRP, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1729
+#: ../clients/common/nm-meta-setting-desc.c:1742
 msgid "0 (none)"
 msgstr "0 (aucun)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1735
+#: ../clients/common/nm-meta-setting-desc.c:1748
 msgid "agent-owned, "
-msgstr "appartient-à-l'agent"
+msgstr "appartient-à-l'agent "
 
-#: ../clients/common/nm-meta-setting-desc.c:1737
+#: ../clients/common/nm-meta-setting-desc.c:1750
 msgid "not saved, "
-msgstr "non enregistré,"
+msgstr "non enregistré, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1739
+#: ../clients/common/nm-meta-setting-desc.c:1752
 msgid "not required, "
-msgstr "non requis,"
+msgstr "non requis, "
 
-#: ../clients/common/nm-meta-setting-desc.c:1957
+#: ../clients/common/nm-meta-setting-desc.c:1970
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "« %s » n'est pas valide ; utiliser <option>=<valeur>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1967
+#: ../clients/common/nm-meta-setting-desc.c:1980
 #, c-format
 msgid "cannot set empty \"%s\" option"
 msgstr "l'option « %s » ne peut pas rester vide"
 
-#: ../clients/common/nm-meta-setting-desc.c:2026
+#: ../clients/common/nm-meta-setting-desc.c:2039
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
-msgstr ""
-"les marqueurs « %u » ne sont pas valides ; utilisez une combinaison de %s"
+msgstr "les marqueurs « %u » ne sont pas valides ; utilisez une combinaison de %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:2043
+#: ../clients/common/nm-meta-setting-desc.c:2056
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "« %s » n'est pas un numéro valide (ou est hors de portée)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2064
-#: ../clients/common/nm-meta-setting-desc.c:4039
-#: ../libnm-core/nm-setting-ovs-bridge.c:197 ../src/nm-config.c:564
+#: ../clients/common/nm-meta-setting-desc.c:2077
+#: ../clients/common/nm-meta-setting-desc.c:4052
+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr "« %s » n'est pas valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:2161
+#: ../clients/common/nm-meta-setting-desc.c:2174
 msgid "not a valid hex-string"
 msgstr "hex-string non valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:2177
+#: ../clients/common/nm-meta-setting-desc.c:2190
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "« %s » n'est pas un caractère hex valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:2256
+#: ../clients/common/nm-meta-setting-desc.c:2269
 msgid ""
 "too many arguments. Please only specify a private key file and optionally a "
 "password"
-msgstr ""
-"trop de paramètres. Veuillez n'indiquer qu'un seul fichier de clé privée et "
-"un mot de passe (optionnel)"
+msgstr "trop de paramètres. Veuillez n'indiquer qu'un seul fichier de clé privée et un mot de passe (optionnel)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2363
+#: ../clients/common/nm-meta-setting-desc.c:2376
 #, c-format
 msgid "failed to set bond option \"%s\""
 msgstr "N'a pas pu définir liaison \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2380
+#: ../clients/common/nm-meta-setting-desc.c:2393
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4744,8 +4623,7 @@ msgid ""
 "balance-alb   = 6\n"
 "\n"
 "Example: mode=2,miimon=120\n"
-msgstr ""
-"Saisir une liste d'options de liaisons formatées ainsi :\n"
+msgstr "Saisir une liste d'options de liaisons formatées ainsi :\n"
 "  option = <value>, option = <value>,... \n"
 "Options valides : %s\n"
 "'mode' peut être un nom ou un nombre :\n"
@@ -4766,229 +4644,216 @@ 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:2445
+#: ../clients/common/nm-meta-setting-desc.c:2458
 #, c-format
 msgid "Can not change the connection type"
 msgstr "Impossible de changer le type de connexion"
 
-#: ../clients/common/nm-meta-setting-desc.c:2530
+#: ../clients/common/nm-meta-setting-desc.c:2543
 #, c-format
 msgid "invalid permission \"%s\""
 msgstr "permission non valide \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2567
+#: ../clients/common/nm-meta-setting-desc.c:2580
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
-msgstr ""
-"« %s » n'est pas un maître valide ; utilisez ifname ou un UUID de connexion"
+msgstr "« %s » n'est pas un maître valide ; utilisez ifname ou un UUID de connexion"
 
-#: ../clients/common/nm-meta-setting-desc.c:2648
+#: ../clients/common/nm-meta-setting-desc.c:2661
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "« %s » n'est pas un UUID valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:2719
+#: ../clients/common/nm-meta-setting-desc.c:2732
 msgid "0 (disabled)"
 msgstr "0 (désactivé)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2725
+#: ../clients/common/nm-meta-setting-desc.c:2738
 msgid "enabled, "
 msgstr "activé, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2727
+#: ../clients/common/nm-meta-setting-desc.c:2740
 msgid "advertise, "
 msgstr "annoncer, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2729
+#: ../clients/common/nm-meta-setting-desc.c:2742
 msgid "willing, "
 msgstr "disposé, "
 
-#: ../clients/common/nm-meta-setting-desc.c:2818
+#: ../clients/common/nm-meta-setting-desc.c:2831
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "« %s » n'est pas un marqueur DCB valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:2845
+#: ../clients/common/nm-meta-setting-desc.c:2858
 msgid "must contain 8 comma-separated numbers"
 msgstr "doit contenir 8 numéros séparés par des virgules"
 
-#: ../clients/common/nm-meta-setting-desc.c:2859
+#: ../clients/common/nm-meta-setting-desc.c:2872
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "« %s » n'est pas un numéro entre 0 et %u (inclus) ou %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2862
+#: ../clients/common/nm-meta-setting-desc.c:2875
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "« %s » n'est pas un numéro entre 0 et %u (inclus)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2883
+#: ../clients/common/nm-meta-setting-desc.c:2896
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
-msgstr ""
-"les changements ne prendront pas effet tant que « %s » n'inclura pas 1 "
-"(activé)"
+msgstr "les changements ne prendront pas effet tant que « %s » n'inclura pas 1 (activé)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2913
+#: ../clients/common/nm-meta-setting-desc.c:2926
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "les pourcentages de largeur de bande doivent totaliser 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:2984
-#: ../clients/common/nm-meta-setting-desc.c:2990
+#: ../clients/common/nm-meta-setting-desc.c:2997
+#: ../clients/common/nm-meta-setting-desc.c:3003
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
-msgstr ""
-"L'ID de l'opérateur SIM doit correspondre à un code MCCMNC de 5 ou 6 numéros"
+msgstr "L'ID de l'opérateur SIM doit correspondre à un code MCCMNC de 5 ou 6 numéros"
 
-#: ../clients/common/nm-meta-setting-desc.c:3014
+#: ../clients/common/nm-meta-setting-desc.c:3027
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "« %s » n'est pas une clé IBoIP P_Key valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:3037
+#: ../clients/common/nm-meta-setting-desc.c:3050
 msgid "default"
 msgstr "par défaut"
 
-#: ../clients/common/nm-meta-setting-desc.c:3201
+#: ../clients/common/nm-meta-setting-desc.c:3214
 #, c-format
 msgid "invalid IPv%c address '%s'"
 msgstr "adresse IPv%c « %s » non valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:3328
+#: ../clients/common/nm-meta-setting-desc.c:3341
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "adresse de passerelle « %s » non valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:3478
+#: ../clients/common/nm-meta-setting-desc.c:3491
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "« %s » n'est pas un canal valide ; utilisez <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3558
-msgid ""
-"The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
-msgstr ""
-"La syntaxe valide est : vf[attribut=valeur]... [,vf[attribut=valeur]...]]"
+#: ../clients/common/nm-meta-setting-desc.c:3571
+msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
+msgstr "La syntaxe valide est : vf[attribut=valeur]... [,vf[attribut=valeur]...]]"
 
-#: ../clients/common/nm-meta-setting-desc.c:3582
-#: ../clients/common/nm-meta-setting-desc.c:3662
+#: ../clients/common/nm-meta-setting-desc.c:3595
+#: ../clients/common/nm-meta-setting-desc.c:3675
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
-msgstr ""
-"La syntaxe valide est : '[root | parent <handle>][handle <handle>] <kind>'"
+msgstr "La syntaxe valide est : '[root | parent <handle>][handle <handle>] <kind>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3607
+#: ../clients/common/nm-meta-setting-desc.c:3620
 msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
 msgstr "La syntaxe valide est : '<vid>[-<vid>] [pvid] [untagged]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3803
+#: ../clients/common/nm-meta-setting-desc.c:3816
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "Plan des priorités non valide « %s »"
 
-#: ../clients/common/nm-meta-setting-desc.c:3891
+#: ../clients/common/nm-meta-setting-desc.c:3904
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "« %s » n'est pas valide ; 2 ou 3 chaînes doivent être fournies"
 
-#: ../clients/common/nm-meta-setting-desc.c:3930
+#: ../clients/common/nm-meta-setting-desc.c:3943
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
 "  option = <value>, option = <value>,...\n"
 "Valid options are: %s\n"
-msgstr ""
-"Saisissez une liste d’options S/390 formatées ainsi :\n"
+msgstr "Saisissez une liste d’options S/390 formatées ainsi :\n"
 "  option = <value>, option = <value>,...\n"
 "Les options acceptées sont : %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3965
+#: ../clients/common/nm-meta-setting-desc.c:3978
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "« %s » n'est pas un canal valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:3971
+#: ../clients/common/nm-meta-setting-desc.c:3984
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "« %ld » n'est pas un canal valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:3988
-#: ../libnm-core/nm-setting-sriov.c:442 ../libnm-core/nm-setting-wired.c:772
-#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:838
-#: ../libnm-core/nm-setting-wired.c:881 ../libnm-core/nm-setting-wireless.c:893
-#: ../libnm-core/nm-setting-wireless.c:909
+#: ../clients/common/nm-meta-setting-desc.c:4001
+#: ../libnm-core/nm-setting-sriov.c:434 ../libnm-core/nm-setting-wired.c:758
+#: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
+#: ../libnm-core/nm-setting-wireless.c:892
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "« %s » n'est pas une adresse MAC valide"
 
-#: ../clients/common/nm-meta-setting-desc.c:4048
+#: ../clients/common/nm-meta-setting-desc.c:4061
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
-msgstr ""
-"« %s » n'est pas compatible avec %s « %s » ; veuillez changer la clé et "
-"définir le « %s » qui convient pour commencer."
+msgstr "« %s » n'est pas compatible avec %s « %s » ; veuillez changer la clé et définir le « %s » qui convient pour commencer."
 
-#: ../clients/common/nm-meta-setting-desc.c:4058
+#: ../clients/common/nm-meta-setting-desc.c:4071
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "La clé WEP semble provenir de « %s »"
 
-#: ../clients/common/nm-meta-setting-desc.c:4063
+#: ../clients/common/nm-meta-setting-desc.c:4076
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "L'index de la clé WEP est défini à « %d »"
 
-#: ../clients/common/nm-meta-setting-desc.c:4102
+#: ../clients/common/nm-meta-setting-desc.c:4115
 #, c-format
-msgid ""
-"'%s' is not compatible with '%s' type, please change or delete the key."
-msgstr ""
-"« %s » n'est pas compatible avec le type « %s » ; veuillez changer ou "
-"supprimer la clé"
+msgid "'%s' is not compatible with '%s' type, please change or delete the key."
+msgstr "« %s » n'est pas compatible avec le type « %s » ; veuillez changer ou supprimer la clé"
 
-#: ../clients/common/nm-meta-setting-desc.c:4159
+#: ../clients/common/nm-meta-setting-desc.c:4172
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr "« %s » n'est pas valide ; utilisez « on », « off » ou « ignore »"
 
-#: ../clients/common/nm-meta-setting-desc.c:4219
+#: ../clients/common/nm-meta-setting-desc.c:4232
 msgid "Bonding primary interface [none]"
 msgstr "Interface principale de liaison [none]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4226
+#: ../clients/common/nm-meta-setting-desc.c:4239
 msgid "Bonding monitoring mode"
 msgstr "Mode de surveillance de liaison"
 
-#: ../clients/common/nm-meta-setting-desc.c:4235
+#: ../clients/common/nm-meta-setting-desc.c:4248
 msgid "Bonding miimon [100]"
 msgstr "miimon de liaison [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4243
+#: ../clients/common/nm-meta-setting-desc.c:4256
 msgid "Bonding downdelay [0]"
-msgstr "downdelay de liaison [0] "
+msgstr "downdelay de liaison [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4251
+#: ../clients/common/nm-meta-setting-desc.c:4264
 msgid "Bonding updelay [0]"
-msgstr "updelay de liaison [0] "
+msgstr "updelay de liaison [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4259
+#: ../clients/common/nm-meta-setting-desc.c:4272
 msgid "Bonding arp-interval [0]"
-msgstr "arp-interval de liaison [0] "
+msgstr "arp-interval de liaison [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4267
+#: ../clients/common/nm-meta-setting-desc.c:4280
 msgid "Bonding arp-ip-target [none]"
-msgstr "arp-ip-target de liaison [none] "
+msgstr "arp-ip-target de liaison [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4275
+#: ../clients/common/nm-meta-setting-desc.c:4288
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "Débit LACP (« lent » ou « rapide ») [lent]"
 
 #. 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:4440
+#: ../clients/common/nm-meta-setting-desc.c:4455
 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 "
@@ -4997,16 +4862,12 @@ msgid ""
 "Examples: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
-msgstr ""
-"nmcli peut accepter les données de configuration JSON directes ainsi qu'un "
-"nom de fichier contenant la configuration. Dans ce dernier cas, le fichier "
-"est lu et le contenu est inséré dans cette propriété.\n"
+msgstr "nmcli peut accepter les données de configuration JSON directes ainsi qu'un nom de fichier contenant la configuration. Dans ce dernier cas, le fichier est lu et le contenu est inséré dans cette propriété.\n"
 "\n"
-"Exemples : set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
-"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
+"Exemples : 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:4448
+#: ../clients/common/nm-meta-setting-desc.c:4463
 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 "
@@ -5028,17 +4889,10 @@ msgid ""
 "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 ""
-"Saisir une liste d’observateurs de liens comme dictionnaires dont les clés "
-"dont des propriétés teamd. Les paires de dictionnaire sont sous la forme : "
-"key=value et les paires sont séparées par ' '. Les dictionnaires sont "
-"séparés par ','.\n"
-"Les clés autorisées / requises dans le dictionnaire changent selon le type "
-"d’observateur de lien, tandis que la seule propriété commune à tous les "
-"observateurs de lien est le « nom » qui définit l’observateur de lien à "
-"spécifier.\n"
+"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
+msgstr "Saisir une liste d’observateurs de liens comme dictionnaires dont les clés dont des propriétés teamd. Les paires de dictionnaire sont sous la forme : key=value et les paires sont séparées par ' '. Les dictionnaires sont séparés par ','.\n"
+"Les clés autorisées / requises dans le dictionnaire changent selon le type d’observateur de lien, tandis que la seule propriété commune à tous les observateurs de lien est le « nom » qui définit l’observateur de lien à spécifier.\n"
 "\n"
 "Propriétés disponibles pour l’observateur de lien 'ethtool' :\n"
 "  'delay-up', 'delay-down'\n"
@@ -5046,47 +4900,39 @@ msgstr ""
 "Propriétés disponibles pour l’observateur de lien 'nsna_ping' :\n"
 "  'init-wait', 'interval', 'missed-max', 'target-host'*\n"
 "\n"
-"Propriétés disponibles pour 'arp_ping' incluent toutes celles de 'nsna_ping' "
-"et :\n"
+"Propriétés disponibles pour 'arp_ping' incluent toutes celles de 'nsna_ping' et :\n"
 "  'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n"
 "\n"
 "Propriétés marquées par '*' sont obligatoires.\n"
 "\n"
 "Exemple:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name="
-"ethtool delay-up=3\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:4481
+#: ../clients/common/nm-meta-setting-desc.c:4496
 msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
 msgstr "IEEE 802.15.4 (WPAN) périphérique parent ou connexion UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:4514
+#: ../clients/common/nm-meta-setting-desc.c:4532
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/cacert.crt\n"
-msgstr ""
-"Saisir le chemin du fichier de certificat d’autorité (CA)  (peut être "
-"précédé de file://). [file://]<file path>\n"
-"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
-"de données brutes de blob.\n"
+msgstr "Saisir le chemin du fichier de certificat d’autorité (CA)  (peut être précédé de file://). [file://]<file path>\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
 "Exemple : /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4553
+#: ../clients/common/nm-meta-setting-desc.c:4571
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara.crt\n"
-msgstr ""
-"Saisir le chemin du certificat client (CA)  (peut être précédé de file://). "
-"[file://]<file path>\n"
-"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
-"de données brutes de blob.\n"
+msgstr "Saisir le chemin du certificat client (CA)  (peut être précédé de file://). [file://]<file path>\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
 "Exemple : /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4610
+#: ../clients/common/nm-meta-setting-desc.c:4628
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5094,15 +4940,12 @@ msgid ""
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
-msgstr ""
-"Saisir le chemin du fichier de certificat d’autorité (CA) pour une "
-"authorisation interne (peut être précédé de file://).>\n"
+msgstr "Saisir le chemin du fichier de certificat d’autorité (CA) pour une authorisation interne (peut être précédé de file://).>\n"
 " [file://]<file path>\n"
-"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
-"de données brutes de blob.\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
 "Exemple : /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4650
+#: ../clients/common/nm-meta-setting-desc.c:4668
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -5110,144 +4953,136 @@ msgid ""
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
-msgstr ""
-"Saisir le chemin du fichier de certificat client pour une authorisation "
-"interne (peut être précédé de file://).>\n"
+msgstr "Saisir le chemin du fichier de certificat client pour une authorisation interne (peut être précédé de file://).>\n"
 " [file://]<file path>\n"
-"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme "
-"de données brutes de blob.\n"
+"Notez que nmcli ne supporte pas que l'on spécifie les certificats sous forme de données brutes de blob.\n"
 "Exemple : /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4677
+#: ../clients/common/nm-meta-setting-desc.c:4695
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
 "Examples: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
-msgstr ""
-"Saisissez les octets en tant que liste de valeurs hexadécimales.\n"
+msgstr "Saisissez les octets en tant que liste de valeurs hexadécimales.\n"
 "Deux formats sont acceptés :\n"
-"(a) une chaîne d'entiers hexadécimaux, dans laquelle deux entiers "
-"représentent un octet\n"
-"(b) une liste séparée par des espaces d'octets écrits en tant qu'entiers "
-"hexadécimaux (avec un préfixe optionnel 0x/0X, ainsi qu'un 0 le précédant "
-"optionnellement).\n"
+"(a) une chaîne d'entiers hexadécimaux, dans laquelle deux entiers représentent un octet\n"
+"(b) une liste séparée par des espaces d'octets écrits en tant qu'entiers hexadécimaux (avec un préfixe optionnel 0x/0X, ainsi qu'un 0 le précédant optionnellement).\n"
 "\n"
 "Exemples : ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4694
 #: ../clients/common/nm-meta-setting-desc.c:4712
+#: ../clients/common/nm-meta-setting-desc.c:4730
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
 "Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
-msgstr ""
-"Saisissez le chemin d'accès vers une clé privée et le mot de passe de la clé "
-"(s'il n'a pas déjà été défini) :\n"
+msgstr "Saisissez le chemin d'accès vers une clé privée et le mot de passe de la clé (s'il n'a pas déjà été défini) :\n"
 "  [file://]<file path> [<password>]\n"
 "Exemple : /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4751
-#: ../clients/common/nm-secret-agent-simple.c:280
-#: ../clients/common/nm-secret-agent-simple.c:368
-#: ../clients/tui/nmt-page-dsl.c:65 ../clients/tui/nmt-page-wifi.c:331
+#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-secret-agent-simple.c:268
+#: ../clients/common/nm-secret-agent-simple.c:356
+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ../clients/common/nm-meta-setting-desc.c:4757
-#: ../clients/common/nm-meta-setting-desc.c:4972
-#: ../clients/common/nm-meta-setting-desc.c:5365
-#: ../clients/common/nm-meta-setting-desc.c:6286
+#: ../clients/common/nm-meta-setting-desc.c:4775
+#: ../clients/common/nm-meta-setting-desc.c:4990
+#: ../clients/common/nm-meta-setting-desc.c:5385
+#: ../clients/common/nm-meta-setting-desc.c:6328
 msgid "Password [none]"
 msgstr "Mot de passe [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4803
+#: ../clients/common/nm-meta-setting-desc.c:4821
 msgid "Bluetooth device address"
 msgstr "Adresse du périphérique Bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:4851
-#: ../clients/common/nm-meta-setting-desc.c:5418
-#: ../clients/common/nm-meta-setting-desc.c:6982
-#: ../clients/common/nm-meta-setting-desc.c:7020
-#: ../clients/common/nm-meta-setting-desc.c:7202
-#: ../clients/common/nm-meta-setting-desc.c:7432
+#: ../clients/common/nm-meta-setting-desc.c:4869
+#: ../clients/common/nm-meta-setting-desc.c:5438
+#: ../clients/common/nm-meta-setting-desc.c:7024
+#: ../clients/common/nm-meta-setting-desc.c:7062
+#: ../clients/common/nm-meta-setting-desc.c:7244
+#: ../clients/common/nm-meta-setting-desc.c:7474
 msgid "MAC [none]"
 msgstr "MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4857
+#: ../clients/common/nm-meta-setting-desc.c:4875
 msgid "Enable STP [no]"
 msgstr "Activer STP [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4863
+#: ../clients/common/nm-meta-setting-desc.c:4881
 msgid "STP priority [32768]"
 msgstr "Priorité STP [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4869
+#: ../clients/common/nm-meta-setting-desc.c:4887
 msgid "Forward delay [15]"
 msgstr "Délai de réacheminement [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4875
+#: ../clients/common/nm-meta-setting-desc.c:4893
 msgid "Hello time [2]"
 msgstr "Hello time [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4881
+#: ../clients/common/nm-meta-setting-desc.c:4899
 msgid "Max age [20]"
 msgstr "Max age [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4905
 msgid "MAC address ageing time [300]"
-msgstr "Période de vieillissement des adresses MAC [300] "
+msgstr "Période de vieillissement des adresses MAC [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:4911
 msgid "Group forward mask [0]"
 msgstr "Group forward mask [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4917
 msgid "Enable IGMP snooping [no]"
 msgstr "Activer le snooping IGMP [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4928
+#: ../clients/common/nm-meta-setting-desc.c:4946
 msgid "Bridge port priority [32]"
-msgstr "Priorité du port de pontage [32] "
+msgstr "Priorité du port de pontage [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4934
+#: ../clients/common/nm-meta-setting-desc.c:4952
 msgid "Bridge port STP path cost [100]"
 msgstr "Coût du chemin d'accès STP du port de pontage [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4940
+#: ../clients/common/nm-meta-setting-desc.c:4958
 msgid "Hairpin [no]"
 msgstr "Hairpin [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4966
-#: ../clients/common/nm-meta-setting-desc.c:5359
-#: ../clients/common/nm-meta-setting-desc.c:6840
+#: ../clients/common/nm-meta-setting-desc.c:4984
+#: ../clients/common/nm-meta-setting-desc.c:5379
+#: ../clients/common/nm-meta-setting-desc.c:6882
 msgid "Username [none]"
 msgstr "Nom d'utilisateur [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5069
+#: ../clients/common/nm-meta-setting-desc.c:5086
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: alice bob charlie\n"
-msgstr ""
-"Saisissez une liste des permissions utilisateur. Ceci est une liste des noms "
-"d'utilisateur formatée comme suit :\n"
+msgstr "Saisissez une liste des permissions utilisateur. Ceci est une liste des noms d'utilisateur formatée comme suit :\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "Les éléments peuvent être séparés par des virgules ou des espaces.\n"
 "\n"
 "Exemple : alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5121
+#: ../clients/common/nm-meta-setting-desc.c:5138
 msgid ""
-"Enter secondary connections that should be activated when this connection is\n"
+"Enter secondary connections that should be activated when this connection "
+"is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5255,86 +5090,77 @@ msgid ""
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-msgstr ""
-"Saisissez des connexions secondaires qui peuvent être activées quand cette \n"
-"connexion est active. Les connexions peuvent être indiquées soit par leur "
-"UUID \n"
-"ou leur identifiant (nom), nmcli les traduisant de manière transparente en "
-"UUID.\n"
+msgstr "Saisissez des connexions secondaires qui peuvent être activées quand cette \n"
+"connexion est active. Les connexions peuvent être indiquées soit par leur UUID \n"
+"ou leur identifiant (nom), nmcli les traduisant de manière transparente en UUID.\n"
 "N.B. : NetworkManager ne prend en charge actuellement que les connexions VPN\n"
 "en tant que connexions secondaires.\n"
 "Les éléments peuvent être séparés par des virgules ou des espaces.\n"
 "\n"
 "Exemple : private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5144
+#: ../clients/common/nm-meta-setting-desc.c:5161
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
 "'true','yes','on' to set the connection as metered\n"
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
-msgstr ""
-"Saisir une valeur qui indique si la connexion est assujetie à un quota de "
-"données\n"
-"des coûts d'utilisation ou d'autres limitations. Les options acceptées sont :"
-"\n"
+msgstr "Saisir une valeur qui indique si la connexion est assujetie à un quota de données\n"
+"des coûts d'utilisation ou d'autres limitations. Les options acceptées sont :\n"
 "'true','yes','on' pour définir la connexion comme étant mesurée\n"
 "'false','no','off' pour définir la connexion comme  n'étant pas mesurée\n"
-"'unknown' permettre au NetworkManager de choisir une valeur à partir "
-"d'heuristiques\n"
+"'unknown' permettre au NetworkManager de choisir une valeur à partir d'heuristiques\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5375
+#: ../clients/common/nm-meta-setting-desc.c:5395
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5427
-#: ../clients/common/nm-meta-setting-desc.c:7051
-#: ../clients/common/nm-meta-setting-desc.c:7242
+#: ../clients/common/nm-meta-setting-desc.c:5447
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7284
 msgid "MTU [auto]"
 msgstr "MTU [auto]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5446
+#: ../clients/common/nm-meta-setting-desc.c:5466
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5455
+#: ../clients/common/nm-meta-setting-desc.c:5475
 msgid "Parent interface [none]"
 msgstr "Interface parente [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5482
+#: ../clients/common/nm-meta-setting-desc.c:5502
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
 "Example: 8.8.8.8, 8.8.4.4\n"
-msgstr ""
-"Saisissez une liste d'adresses IPv4 de serveurs DNS.\n"
+msgstr "Saisissez une liste d'adresses IPv4 de serveurs DNS.\n"
 "\n"
 "Exemple : 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5530
+#: ../clients/common/nm-meta-setting-desc.c:5550
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "Adresse IPv4 (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5532
+#: ../clients/common/nm-meta-setting-desc.c:5552
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 32.\n"
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
-msgstr ""
-"Saisissez une liste des adresses IPv4 formatées comme suit :\n"
+msgstr "Saisissez une liste des adresses IPv4 formatées comme suit :\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Le préfixe manquant est considéré comme un préfixe de 32.\n"
 "\n"
 "Exemple : 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5551
+#: ../clients/common/nm-meta-setting-desc.c:5571
 msgid "IPv4 gateway [none]"
 msgstr "Passerelle IPv4 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5559
+#: ../clients/common/nm-meta-setting-desc.c:5579
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5345,28 +5171,26 @@ msgid ""
 "\n"
 "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
-msgstr ""
-"Saisissez une liste des routes IPv4 formatée comme suit :\n"
+msgstr "Saisissez une liste des routes IPv4 formatée comme suit :\n"
 "  ip/[prefix] next-hop [metric],...\n"
 "\n"
 "Le préfixe manquant est considéré comme un préfixe de 32.\n"
 "Le prochain rebond (hop) manquant est considéré comme 0.0.0.0.\n"
-"La métrique manquante est considérée comme une métrique par défaut (NM/noyau "
-"va définir une valeur par défaut).\n"
+"La métrique manquante est considérée comme une métrique par défaut (NM/noyau va définir une valeur par défaut).\n"
 "\n"
 "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5599
+#: ../clients/common/nm-meta-setting-desc.c:5619
 msgid ""
 "Enter a list of IPv4 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
-msgstr ""
-"Saisissez une liste des adresses IPv4 formatées comme suit :\n"
+msgstr "Saisissez une liste des adresses IPv4 formatées comme suit :\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
+"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5690
+#: ../clients/common/nm-meta-setting-desc.c:5721
 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 "
@@ -5376,40 +5200,32 @@ msgid ""
 "DNS servers for this connection.\n"
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-msgstr ""
-"Saisissez une liste des adresses IPv6 de serveurs DNS.  Si la méthode de "
-"configuration IPv6 est « auto », ces serveurs DNS seront ajoutés à ceux "
-"(s'il y en a) qui sont retourné(s) par la configuration automatique.  Les "
-"serveurs DNS ne peuvent pas être utilisés avec les méthodes de configuration "
-"IPv6 « shared » ou « link-local », car il n'y a pas de réseau en amont. Dans "
-"toutes les autres méthodes de configuration IPv6, ces serveurs DNS sont "
-"utilisés comme les seuls serveurs DNS pour cette connexion.\n"
+msgstr "Saisissez une liste des adresses IPv6 de serveurs DNS.  Si la méthode de configuration IPv6 est « auto », ces serveurs DNS seront ajoutés à ceux (s'il y en a) qui sont retourné(s) par la configuration automatique.  Les serveurs DNS ne peuvent pas être utilisés avec les méthodes de configuration IPv6 « shared » ou « link-local », car il n'y a pas de réseau en amont. Dans toutes les autres méthodes de configuration IPv6, ces serveurs DNS sont utilisés comme les seuls serveurs DNS pour cette connexion.\n"
 "\n"
 "Exemple : 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5744
+#: ../clients/common/nm-meta-setting-desc.c:5775
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "Adresse IPv6 (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5746
+#: ../clients/common/nm-meta-setting-desc.c:5777
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 128.\n"
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-msgstr ""
-"Saisissez une liste des adresses IPv6 formatées comme suit :\n"
+msgstr "Saisissez une liste des adresses IPv6 formatées comme suit :\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Le préfixe manquant est considéré comme un préfixe de 128.\n"
 "\n"
 "Exemple : 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5765
+#: ../clients/common/nm-meta-setting-desc.c:5796
 msgid "IPv6 gateway [none]"
 msgstr "Passerelle IPv6 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5773
+#: ../clients/common/nm-meta-setting-desc.c:5804
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5421,630 +5237,602 @@ msgid ""
 "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
-msgstr ""
-"Saisissez une liste des routes IPv6 formatées comme suit :\n"
+msgstr "Saisissez une liste des routes IPv6 formatées comme suit :\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
 "\n"
 "Le préfixe manquant est considéré comme un préfixe de 128.\n"
 "Le prochain rebond (hop) manquant est considéré comme « :: ».\n"
-"La métrique manquante est considérée comme une métrique par défaut (NM/noyau "
-"va définir une valeur par défaut).\n"
+"La métrique manquante est considérée comme une métrique par défaut (NM/noyau va définir une valeur par défaut).\n"
 "\n"
-"Exemple : 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
-"db8:beef::3 2\n"
+"Exemple : 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5813
+#: ../clients/common/nm-meta-setting-desc.c:5844
 msgid ""
 "Enter a list of IPv6 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
-msgstr ""
-"Saisissez une liste des adresses IPv6 formatées comme suit :\n"
+msgstr "Saisissez une liste des adresses IPv6 formatées comme suit :\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
+"\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5901
-#: ../clients/common/nm-meta-setting-desc.c:6881
+#: ../clients/common/nm-meta-setting-desc.c:5943
+#: ../clients/common/nm-meta-setting-desc.c:6923
 msgid "Parent device [none]"
 msgstr "Périphérique parent [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5907
+#: ../clients/common/nm-meta-setting-desc.c:5949
 msgid "Local endpoint [none]"
 msgstr "Point de terminaison local [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5914
-#: ../clients/common/nm-meta-setting-desc.c:6901
+#: ../clients/common/nm-meta-setting-desc.c:5956
+#: ../clients/common/nm-meta-setting-desc.c:6943
 msgid "Remote"
 msgstr "Distant"
 
-#: ../clients/common/nm-meta-setting-desc.c:5959
+#: ../clients/common/nm-meta-setting-desc.c:6001
 msgid "MACsec parent device or connection UUID"
 msgstr "Périphérique parent ou connexion MACsec UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:5980
+#: ../clients/common/nm-meta-setting-desc.c:6022
 msgid "Enable encryption [yes]"
 msgstr "Activer le chiffrement [yes]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5986
-#: ../clients/common/nm-secret-agent-simple.c:929
+#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:5996
+#: ../clients/common/nm-meta-setting-desc.c:6038
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6002
+#: ../clients/common/nm-meta-setting-desc.c:6044
 msgid "SCI port [1]"
 msgstr "SCI port [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6070
 msgid "MACVLAN parent device or connection UUID"
 msgstr "Périphérique parent MACVLAN ou connexion UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6049
+#: ../clients/common/nm-meta-setting-desc.c:6091
 msgid "Tap [no]"
 msgstr "Cliquez  [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6084
-#: ../clients/common/nm-meta-setting-desc.c:7156
-#: ../clients/tui/nmt-page-wifi.c:223
+#: ../clients/common/nm-meta-setting-desc.c:6126
+#: ../clients/common/nm-meta-setting-desc.c:7198
+#: ../clients/tui/nmt-page-wifi.c:212
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6093
+#: ../clients/common/nm-meta-setting-desc.c:6135
 msgid "OLPC Mesh channel [1]"
 msgstr "Canal OLPC Mesh [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6102
+#: ../clients/common/nm-meta-setting-desc.c:6144
 msgid "DHCP anycast MAC address [none]"
 msgstr "Adresse MAC anycast DHCP [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6267
+#: ../clients/common/nm-meta-setting-desc.c:6309
 msgid "PPPoE parent device"
 msgstr "Périphérique parent PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6273
+#: ../clients/common/nm-meta-setting-desc.c:6315
 msgid "Service [none]"
 msgstr "Service [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6280
+#: ../clients/common/nm-meta-setting-desc.c:6322
 msgid "PPPoE username"
 msgstr "Nom d'utilisateur PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:6316
+#: ../clients/common/nm-meta-setting-desc.c:6358
 msgid "Browser only [no]"
 msgstr "Navigateur seulement [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6322
+#: ../clients/common/nm-meta-setting-desc.c:6364
 msgid "PAC URL"
 msgstr "URL PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:6370
 msgid "PAC script"
 msgstr "Script PAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:6452
-#: ../clients/common/nm-meta-setting-desc.c:6640
+#: ../clients/common/nm-meta-setting-desc.c:6494
+#: ../clients/common/nm-meta-setting-desc.c:6682
 msgid "Team JSON configuration [none]"
 msgstr "Configuration de l'équipe JSON [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6743
+#: ../clients/common/nm-meta-setting-desc.c:6785
 msgid "User ID [none]"
 msgstr "ID Utilisateur [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6749
+#: ../clients/common/nm-meta-setting-desc.c:6791
 msgid "Group ID [none]"
 msgstr "ID Groupe [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6755
+#: ../clients/common/nm-meta-setting-desc.c:6797
 msgid "Enable PI [no]"
 msgstr "Activer PI [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6761
+#: ../clients/common/nm-meta-setting-desc.c:6803
 msgid "Enable VNET header [no]"
 msgstr "Activer l'en-tête VNET [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6767
+#: ../clients/common/nm-meta-setting-desc.c:6809
 msgid "Enable multi queue [no]"
 msgstr "Activer les files d'attente multiples [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6780
+#: ../clients/common/nm-meta-setting-desc.c:6822
 msgid "VLAN parent device or connection UUID"
 msgstr "Périphérique parent VLAN ou connexion UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6787
+#: ../clients/common/nm-meta-setting-desc.c:6829
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6793
+#: ../clients/common/nm-meta-setting-desc.c:6835
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "Marqueurs VLAN (<0-7>) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6802
+#: ../clients/common/nm-meta-setting-desc.c:6844
 msgid "Ingress priority maps [none]"
 msgstr "Carte des priorités entrantes [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6812
+#: ../clients/common/nm-meta-setting-desc.c:6854
 msgid "Egress priority maps [none]"
-msgstr "Carte des priorités sortantes [aucune] "
+msgstr "Carte des priorités sortantes [aucune]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6888
+#: ../clients/common/nm-meta-setting-desc.c:6930
 msgid "VXLAN ID"
 msgstr "ID VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6894
+#: ../clients/common/nm-meta-setting-desc.c:6936
 msgid "Local address [none]"
 msgstr "Adresse locale [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6907
+#: ../clients/common/nm-meta-setting-desc.c:6949
 msgid "Minimum source port [0]"
 msgstr "Port source minimum [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6913
+#: ../clients/common/nm-meta-setting-desc.c:6955
 msgid "Maximum source port [0]"
 msgstr "Port source maximum [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6919
+#: ../clients/common/nm-meta-setting-desc.c:6961
 msgid "Destination port [8472]"
 msgstr "Port de destination [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6959
+#: ../clients/common/nm-meta-setting-desc.c:7001
 msgid "Peer"
 msgstr "Peer"
 
-#: ../clients/common/nm-meta-setting-desc.c:6989
+#: ../clients/common/nm-meta-setting-desc.c:7031
 msgid "WiMAX NSP name"
 msgstr "Nom NSP WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7026
-#: ../clients/common/nm-meta-setting-desc.c:7207
+#: ../clients/common/nm-meta-setting-desc.c:7068
+#: ../clients/common/nm-meta-setting-desc.c:7249
 msgid "Cloned MAC [none]"
 msgstr "MAC dupliqué [aucun]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7059
+#: ../clients/common/nm-meta-setting-desc.c:7101
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
-msgstr ""
-"Saisissez une liste de sous-canaux (séparés par des virgules ou espaces).\n"
+msgstr "Saisissez une liste de sous-canaux (séparés par des virgules ou espaces).\n"
 "\n"
 "Exemple : 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7381
+#: ../clients/common/nm-meta-setting-desc.c:7423
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
-msgstr ""
-"Saisissez le type des clés WEP. Les valeurs acceptées sont : 0 ou inconnu, 1 "
-"ou clé et 2 ou phrase de passe.\n"
+msgstr "Saisissez le type des clés WEP. Les valeurs acceptées sont : 0 ou inconnu, 1 ou clé et 2 ou phrase de passe.\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7440
+#: ../clients/common/nm-meta-setting-desc.c:7482
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "Adresse courte (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7456
+#: ../clients/common/nm-meta-setting-desc.c:7498
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "Identificateur PAN (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7471
+#: ../clients/common/nm-meta-setting-desc.c:7513
 msgid "Page (<default|0-31>)"
 msgstr "Page (<default|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7485
+#: ../clients/common/nm-meta-setting-desc.c:7527
 msgid "Channel (<default|0-26>)"
 msgstr "Canal (<default|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7620
+#: ../clients/common/nm-meta-setting-desc.c:7662
 msgid "6LOWPAN settings"
 msgstr "Configuration 6LOWPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7621
+#: ../clients/common/nm-meta-setting-desc.c:7663
 msgid "802-1x settings"
 msgstr "Configuration 802-1x"
 
-#: ../clients/common/nm-meta-setting-desc.c:7622
-#: ../src/devices/adsl/nm-device-adsl.c:131
+#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "Connexion ADSL"
 
-#: ../clients/common/nm-meta-setting-desc.c:7623
+#: ../clients/common/nm-meta-setting-desc.c:7665
 msgid "bluetooth connection"
 msgstr "Connexion bluetooth"
 
-#: ../clients/common/nm-meta-setting-desc.c:7624
+#: ../clients/common/nm-meta-setting-desc.c:7666
 msgid "Bond device"
 msgstr "Périphérique de liaison"
 
-#: ../clients/common/nm-meta-setting-desc.c:7625
+#: ../clients/common/nm-meta-setting-desc.c:7667
 msgid "Bridge device"
 msgstr "Périphérique de pontage"
 
-#: ../clients/common/nm-meta-setting-desc.c:7626
+#: ../clients/common/nm-meta-setting-desc.c:7668
 msgid "Bridge port"
 msgstr "Pont port"
 
-#: ../clients/common/nm-meta-setting-desc.c:7627
+#: ../clients/common/nm-meta-setting-desc.c:7669
 msgid "CDMA mobile broadband connection"
-msgstr "Connexion haut débit mobile "
+msgstr "Connexion haut débit mobile"
 
-#: ../clients/common/nm-meta-setting-desc.c:7628
+#: ../clients/common/nm-meta-setting-desc.c:7670
 msgid "General settings"
 msgstr "Configuration générale"
 
-#: ../clients/common/nm-meta-setting-desc.c:7629
+#: ../clients/common/nm-meta-setting-desc.c:7671
 msgid "DCB settings"
 msgstr "Configuration DCB"
 
-#: ../clients/common/nm-meta-setting-desc.c:7630
+#: ../clients/common/nm-meta-setting-desc.c:7672
 msgid "Dummy settings"
 msgstr "Paramètres fictifs"
 
-#: ../clients/common/nm-meta-setting-desc.c:7631
+#: ../clients/common/nm-meta-setting-desc.c:7673
 msgid "Ethtool settings"
 msgstr "Paramètres de l'Ethtool"
 
-#: ../clients/common/nm-meta-setting-desc.c:7632
+#: ../clients/common/nm-meta-setting-desc.c:7674
 msgid "Generic settings"
 msgstr "Paramètres génériques"
 
-#: ../clients/common/nm-meta-setting-desc.c:7633
+#: ../clients/common/nm-meta-setting-desc.c:7675
 msgid "GSM mobile broadband connection"
-msgstr "Connexion haut débit mobile "
+msgstr "Connexion haut débit mobile"
 
-#: ../clients/common/nm-meta-setting-desc.c:7634
-#: ../src/devices/nm-device-infiniband.c:175
+#: ../clients/common/nm-meta-setting-desc.c:7676
+#: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "Connexion InfiniBand"
 
-#: ../clients/common/nm-meta-setting-desc.c:7635
+#: ../clients/common/nm-meta-setting-desc.c:7677
 msgid "IPv4 protocol"
 msgstr "Protocole IPv4"
 
-#: ../clients/common/nm-meta-setting-desc.c:7636
+#: ../clients/common/nm-meta-setting-desc.c:7678
 msgid "IPv6 protocol"
 msgstr "Protocole IPv6"
 
-#: ../clients/common/nm-meta-setting-desc.c:7637
+#: ../clients/common/nm-meta-setting-desc.c:7679
 msgid "IP-tunnel settings"
 msgstr "Paramètres du tunnel IP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7638
+#: ../clients/common/nm-meta-setting-desc.c:7680
 msgid "MACsec connection"
 msgstr "Connexion MACsec"
 
-#: ../clients/common/nm-meta-setting-desc.c:7639
+#: ../clients/common/nm-meta-setting-desc.c:7681
 msgid "macvlan connection"
 msgstr "Connexion macvlan"
 
-#: ../clients/common/nm-meta-setting-desc.c:7640
+#: ../clients/common/nm-meta-setting-desc.c:7682
 msgid "Match"
 msgstr "Correspond"
 
-#: ../clients/common/nm-meta-setting-desc.c:7641
+#: ../clients/common/nm-meta-setting-desc.c:7683
 msgid "OLPC Mesh connection"
 msgstr "Connexion OLPC Mesh"
 
-#: ../clients/common/nm-meta-setting-desc.c:7642
+#: ../clients/common/nm-meta-setting-desc.c:7684
 msgid "Open vSwitch bridge settings"
 msgstr "Configuration du pont Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7643
+#: ../clients/common/nm-meta-setting-desc.c:7685
 msgid "Open vSwitch DPDK interface settings"
 msgstr "Paramètres de l'interface Open vSwitch DPDK"
 
-#: ../clients/common/nm-meta-setting-desc.c:7644
+#: ../clients/common/nm-meta-setting-desc.c:7686
 msgid "Open vSwitch interface settings"
 msgstr "Paramètres de l'interface Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7645
+#: ../clients/common/nm-meta-setting-desc.c:7687
 msgid "Open vSwitch patch interface settings"
 msgstr "Paramètres de l'interface de patch Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7646
+#: ../clients/common/nm-meta-setting-desc.c:7688
 msgid "Open vSwitch port settings"
 msgstr "Paramètres du port Open vSwitch"
 
-#: ../clients/common/nm-meta-setting-desc.c:7647
+#: ../clients/common/nm-meta-setting-desc.c:7689
 msgid "PPP settings"
 msgstr "Paramètres PPP"
 
-#: ../clients/common/nm-meta-setting-desc.c:7648
+#: ../clients/common/nm-meta-setting-desc.c:7690
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7649
+#: ../clients/common/nm-meta-setting-desc.c:7691
 msgid "Proxy"
 msgstr "Procuration"
 
-#: ../clients/common/nm-meta-setting-desc.c:7650
+#: ../clients/common/nm-meta-setting-desc.c:7692
 msgid "Serial settings"
 msgstr "Configuration de série"
 
-#: ../clients/common/nm-meta-setting-desc.c:7651
+#: ../clients/common/nm-meta-setting-desc.c:7693
 msgid "SR-IOV settings"
 msgstr "Configuration SR-IOV"
 
-#: ../clients/common/nm-meta-setting-desc.c:7652
+#: ../clients/common/nm-meta-setting-desc.c:7694
 msgid "Traffic controls"
 msgstr "Contrôles du trafic"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-meta-setting-desc.c:7653
+#: ../clients/common/nm-meta-setting-desc.c:7695
 msgid "Team device"
 msgstr "Périphérique de l'équipe"
 
-#: ../clients/common/nm-meta-setting-desc.c:7654
+#: ../clients/common/nm-meta-setting-desc.c:7696
 msgid "Team port"
 msgstr "Port de l'équipe"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-meta-setting-desc.c:7655
+#: ../clients/common/nm-meta-setting-desc.c:7697
 msgid "Tun device"
 msgstr "Périphérique TUN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7656
+#: ../clients/common/nm-meta-setting-desc.c:7698
 msgid "User settings"
 msgstr "Configuration utilisateur"
 
-#: ../clients/common/nm-meta-setting-desc.c:7657
-#: ../src/devices/nm-device-vlan.c:399
+#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "Connexion VLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7658 ../src/nm-manager.c:5568
+#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
 msgid "VPN connection"
 msgstr "Connexion VPN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7659
-#: ../src/devices/nm-device-vxlan.c:368
+#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "Connexion VXLAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:7660
+#: ../clients/common/nm-meta-setting-desc.c:7702
 msgid "Wi-Fi P2P connection"
-msgstr "Connexion Wi-Fi P2P "
+msgstr "Connexion Wi-Fi P2P"
 
-#: ../clients/common/nm-meta-setting-desc.c:7661
+#: ../clients/common/nm-meta-setting-desc.c:7703
 msgid "WiMAX connection"
 msgstr "Connexion WiMAX"
 
-#: ../clients/common/nm-meta-setting-desc.c:7662
+#: ../clients/common/nm-meta-setting-desc.c:7704
 msgid "Wired Ethernet"
 msgstr "Ethernet filaire"
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7705
 msgid "WireGuard VPN settings"
 msgstr "Configuration VPN WireGuard"
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../clients/common/nm-meta-setting-desc.c:7706
 msgid "Wi-Fi connection"
-msgstr "Connexion Wi-Fi "
+msgstr "Connexion Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7665
+#: ../clients/common/nm-meta-setting-desc.c:7707
 msgid "Wi-Fi security settings"
 msgstr "Paramètres de sécurité Wi-Fi"
 
-#: ../clients/common/nm-meta-setting-desc.c:7666
+#: ../clients/common/nm-meta-setting-desc.c:7708
 msgid "WPAN settings"
 msgstr "Configuration WPAN"
 
-#: ../clients/common/nm-meta-setting-desc.c:8031
+#: ../clients/common/nm-meta-setting-desc.c:8074
 msgid "name"
 msgstr "nom"
 
-#: ../clients/common/nm-polkit-listener.c:237
+#: ../clients/common/nm-polkit-listener.c:225
 msgid "An authentication session is already underway."
 msgstr "Il y a déjà une session d'authentification en cours."
 
-#: ../clients/common/nm-secret-agent-simple.c:229
+#: ../clients/common/nm-secret-agent-simple.c:217
 #, c-format
 msgid "Preshared-key for %s"
 msgstr "Clé pré-partagée pour %s"
 
-#: ../clients/common/nm-secret-agent-simple.c:285
-#: ../clients/common/nm-secret-agent-simple.c:322
-#: ../clients/common/nm-secret-agent-simple.c:345
-#: ../clients/common/nm-secret-agent-simple.c:378
-#: ../clients/common/nm-secret-agent-simple.c:915
-#: ../clients/common/nm-secret-agent-simple.c:950
-#: ../clients/common/nm-secret-agent-simple.c:973
-#: ../clients/common/nm-vpn-helpers.c:122
-#: ../clients/common/nm-vpn-helpers.c:126
-#: ../clients/common/nm-vpn-helpers.c:132
-#: ../clients/common/nm-vpn-helpers.c:137 ../clients/tui/nmt-page-dsl.c:74
-#: ../clients/tui/nmt-page-wifi.c:276 ../clients/tui/nmt-page-wifi.c:307
-#: ../clients/tui/nmt-page-wifi.c:340
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../clients/common/nm-secret-agent-simple.c:294
+#: ../clients/common/nm-secret-agent-simple.c:282
 msgid "Identity"
 msgstr "Identité"
 
-#: ../clients/common/nm-secret-agent-simple.c:299
+#: ../clients/common/nm-secret-agent-simple.c:287
 msgid "Private key password"
 msgstr "Mot de passe de la clé privée"
 
-#: ../clients/common/nm-secret-agent-simple.c:335
-#: ../clients/tui/nmt-page-wifi.c:288
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/tui/nmt-page-wifi.c:278
 msgid "Key"
 msgstr "Clé"
 
-#: ../clients/common/nm-secret-agent-simple.c:373
-#: ../clients/tui/nmt-page-dsl.c:77
+#: ../clients/common/nm-secret-agent-simple.c:361
+#: ../clients/tui/nmt-page-dsl.c:65
 msgid "Service"
 msgstr "Service"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:473
 msgid "WireGuard private-key"
 msgstr "Clé privée WireGuard"
 
-#: ../clients/common/nm-secret-agent-simple.c:526
+#: ../clients/common/nm-secret-agent-simple.c:514
 #, c-format
 msgid "Secrets are required to connect WireGuard VPN '%s'"
 msgstr "Il faut des secrets pour vous connecter au VPN WireGuard « %s »"
 
-#: ../clients/common/nm-secret-agent-simple.c:627
-#: ../clients/common/nm-secret-agent-simple.c:911
-#: ../clients/common/nm-secret-agent-simple.c:946
-#: ../clients/common/nm-secret-agent-simple.c:969
-#: ../clients/common/nm-secret-agent-simple.c:988
+#: ../clients/common/nm-secret-agent-simple.c:615
+#: ../clients/common/nm-secret-agent-simple.c:899
+#: ../clients/common/nm-secret-agent-simple.c:934
+#: ../clients/common/nm-secret-agent-simple.c:957
+#: ../clients/common/nm-secret-agent-simple.c:976
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Un mot de passe est requis pour se connecter à « %s »."
 
-#: ../clients/common/nm-secret-agent-simple.c:878
+#: ../clients/common/nm-secret-agent-simple.c:866
 msgid "Authentication required by wireless network"
 msgstr "L'authentification est requise par le réseau sans fil"
 
-#: ../clients/common/nm-secret-agent-simple.c:879
+#: ../clients/common/nm-secret-agent-simple.c:867
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr ""
-"Il faut un mot de passe ou une clé de chiffrement pour accéder au réseau "
-"sans fil « %s »"
+msgstr "Il faut un mot de passe ou une clé de chiffrement pour accéder au réseau sans fil « %s »"
 
-#: ../clients/common/nm-secret-agent-simple.c:884
+#: ../clients/common/nm-secret-agent-simple.c:872
 msgid "Wired 802.1X authentication"
 msgstr "Authentification filaire 802.1X"
 
-#: ../clients/common/nm-secret-agent-simple.c:885
+#: ../clients/common/nm-secret-agent-simple.c:873
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "Il faut un secret pour accéder au réseau sans fil « %s »"
 
-#: ../clients/common/nm-secret-agent-simple.c:891
+#: ../clients/common/nm-secret-agent-simple.c:879
 msgid "DSL authentication"
 msgstr "Authentification DSL"
 
-#: ../clients/common/nm-secret-agent-simple.c:892
+#: ../clients/common/nm-secret-agent-simple.c:880
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "Secrets requis pour les connexions de type « %s »."
 
-#: ../clients/common/nm-secret-agent-simple.c:901
+#: ../clients/common/nm-secret-agent-simple.c:889
 msgid "PIN code required"
 msgstr "Code PIN requis"
 
-#: ../clients/common/nm-secret-agent-simple.c:902
+#: ../clients/common/nm-secret-agent-simple.c:890
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Un code PIN est nécessaire pour les périphériques à haut débit mobile"
 
-#: ../clients/common/nm-secret-agent-simple.c:905
+#: ../clients/common/nm-secret-agent-simple.c:893
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:910
-#: ../clients/common/nm-secret-agent-simple.c:945
-#: ../clients/common/nm-secret-agent-simple.c:968
+#: ../clients/common/nm-secret-agent-simple.c:898
+#: ../clients/common/nm-secret-agent-simple.c:933
+#: ../clients/common/nm-secret-agent-simple.c:956
 msgid "Mobile broadband network password"
 msgstr "Mot de passe du réseau haut débit mobile"
 
-#: ../clients/common/nm-secret-agent-simple.c:923
+#: ../clients/common/nm-secret-agent-simple.c:911
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "Les secrets sont nécessaires pour accéder au réseau MACsec ;%s"
 
-#: ../clients/common/nm-secret-agent-simple.c:927
+#: ../clients/common/nm-secret-agent-simple.c:915
 msgid "MACsec PSK authentication"
 msgstr "Authentification MACsec PSK"
 
-#: ../clients/common/nm-secret-agent-simple.c:934
+#: ../clients/common/nm-secret-agent-simple.c:922
 msgid "MACsec EAP authentication"
 msgstr "Authentification MACsec EAP"
 
-#: ../clients/common/nm-secret-agent-simple.c:939
+#: ../clients/common/nm-secret-agent-simple.c:927
 msgid "WireGuard VPN secret"
 msgstr "Secret VPN WireGuard"
 
-#: ../clients/common/nm-secret-agent-simple.c:978
+#: ../clients/common/nm-secret-agent-simple.c:966
 msgid "VPN password required"
 msgstr "Mot de passe VPN requis"
 
-#: ../clients/common/nm-vpn-helpers.c:51
+#: ../clients/common/nm-vpn-helpers.c:39
 #, c-format
 msgid "unknown VPN plugin \"%s\""
 msgstr "Greffon VPN inconnu « %s »"
 
-#: ../clients/common/nm-vpn-helpers.c:62
+#: ../clients/common/nm-vpn-helpers.c:50
 #, c-format
 msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
 msgstr "impossible de charger le greffon VPN obsolète « %s » pour « %s »"
 
-#: ../clients/common/nm-vpn-helpers.c:67
+#: ../clients/common/nm-vpn-helpers.c:55
 #, c-format
 msgid ""
 "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
-msgstr ""
-"impossible de charger le greffon VPN « %s » à cause de « %s » manquant. "
-"Greffon client manquant ?"
+msgstr "impossible de charger le greffon VPN « %s » à cause de « %s » manquant. Greffon client manquant ?"
 
-#: ../clients/common/nm-vpn-helpers.c:72
+#: ../clients/common/nm-vpn-helpers.c:60
 #, c-format
 msgid "failed to load VPN plugin \"%s\": %s"
 msgstr "impossible de charger le greffon VPN « %s » : %s"
 
-#: ../clients/common/nm-vpn-helpers.c:127
+#: ../clients/common/nm-vpn-helpers.c:115
 msgid "Certificate password"
 msgstr "Mot de passe du certificat"
 
 # ctx::sourcefile::/rhn/admin/config/GeneralConfig.do
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:116
 msgid "HTTP proxy password"
 msgstr "Mot de passe du proxy HTTP"
 
-#: ../clients/common/nm-vpn-helpers.c:133
-#: ../clients/common/nm-vpn-helpers.c:138
+#: ../clients/common/nm-vpn-helpers.c:121
+#: ../clients/common/nm-vpn-helpers.c:126
 msgid "Group password"
 msgstr "Mot de passe de groupe"
 
-#: ../clients/common/nm-vpn-helpers.c:142 ../clients/tui/nmt-page-ip4.c:142
-#: ../clients/tui/nmt-page-ip6.c:143
+#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
+#: ../clients/tui/nmt-page-ip6.c:131
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: ../clients/common/nm-vpn-helpers.c:143
+#: ../clients/common/nm-vpn-helpers.c:131
 msgid "Cookie"
 msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:144
+#: ../clients/common/nm-vpn-helpers.c:132
 msgid "Gateway certificate hash"
 msgstr "Hachage de certificat de passerelle"
 
-#: ../clients/common/nm-vpn-helpers.c:269
+#: ../clients/common/nm-vpn-helpers.c:257
 #, c-format
 msgid "Invalid peer starting at %s:%zu: %s"
 msgstr "Homologue non valide commençant à %s:%zu: %s"
 
-#: ../clients/common/nm-vpn-helpers.c:389
+#: ../clients/common/nm-vpn-helpers.c:377
 msgid ""
-"The WireGuard config file must be a valid interface name followed by \"."
-"conf\""
-msgstr ""
-"Le fichier de configuration WireGuard doit correspondre à un nom d'interface "
-"valide suivie par \".conf\""
+"The WireGuard config file must be a valid interface name followed by \".conf"
+"\""
+msgstr "Le fichier de configuration WireGuard doit correspondre à un nom d'interface valide suivie par \".conf\""
 
-#: ../clients/common/nm-vpn-helpers.c:677
+#: ../clients/common/nm-vpn-helpers.c:666
 #, c-format
 msgid "unrecognized line at %s:%zu"
 msgstr "ligne non reconnue à %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:682
+#: ../clients/common/nm-vpn-helpers.c:671
 #, c-format
 msgid "invalid value for '%s' at %s:%zu"
 msgstr "valeur non reconnue pour '%s' at %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:687
+#: ../clients/common/nm-vpn-helpers.c:676
 #, c-format
 msgid "invalid secret '%s' at %s:%zu"
 msgstr "secret non valide '%s' à %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:800
+#: ../clients/common/nm-vpn-helpers.c:789
 #, c-format
 msgid "Failed to create WireGuard connection: %s"
 msgstr "N'a pas pu créer de connexion WireGuard : %s"
@@ -6054,9 +5842,7 @@ msgstr "N'a pas pu créer de connexion WireGuard : %s"
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this 6LowPAN interface should be created."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion "
-"parent à partir duquel cette interface 6LowPAN doit être créée."
+msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface 6LowPAN doit être créée."
 
 #: ../clients/common/settings-docs.h.in:4
 msgid "Channel on which the mesh network to join is located."
@@ -6067,10 +5853,7 @@ 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 "
 "request."
-msgstr ""
-"L'adresse MAC DHCP Anycast utilisée lors de la demande d'une adresse IP via "
-"DHCP, l'adresse anycast spécifique utilisée détermine la classe de serveur "
-"DHCP qui répond à la demande."
+msgstr "L'adresse MAC DHCP Anycast utilisée lors de la demande d'une adresse IP via DHCP, l'adresse anycast spécifique utilisée détermine la classe de serveur DHCP qui répond à la demande."
 
 #: ../clients/common/settings-docs.h.in:6
 msgid "SSID of the mesh network to join."
@@ -6078,20 +5861,13 @@ msgstr "SSID du réseau mesh à rejoindre."
 
 #: ../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 the specific band, i.e. if \"a\" is specified, the device will not "
-"associate with the same network in the 2.4GHz band even if the network's "
-"settings are compatible.  This setting depends on specific driver capability "
-"and may not work with all drivers."
-msgstr ""
-"802. bande de fréquence du réseau. Soit \"a\" pour 5GHz 802.11a ou \"bg\" "
-"pour 2.4GHz 802.11.  Cela verrouillera les associations au réseau Wi-Fi sur "
-"la bande spécifique, c'est-à-dire que si \"a\" est spécifié, le dispositif "
-"ne sera pas associé au même réseau sur la bande 2.4GHz même si les "
-"paramètres de réseau sont compatibles.  Cette configuration dépendra des "
-"capacités spécifiques du pilote et ne fonctionnera pas nécessairement avec "
-"tous les pilotes."
+"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 "
+"the specific band, i.e. if \"a\" is specified, the device will not associate "
+"with the same network in the 2.4GHz band even if the network's settings are "
+"compatible.  This setting depends on specific driver capability and may not "
+"work with all drivers."
+msgstr "802. bande de fréquence du réseau. Soit \"a\" pour 5GHz 802.11a ou \"bg\" pour 2.4GHz 802.11.  Cela verrouillera les associations au réseau Wi-Fi sur la bande spécifique, c'est-à-dire que si \"a\" est spécifié, le dispositif ne sera pas associé au même réseau sur la bande 2.4GHz même si les paramètres de réseau sont compatibles.  Cette configuration dépendra des capacités spécifiques du pilote et ne fonctionnera pas nécessairement avec tous les pilotes."
 
 #: ../clients/common/settings-docs.h.in:8
 msgid ""
@@ -6099,12 +5875,7 @@ msgid ""
 "point.  This capability is highly driver dependent and not supported by all "
 "devices.  Note: this property does not control the BSSID used when creating "
 "an Ad-Hoc network and is unlikely to in the future."
-msgstr ""
-"Si indiquée, dirige le périphérique vers le seul point d’accès donné. Cette "
-"fonctionnailité dépend largement du pilote et n’est pas prise en charge par "
-"tous les périphériques. Remarque: cette propriété ne contrôle pas le BSSID "
-"utilisé lors de la création d'un réseau Ad-Hoc et il est peu probable "
-"qu'elle le fasse à l'avenir."
+msgstr "Si indiquée, dirige le périphérique vers le seul point d’accès donné. Cette fonctionnailité dépend largement du pilote et n’est pas prise en charge par tous les périphériques. Remarque: cette propriété ne contrôle pas le BSSID utilisé lors de la création d'un réseau Ad-Hoc et il est peu probable qu'elle le fasse à l'avenir."
 
 #: ../clients/common/settings-docs.h.in:9
 msgid ""
@@ -6112,11 +5883,7 @@ msgid ""
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
 "Because channel numbers overlap between bands, this property also requires "
 "the \"band\" property to be set."
-msgstr ""
-"Canal sans fil à utiliser pour la connexion Wi-Fi  L'appareil ne joint (ou "
-"ne crée pour les réseaux Ad-Hoc) qu'un seul réseau Wi-Fi sur le canal "
-"spécifié  Comme les numéros de canal se chevauchent entre les bandes, cette "
-"propriété nécessite également de définir la propriété \"band\"."
+msgstr "Canal sans fil à utiliser pour la connexion Wi-Fi  L'appareil ne joint (ou ne crée pour les réseaux Ad-Hoc) qu'un seul réseau Wi-Fi sur le canal spécifié  Comme les numéros de canal se chevauchent entre les bandes, cette propriété nécessite également de définir la propriété \"band\"."
 
 #: ../clients/common/settings-docs.h.in:10
 msgid ""
@@ -6132,23 +5899,10 @@ msgid ""
 "defaults to \"preserve\" (older versions of NetworkManager may use a "
 "different default value). On D-Bus, this field is expressed as \"assigned-"
 "mac-address\" or the deprecated \"cloned-mac-address\"."
-msgstr ""
-"Si spécifié, demande au périphérique d'utiliser cette adresse MAC à la place."
-" C'est ce qu'on appelle le clonage ou l'usurpation d'identité MAC. Outre la "
-"spécification explicite d'une adresse MAC, les valeurs spéciales "
-"\"preserve\", \"permanent\", \"random\" et \"stable\" sont supportées. "
-"\"préserver\" signifie ne pas toucher l'adresse MAC lors de l'activation. "
-"\"permanent\" signifie l'utilisation de l'adresse matérielle permanente du "
-"dispositif. \"random\" crée une adresse MAC aléatoire sur chaque connexion. "
-"\"stable\" crée une adresse MAC hachée basée sur connection.stable-id et une "
-"clé dépendante de la machine. Si elle n'est pas spécifiée, la valeur peut "
-"être écrasée via les valeurs par défaut globales, voir le manuel de "
-"NetworkManager.conf. Si elle n'est pas encore spécifiée, elle correspondra à "
-"\"permanent\" par défaut. Sur le bus D, ce champ est « assigned-mac-"
-"address » ou « cloned-mac-address » (déprécié)."
+msgstr "Si spécifié, demande au périphérique d'utiliser cette adresse MAC à la place. C'est ce qu'on appelle le clonage ou l'usurpation d'identité MAC. Outre la spécification explicite d'une adresse MAC, les valeurs spéciales \"preserve\", \"permanent\", \"random\" et \"stable\" sont supportées. \"préserver\" signifie ne pas toucher l'adresse MAC lors de l'activation. \"permanent\" signifie l'utilisation de l'adresse matérielle permanente du dispositif. \"random\" crée une adresse MAC aléatoire sur chaque connexion. \"stable\" crée une adresse MAC hachée basée sur connection.stable-id et une clé dépendante de la machine. Si elle n'est pas spécifiée, la valeur peut être écrasée via les valeurs par défaut globales, voir le manuel de NetworkManager.conf. Si elle n'est pas encore spécifiée, elle correspondra à \"permanent\" par défaut. Sur le bus D, ce champ est « assigned-mac-address » ou « cloned-mac-address » (déprécié)."
 
 #: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -6166,38 +5920,14 @@ msgid ""
 "address after the mask, this address is used instead of the current MAC "
 "address to fill the bits that shall not be randomized. For example, a value "
 "of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC "
-"address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:"
-"00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-"
-"administered, burned-in MAC address. If the value contains more than one "
-"additional MAC addresses, one of them is chosen randomly. For example, \"02:"
-"00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully "
-"scrambled MAC address, randomly locally or globally administered."
-msgstr ""
-"Avec le réglage « cloned-mac-address » « random » ou « stable », tous les "
-"bits de l'adresse MAC sont brouillés par défaut et une adresse MAC unicast "
-"administrée localement est créée. Cette propriété permet de spécifier que "
-"certains bits soient fixes. Notez que le bit le moins significatif de la "
-"première adresse MAC sera toujours désactivé pour créer une adresse MAC "
-"unicast. Si la propriété est NULL, elle peut être remplacée par un paramètre "
-"de connexion par défaut. Si la valeur est toujours NULL ou une chaîne vide, "
-"la valeur par défaut sera de créer une adresse MAC unicast administrée "
-"localement. Si la valeur contient une adresse MAC, cette adresse sera "
-"utilisée comme masque. Les bits réglés du masque doivent être remplis avec "
-"l'adresse MAC actuelle du périphérique, tandis que les bits non réglés sont "
-"sujets à une randomisation. Régler \"FE:FF:FF:00:00:00:00\" signifie "
-"préserver l'OUI de l'adresse MAC courante et randomiser uniquement les 3 "
-"octets inférieurs en utilisant l'algorithme \"random\" ou \"stable\". Si la "
-"valeur contient une adresse MAC supplémentaire après le masque, cette "
-"adresse sera utilisée à la place de l'adresse MAC actuelle pour remplir les "
-"bits qui ne doivent pas être randomisés. Par exemple, une valeur de \"FE:FF:"
-"FF:00:00:00:00 68:F7:28:00:00:00:00\" réglera l'OUI de l'adresse MAC à 68:F7:"
-"28, tandis que les bits inférieurs seront randomisés. Une valeur de \"02:00:"
-"00:00:00:00:00:00:00:00:00:00:00:00:00\" créera une adresse MAC entièrement "
-"brouillée, administrée globalement et gravée. Si la valeur contient plus "
-"d'une adresse MAC supplémentaire, l'une d’entre elles sera choisie au hasard."
-" Par exemple, \"02:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 02:00:00:00:"
-"00\" créera une adresse MAC entièrement brouillée, administrée au hasard "
-"localement ou globalement."
+"address to 68:F7:28, while the lower bits are randomized. A value of "
+"\"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled "
+"globally-administered, burned-in MAC address. If the value contains more "
+"than one additional MAC addresses, one of them is chosen randomly. For "
+"example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will "
+"create a fully scrambled MAC address, randomly locally or globally "
+"administered."
+msgstr "Avec le réglage « cloned-mac-address » « random » ou « stable », tous les bits de l'adresse MAC sont brouillés par défaut et une adresse MAC unicast administrée localement est créée. Cette propriété permet de spécifier que certains bits soient fixes. Notez que le bit le moins significatif de la première adresse MAC sera toujours désactivé pour créer une adresse MAC unicast. Si la propriété est NULL, elle peut être remplacée par un paramètre de connexion par défaut. Si la valeur est toujours NULL ou une chaîne vide, la valeur par défaut sera de créer une adresse MAC unicast administrée localement. Si la valeur contient une adresse MAC, cette adresse sera utilisée comme masque. Les bits réglés du masque doivent être remplis avec l'adresse MAC actuelle du périphérique, tandis que les bits non réglés sont sujets à une randomisation. Régler \"FE:FF:FF:00:00:00:00\" signifie préserver l'OUI de l'adresse MAC courante et randomiser uniquement les 3 octets inférieurs en utilisant l'algorithme \"random\" ou \"stable\". Si la valeur contient une adresse MAC supplémentaire après le masque, cette adresse sera utilisée à la place de l'adresse MAC actuelle pour remplir les bits qui ne doivent pas être randomisés. Par exemple, une valeur de \"FE:FF:FF:00:00:00:00 68:F7:28:00:00:00:00\" réglera l'OUI de l'adresse MAC à 68:F7:28, tandis que les bits inférieurs seront randomisés. Une valeur de \"02:00:00:00:00:00:00:00:00:00:00:00:00:00:00\" créera une adresse MAC entièrement brouillée, administrée globalement et gravée. Si la valeur contient plus d'une adresse MAC supplémentaire, l'une d’entre elles sera choisie au hasard. Par exemple, \"02:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 02:00:00:00:00\" créera une adresse MAC entièrement brouillée, administrée au hasard localement ou globalement."
 
 #: ../clients/common/settings-docs.h.in:12
 msgid ""
@@ -6210,39 +5940,21 @@ msgid ""
 "not broadcast its SSID. Note that marking the network as hidden may be a "
 "privacy issue for you (in infrastructure mode) or client stations (in AP "
 "mode), as the explicit probe-scans are distinctly recognizable on the air."
-msgstr ""
-"Si sur TRUE, indique que le réseau n'est pas un réseau de broadcasting qui "
-"cache son SSID, ce qui fonctionne à la fois en mode infrastructure et en "
-"mode AP. En mode infrastructure, diverses solutions de contournement sont "
-"utilisées pour une découverte plus fiable des réseaux cachés, comme le "
-"balayage par sonde du SSID.  Cependant, ces solutions exposent les "
-"incertitudes inhérentes aux réseaux SSID cachés, et donc aux réseaux SSID "
-"cachés doivent être utilisées avec prudence. En mode AP, le réseau créé ne "
-"diffuse pas son SSID. Notez que le fait de marquer le réseau comme caché "
-"peut être un problème de confidentialité pour vous (en mode infrastructure) "
-"ou pour les postes clients (en mode AP), car les scanners explicites sont "
-"clairement reconnaissables."
+msgstr "Si sur TRUE, indique que le réseau n'est pas un réseau de broadcasting qui cache son SSID, ce qui fonctionne à la fois en mode infrastructure et en mode AP. En mode infrastructure, diverses solutions de contournement sont utilisées pour une découverte plus fiable des réseaux cachés, comme le balayage par sonde du SSID.  Cependant, ces solutions exposent les incertitudes inhérentes aux réseaux SSID cachés, et donc aux réseaux SSID cachés doivent être utilisées avec prudence. En mode AP, le réseau créé ne diffuse pas son SSID. Notez que le fait de marquer le réseau comme caché peut être un problème de confidentialité pour vous (en mode infrastructure) ou pour les postes clients (en mode AP), car les scanners explicites sont clairement reconnaissables."
 
 #: ../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 "
 "of the device (i.e. MAC spoofing)."
-msgstr ""
-"Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique Wi-"
-"Fi dont l'adresse MAC permanente correspond à l'adresse MAC de l'appareil, "
-"sans que cette propriété ne modifie l'adresse MAC de l'appareil (c'est-à-"
-"dire MAC Spoofing)."
+msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique Wi-Fi dont l'adresse MAC permanente correspond à l'adresse MAC de l'appareil, sans que cette propriété ne modifie l'adresse MAC de l'appareil (c'est-à-dire MAC Spoofing)."
 
 #: ../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-"
 "digits-and-colons notation (eg \"00:11:22:33:44:55\")."
-msgstr ""
-"Une liste des adresses MAC permanentes des périphériques Wi-Fi auxquels "
-"cette connexion ne doit jamais s'appliquer. Chaque adresse MAC doit être "
-"donnée en notation standard hexadécimale (ex : \"00:11:22:33:44:55\")."
+msgstr "Une liste des adresses MAC permanentes des périphériques Wi-Fi auxquels cette connexion ne doit jamais s'appliquer. Chaque adresse MAC doit être donnée en notation standard hexadécimale (ex : \"00:11:22:33:44:55\")."
 
 #: ../clients/common/settings-docs.h.in:15
 msgid ""
@@ -6252,31 +5964,20 @@ msgid ""
 "MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize "
 "the MAC address). This property is deprecated for 'cloned-mac-address'. "
 "Deprecated: 1"
-msgstr ""
-"L'une de NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (ne jamais randomiser à "
-"moins que l'utilisateur n'ait défini une valeur par défaut globale à "
-"randomiser et que le suppliant supporte la randomisation),  "
-"NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (ne jamais randomiser l'adresse MAC) "
-"ou NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (toujours randomiser l'adresse "
-"MAC) Cette propriété est dépréciée pour \" Cloned-madadac. Dépréciée : 1"
+msgstr "L'une de NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (ne jamais randomiser à moins que l'utilisateur n'ait défini une valeur par défaut globale à randomiser et que le suppliant supporte la randomisation),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (ne jamais randomiser l'adresse MAC) ou NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (toujours randomiser l'adresse MAC) Cette propriété est dépréciée pour \" Cloned-madadac. Dépréciée : 1"
 
 #: ../clients/common/settings-docs.h.in:16
 msgid ""
-"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\"."
-"  If blank, infrastructure is assumed."
-msgstr ""
-"Mode réseau Wi-Fi ; l'un des modes \"infrastructure\", \"adhoc\" ou \"ap\" ; "
-" Si vide, l'infrastructure est présumée."
+"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap"
+"\".  If blank, infrastructure is assumed."
+msgstr "Mode réseau Wi-Fi ; l'un des modes \"infrastructure\", \"adhoc\" ou \"ap\" ;  Si vide, l'infrastructure est présumée."
 
 #: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
-msgstr ""
-"Si différent de zéro, ne transmettez que des paquets de la taille spécifiée "
-"ou plus petits, divisant les paquets plus grands en plusieurs trames "
-"Ethernet."
+msgstr "Si différent de zéro, ne transmettez que des paquets de la taille spécifiée ou plus petits, divisant les paquets plus grands en plusieurs trames Ethernet."
 
 #: ../clients/common/settings-docs.h.in:18
 msgid ""
@@ -6285,13 +5986,7 @@ msgid ""
 "saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently "
 "configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
 "globally configured value). All other values are reserved."
-msgstr ""
-"L'une des options NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (désactiver "
-"l'économie d'énergie Wi-Fi), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) "
-"(activer l'économie d'énergie Wi-Fi), NM_SETTING_WIRELESS_POWERSAVE_IGNORE "
-"(1) (ne toucher au réglage actuel), NM_SETTING_WIRELESS_POWERSAVE_DEFAULT "
-"(0) (Utiliser la valeur globale configurée). Toutes les autres valeurs sont "
-"réservées."
+msgstr "L'une des options NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (désactiver l'économie d'énergie Wi-Fi), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (activer l'économie d'énergie Wi-Fi), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (ne toucher au réglage actuel), NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (Utiliser la valeur globale configurée). Toutes les autres valeurs sont réservées."
 
 #: ../clients/common/settings-docs.h.in:19
 msgid ""
@@ -6299,27 +5994,16 @@ msgid ""
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
 "s.  This property is highly driver dependent and not all devices support "
 "setting a static bitrate."
-msgstr ""
-"Si non-zéro, redirige le périphérique pour qu’il n’utilise la vitesse de "
-"transmission indiquée que pour la communication avec le point d’accès "
-"uniquement. Les unités sont en Kb/s, c'est-à-dire 5500 = 5,5 Mbit/s.  Cette "
-"propriété dépend fortement du pilote et tous les périphériques ne supportent "
-"pas un débit statique."
+msgstr "Si non-zéro, redirige le périphérique pour qu’il n’utilise la vitesse de transmission indiquée que pour la communication avec le point d’accès uniquement. Les unités sont en Kb/s, c'est-à-dire 5500 = 5,5 Mbit/s.  Cette propriété dépend fortement du pilote et tous les périphériques ne supportent pas un débit statique."
 
 #: ../clients/common/settings-docs.h.in:20
 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 network.  "
-"NetworkManager internally tracks previously seen BSSIDs. The property is "
-"only meant for reading and reflects the BSSID list of NetworkManager. The "
-"changes you make to this property will not be preserved."
-msgstr ""
-"Une liste des BSSIDs (chaque BSSIDs étant formaté comme une adresse MAC \"00:"
-"11:11:22:33:44:55\") qui ont été détectés comme faisant partie du réseau Wi-"
-"Fi.  NetworkManager suit en interne les BSSIDs vus précédemment. La "
-"propriété est uniquement destinée à être lue et reflète la liste BSSID de "
-"NetworkManager. Les changements que vous faites à cette propriété ne seront "
-"pas conservés."
+"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 "
+"network.  NetworkManager internally tracks previously seen BSSIDs. The "
+"property is only meant for reading and reflects the BSSID list of "
+"NetworkManager. The changes you make to this property will not be preserved."
+msgstr "Une liste des BSSIDs (chaque BSSIDs étant formaté comme une adresse MAC \"00:11:11:22:33:44:55\") qui ont été détectés comme faisant partie du réseau Wi-Fi.  NetworkManager suit en interne les BSSIDs vus précédemment. La propriété est uniquement destinée à être lue et reflète la liste BSSID de NetworkManager. Les changements que vous faites à cette propriété ne seront pas conservés."
 
 #: ../clients/common/settings-docs.h.in:21
 msgid "SSID of the Wi-Fi network. Must be specified."
@@ -6330,9 +6014,7 @@ 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 "
 "support setting a static transmit power."
-msgstr ""
-"Cette propriété dépend fortement du pilote et tous les appareils ne prennent "
-"pas en charge le paramétrage d'une puissance d'émission statique."
+msgstr "Cette propriété dépend fortement du pilote et tous les appareils ne prennent pas en charge le paramétrage d'une puissance d'émission statique."
 
 #: ../clients/common/settings-docs.h.in:23
 msgid ""
@@ -6348,34 +6030,16 @@ msgid ""
 "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 ""
-"Les options NMSettingWirelessWakeOnWLan à activer ne sont pas toutes "
-"compatibles avec toutes les options : 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 "Les options NMSettingWirelessWakeOnWLan à activer ne sont pas toutes compatibles avec toutes les options : 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)."
 
 #: ../clients/common/settings-docs.h.in:24
 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\" for "
-"Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When "
-"using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the "
-"\"leap-username\" and \"leap-password\" properties must be specified."
-msgstr ""
-"Lorsque WEP est utilisé (c'est-à-dire key-mgmt = \"none\" ou \"ieee8021x\"), "
-"indiquez ici l'algorithme d'authentification 802.11 requis par l’AP.  Une "
-"des propriétés \"open\" pour Open System, \"shared\" pour Shared Key, ou "
-"\"leap\" pour Cisco LEAP.  Lorsque vous utilisez Cisco LEAP (c'est-à-dire "
-"key-mgmt = \"ieee8021x\" et auth-alg = \"leap\") le \"leap-username\" et "
-"\"password\" doivent être spécifiés."
+"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
+"802.11 authentication algorithm required by the AP here.  One of \"open\" "
+"for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  "
+"When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
+"the \"leap-username\" and \"leap-password\" properties must be specified."
+msgstr "Lorsque WEP est utilisé (c'est-à-dire key-mgmt = \"none\" ou \"ieee8021x\"), indiquez ici l'algorithme d'authentification 802.11 requis par l’AP.  Une des propriétés \"open\" pour Open System, \"shared\" pour Shared Key, ou \"leap\" pour Cisco LEAP.  Lorsque vous utilisez Cisco LEAP (c'est-à-dire key-mgmt = \"ieee8021x\" et auth-alg = \"leap\") le \"leap-username\" et \"password\" doivent être spécifiés."
 
 #: ../clients/common/settings-docs.h.in:25
 msgid ""
@@ -6387,17 +6051,7 @@ msgid ""
 "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 ""
-"Indique si l'établissement initial rapide de la liaison (802.11ai) (Fast "
-"Initial Link Setup) doit être activé pour la connexion.  L'un des paramètres "
-"NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (utiliser la valeur par défaut "
-"globale), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (désactiver FILS), "
-"NM_SETTING_WIRELESS_SECURITY_FILSOPTIONAL (2) (activer FILS si le suppliant "
-"et le point d'accès le supportent) ou "
-"NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (activer FILS et échoue si "
-"non supporté).  Lorsque NM_SETTING_WIRELESS_SECURITY_FILS_FILS_DEFAULT (0) "
-"est sélectionné et qu'aucune valeur par défaut globale n'est définie, FILS "
-"sera activé en option."
+msgstr "Indique si l'établissement initial rapide de la liaison (802.11ai) (Fast Initial Link Setup) doit être activé pour la connexion.  L'un des paramètres NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (utiliser la valeur par défaut globale), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (désactiver FILS), NM_SETTING_WIRELESS_SECURITY_FILSOPTIONAL (2) (activer FILS si le suppliant et le point d'accès le supportent) ou NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (activer FILS et échoue si non supporté).  Lorsque NM_SETTING_WIRELESS_SECURITY_FILS_FILS_DEFAULT (0) est sélectionné et qu'aucune valeur par défaut globale n'est définie, FILS sera activé en option."
 
 #: ../clients/common/settings-docs.h.in:26
 msgid ""
@@ -6405,33 +6059,21 @@ msgid ""
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
 "For maximum compatibility leave this property empty.  Each list element may "
 "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
-msgstr ""
-"Une liste d'algorithmes de cryptage de groupe/diffusion qui empêche les "
-"connexions aux réseaux Wi-Fi n'utilisant pas l'un des algorithmes de la "
-"liste.  Pour une compatibilité maximale, laissez cette propriété vide.  "
-"Chaque élément de la liste peut être \"wep40\", \"wep104\", \"tkip\", ou "
-"\"ccmp\"."
+msgstr "Une liste d'algorithmes de cryptage de groupe/diffusion qui empêche les connexions aux réseaux Wi-Fi n'utilisant pas l'un des algorithmes de la liste.  Pour une compatibilité maximale, laissez cette propriété vide.  Chaque élément de la liste peut être \"wep40\", \"wep104\", \"tkip\", ou \"ccmp\"."
 
 #: ../clients/common/settings-docs.h.in:27
 msgid ""
-"Key management used for the connection.  One of \"none\" (WEP), "
-"\"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" "
-"(infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). "
-"This property must be set for any Wi-Fi connection that uses security."
-msgstr ""
-"Gestion des clés utilisée pour la connexion.  L'une des options \"none\" "
-"(WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-"
-"psk\" (infrastructure WPA-PSK) ou \"wpa-eap\" (WPA-Enterprise).  Cette "
-"propriété doit être définie pour toute connexion Wi-Fi qui utilise une "
-"sécurité."
+"Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or "
+"\"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi "
+"connection that uses security."
+msgstr "Gestion des clés utilisées pour la connexion.  L'une des options suivantes : \" none \" (WEP), \" ieee8021x \" (WEP dynamique), \" wpa-psk \" (infrastructure WPA-PSK), \" sae \" (SAE) ou \" wpa-eap \" (WPA-Enterprise).  Cette propriété doit être définie pour toute connexion Wi-Fi qui utilise la sécurité."
 
 #: ../clients/common/settings-docs.h.in:28
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
-msgstr ""
-"Le mot de passe de connexion pour les connexions LEAP héritées (ie, key-mgmt "
-"= \"ieee8021x\" et auth-alg = \"leap\")."
+msgstr "Le mot de passe de connexion pour les connexions LEAP héritées (ie, key-mgmt = \"ieee8021x\" et auth-alg = \"leap\")."
 
 #: ../clients/common/settings-docs.h.in:29
 msgid "Flags indicating how to handle the \"leap-password\" property."
@@ -6441,9 +6083,7 @@ msgstr "Marqueurs indiquant comment gérer la propriété \"Leap-password\"."
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
-msgstr ""
-"Le nom d'utilisateur de connexion pour les anciennes connexions LEAP (ie, "
-"key-mgmt = \"ieee8021x\" et auth-alg = \"leap\")."
+msgstr "Le nom d'utilisateur de connexion pour les anciennes connexions LEAP (ie, key-mgmt = \"ieee8021x\" et auth-alg = \"leap\")."
 
 #: ../clients/common/settings-docs.h.in:31
 msgid ""
@@ -6451,11 +6091,7 @@ msgid ""
 "networks that do not utilize one of the algorithms in the list. For maximum "
 "compatibility leave this property empty.  Each list element may be one of "
 "\"tkip\" or \"ccmp\"."
-msgstr ""
-"Une liste d'algorithmes de chiffrement par paires qui empêche les connexions "
-"aux réseaux Wi-Fi n'utilisant pas l'un des algorithmes de la liste, pour une "
-"compatibilité maximale, laissez cette propriété vide.  Chaque élément de la "
-"liste peut être un des \"tkip\" ou \"ccmp\"."
+msgstr "Une liste d'algorithmes de chiffrement par paires qui empêche les connexions aux réseaux Wi-Fi n'utilisant pas l'un des algorithmes de la liste, pour une compatibilité maximale, laissez cette propriété vide.  Chaque élément de la liste peut être un des \"tkip\" ou \"ccmp\"."
 
 #: ../clients/common/settings-docs.h.in:32
 msgid ""
@@ -6467,28 +6103,14 @@ msgid ""
 "NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not "
 "supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
 "global default is set, PMF will be optionally enabled."
-msgstr ""
-"Indique si les structures de gestion protégées (802.11w) (Protected "
-"Management Frames) doivent être activées pour la connexion :  L'un des "
-"paramètres NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (utiliser la valeur "
-"par défaut globale), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) "
-"(désactiver PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (activer PMF "
-"si le suppliant et le point d'accès le supportent) ou "
-"NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (activer PMF et échoue si non "
-"supporté).  Lorsque NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) est "
-"sélectionné et qu'aucune valeur par défaut globale n'est définie, PMF sera "
-"activé."
+msgstr "Indique si les structures de gestion protégées (802.11w) (Protected Management Frames) doivent être activées pour la connexion :  L'un des paramètres NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (utiliser la valeur par défaut globale), NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (désactiver PMF), NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (activer PMF si le suppliant et le point d'accès le supportent) ou NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (activer PMF et échoue si non supporté).  Lorsque NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) est sélectionné et qu'aucune valeur par défaut globale n'est définie, PMF sera activé."
 
 #: ../clients/common/settings-docs.h.in:33
 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 "
 "specified, both WPA and RSN connections are allowed."
-msgstr ""
-"Liste des chaînes de caractères spécifiant les versions de protocole WPA "
-"autorisées : chaque élément peut être un \"wpa\" (autoriser WPA) ou un "
-"\"rsn\" (autoriser WPA2/RSN). Si non spécifié, les connexions WPA et RSN "
-"seront autorisées."
+msgstr "Liste des chaînes de caractères spécifiant les versions de protocole WPA autorisées : chaque élément peut être un \"wpa\" (autoriser WPA) ou un \"rsn\" (autoriser WPA2/RSN). Si non spécifié, les connexions WPA et RSN seront autorisées."
 
 #: ../clients/common/settings-docs.h.in:34
 msgid ""
@@ -6497,13 +6119,7 @@ msgid ""
 "standard) hashed to derive the actual key, or the key in form of 64 "
 "hexadecimal character. The WPA3-Personal networks use a passphrase of any "
 "length for SAE authentication."
-msgstr ""
-"Clé pré-partagée pour les réseaux WPA.  Pour WPA-PSK, il s'agit soit d'une "
-"phrase de chiffrement ASCII de 8 à 63 caractères qui est (comme spécifié "
-"dans la norme 802.11i) hachée pour dériver la clé réelle, soit la clé sous "
-"forme de 64 caractères hexadécimaux. Les réseaux WPA3-Personal utilisent une "
-"phrase de chiffrement de n'importe quelle longueur pour l'authentification "
-"SAE."
+msgstr "Clé pré-partagée pour les réseaux WPA.  Pour WPA-PSK, il s'agit soit d'une phrase de chiffrement ASCII de 8 à 63 caractères qui est (comme spécifié dans la norme 802.11i) hachée pour dériver la clé réelle, soit la clé sous forme de 64 caractères hexadécimaux. Les réseaux WPA3-Personal utilisent une phrase de chiffrement de n'importe quelle longueur pour l'authentification SAE."
 
 #: ../clients/common/settings-docs.h.in:35
 msgid "Flags indicating how to handle the \"psk\" property."
@@ -6513,9 +6129,7 @@ msgstr "Marqueurs indiquant comment gérer la propriété \"psk\"."
 msgid ""
 "Flags indicating how to handle the \"wep-key0\", \"wep-key1\", \"wep-key2\", "
 "and \"wep-key3\" properties."
-msgstr ""
-"Marqueurs indiquant comment gérer les propriétés \"wep-key0\", \"wep-key1\", "
-"\"wep-key2\", et \"wep-key3\"."
+msgstr "Marqueurs indiquant comment gérer les propriétés \"wep-key0\", \"wep-key1\", \"wep-key2\", et \"wep-key3\"."
 
 #: ../clients/common/settings-docs.h.in:37
 msgid ""
@@ -6525,49 +6139,31 @@ msgid ""
 "NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as "
 "a string and will be hashed using the de-facto MD5 method to derive the "
 "actual WEP key."
-msgstr ""
-"Contrôle l'interprétation des clés WEP :  les valeurs autorisées sont "
-"NM_WEP_KEY_TYPE_KEY_TYPE_KEY (1), auquel cas la clé est soit une chaîne "
-"hexadécimale de 10 ou 26 caractères, soit un mot de passe ASCII de 5 ou 13 "
-"caractères ; ou NM_WEP_KEY_TYPE_PASSPHRASE (2), auquel cas la phrase de "
-"passe est fournie en chaîne et sera tracée selon la méthode MD5 pour obtenir "
-"la clé WEP actuelle."
+msgstr "Contrôle l'interprétation des clés WEP :  les valeurs autorisées sont NM_WEP_KEY_TYPE_KEY_TYPE_KEY (1), auquel cas la clé est soit une chaîne hexadécimale de 10 ou 26 caractères, soit un mot de passe ASCII de 5 ou 13 caractères ; ou NM_WEP_KEY_TYPE_PASSPHRASE (2), auquel cas la phrase de passe est fournie en chaîne et sera tracée selon la méthode MD5 pour obtenir la clé WEP actuelle."
 
 #: ../clients/common/settings-docs.h.in:38
 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."
-msgstr ""
-"Index 0 Clé WEP : c'est la clé WEP utilisée dans la plupart des réseaux, "
-"voir la propriété \"wep-key-type\" pour une description de la façon dont "
-"cette clé est interprétée."
+msgstr "Index 0 Clé WEP : c'est la clé WEP utilisée dans la plupart des réseaux, voir la propriété \"wep-key-type\" pour une description de la façon dont cette clé est interprétée."
 
 #: ../clients/common/settings-docs.h.in:39
 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."
-msgstr ""
-"Index 1 Clé WEP: cet index WEP n'est pas utilisé par la plupart des réseaux  "
-"Voir la propriété \"wep-key-type\" pour une description de la façon dont "
-"cette clé est interprétée."
+msgstr "Index 1 Clé WEP: cet index WEP n'est pas utilisé par la plupart des réseaux  Voir la propriété \"wep-key-type\" pour une description de la façon dont cette clé est interprétée."
 
 #: ../clients/common/settings-docs.h.in:40
 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."
-msgstr ""
-"Index 2 Clé WEP: cet index WEP n'est pas utilisé par la plupart des réseaux  "
-"Voir la propriété \"wep-key-type\" pour une description de la façon dont "
-"cette clé est interprétée."
+msgstr "Index 2 Clé WEP: cet index WEP n'est pas utilisé par la plupart des réseaux  Voir la propriété \"wep-key-type\" pour une description de la façon dont cette clé est interprétée."
 
 #: ../clients/common/settings-docs.h.in:41
 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."
-msgstr ""
-"Index 3 Clé WEP: cet index WEP n'est pas utilisé par la plupart des réseaux  "
-"Voir la propriété \"wep-key-type\" pour une description de la façon dont "
-"cette clé est interprétée."
+msgstr "Index 3 Clé WEP: cet index WEP n'est pas utilisé par la plupart des réseaux  Voir la propriété \"wep-key-type\" pour une description de la façon dont cette clé est interprétée."
 
 #: ../clients/common/settings-docs.h.in:42
 msgid ""
@@ -6575,12 +6171,7 @@ msgid ""
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
 "(default key) through 3.  Note that some consumer access points (like the "
 "Linksys WRT54G) number the keys 1 - 4."
-msgstr ""
-"Lorsque WEP statique est utilisé (c'est-à-dire key-mgmt = \"none\") et qu'un "
-"index de clé WEP non par défaut est utilisé par le PA, mettez cet index de "
-"clé WEP ici.  Les valeurs valides sont 0 (clé par défaut) à 3.  Notez que "
-"certains points d'accès consommateurs (comme le Linksys WRT54G) numérotent "
-"les clés 1 - 4."
+msgstr "Lorsque WEP statique est utilisé (c'est-à-dire key-mgmt = \"none\") et qu'un index de clé WEP non par défaut est utilisé par le PA, mettez cet index de clé WEP ici.  Les valeurs valides sont 0 (clé par défaut) à 3.  Notez que certains points d'accès consommateurs (comme le Linksys WRT54G) numérotent les clés 1 - 4."
 
 #: ../clients/common/settings-docs.h.in:43
 msgid ""
@@ -6589,46 +6180,32 @@ msgid ""
 "determine whether it's feasible to start WPS enrollment from the Access "
 "Point capabilities. WPS can be disabled by setting this property to a value "
 "of 1."
-msgstr ""
-"Marqueurs indiquant quel mode de WPS doit être utilisé, le cas échéant. Il y "
-"a peu d’intérêt  à modifier les paramètres par défaut car NetworkManager "
-"déterminera automatiquement s'il est possible de démarrer l'inscription WPS "
-"à partir des capacités du point d'accès. WPS peut être désactivé en réglant "
-"cette propriété à la valeur 1."
+msgstr "Marqueurs indiquant quel mode de WPS doit être utilisé, le cas échéant. Il y a peu d’intérêt  à modifier les paramètres par défaut car NetworkManager déterminera automatiquement s'il est possible de démarrer l'inscription WPS à partir des capacités du point d'accès. WPS peut être désactivé en réglant cette propriété à la valeur 1."
 
 #: ../clients/common/settings-docs.h.in:44
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
 "verification of the server certificate's altSubjectName is performed."
-msgstr ""
-"Liste des chaînes à comparer avec le nom altSubjectName du certificat "
-"présenté par le serveur d'authentification Si la liste est vide, aucune "
-"vérification du nom altSubjectName du certificat du serveur n'est effectuée."
+msgstr "Liste des chaînes à comparer avec le nom altSubjectName du certificat présenté par le serveur d'authentification Si la liste est vide, aucune vérification du nom altSubjectName du certificat du serveur n'est effectuée."
 
 #: ../clients/common/settings-docs.h.in:45
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
 "like EAP-TTLS."
-msgstr ""
-"Chaîne d'identité anonyme pour les méthodes d'authentification EAP  Utilisée "
-"comme identité non chiffrée avec les types EAP qui supportent différentes "
-"identités par tunel comme EAP-TTLS."
+msgstr "Chaîne d'identité anonyme pour les méthodes d'authentification EAP  Utilisée comme identité non chiffrée avec les types EAP qui supportent différentes identités par tunel comme EAP-TTLS."
 
 #: ../clients/common/settings-docs.h.in:46
 msgid ""
 "A timeout for the authentication. Zero means the global default; if the "
 "global default is not set, the authentication timeout is 25 seconds."
-msgstr ""
-"Un délai d'attente pour l'authentification : zéro signifie la valeur par "
-"défaut globale ; si la valeur par défaut globale n'est pas définie, le délai "
-"d'attente pour l'authentification est de 25 secondes."
+msgstr "Un délai d'attente pour l'authentification : zéro signifie la valeur par défaut globale ; si la valeur par défaut globale n'est pas définie, le délai d'attente pour l'authentification est de 25 secondes."
 
 #: ../clients/common/settings-docs.h.in:47
 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 "
+"Contains the CA certificate if used by the EAP method specified in the \"eap"
+"\" property. Certificate data is specified using a \"scheme\"; two are "
 "currently supported: blob and path. When using the blob scheme (which is "
 "backwards compatible with NM 0.7.x) this property should be set to the "
 "certificate's DER encoded data. When using the path scheme, this property "
@@ -6636,27 +6213,14 @@ msgid ""
 "with the string \"file://\" and ending with a terminating NUL byte. This "
 "property can be unset even if the EAP method supports CA certificates, but "
 "this allows man-in-the-middle attacks and is NOT recommended."
-msgstr ""
-"Contient le certificat CA si utilisé par la méthode EAP spécifiée dans la "
-"propriété \"eap\". Les données du certificat sont spécifiées à l'aide d'un "
-"\"schéma\" ; deux sont actuellement prises en charge : blob et path. Lorsque "
-"vous utilisez le schéma blob (qui est rétrocompatible avec NM 0.7.x) cette "
-"propriété doit être définie sur les données codées UTF-8 du certificat. "
-"Lorsque vous utilisez le schéma path, cette propriété doit être définie "
-"comme chemin complet UTF-8, préfixée avec la chaîne \"file://\" et terminant "
-"par un byte NUL. Cette propriété peut être annulée même si la méthode EAP "
-"prend en charge les certificats, mais cela ouvre la porte aux attaques "
-"malveillantes et n’est donc pas conseillé."
+msgstr "Contient le certificat CA si utilisé par la méthode EAP spécifiée dans la propriété \"eap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et path. Lorsque vous utilisez le schéma blob (qui est rétrocompatible avec NM 0.7.x) cette propriété doit être définie sur les données codées UTF-8 du certificat. Lorsque vous utilisez le schéma path, cette propriété doit être définie comme chemin complet UTF-8, préfixée avec la chaîne \"file://\" et terminant par un byte NUL. Cette propriété peut être annulée même si la méthode EAP prend en charge les certificats, mais cela ouvre la porte aux attaques malveillantes et n’est donc pas conseillé."
 
 #: ../clients/common/settings-docs.h.in:48
 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 "
 "that requires a login."
-msgstr ""
-"Le mot de passe utilisé pour accéder au certificat (CA) stocké dans la "
-"propriété \"ca-cert\" n'a de sens que si le certificat est stocké sur un "
-"jeton PKCS#11 qui nécessite un login."
+msgstr "Le mot de passe utilisé pour accéder au certificat (CA) stocké dans la propriété \"ca-cert\" n'a de sens que si le certificat est stocké sur un jeton PKCS#11 qui nécessite un login."
 
 #: ../clients/common/settings-docs.h.in:49
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
@@ -6667,10 +6231,7 @@ 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 "
 "certificate specified in the \"ca-cert\" property."
-msgstr ""
-"Chemin encodé en UTF-8 vers un répertoire contenant les certificats au "
-"format PEM ou DER à ajouter à la chaîne de vérification en plus du "
-"certificat spécifié dans la propriété \"ca-cert\"."
+msgstr "Chemin encodé en UTF-8 vers un répertoire contenant les certificats au format PEM ou DER à ajouter à la chaîne de vérification en plus du certificat spécifié dans la propriété \"ca-cert\"."
 
 #: ../clients/common/settings-docs.h.in:51
 msgid ""
@@ -6681,30 +6242,18 @@ msgid ""
 "certificate's DER encoded data. When using the path scheme, this property "
 "should be set to the full UTF-8 encoded path of the certificate, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte."
-msgstr ""
-"Contient le certificat du client s'il est utilisé par la méthode EAP "
-"spécifiée dans la propriété \"eap\". Les données du certificat sont "
-"spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en "
-"charge : blob et pat. Si vous utilisez le schéma blob (qui est "
-"rétrocompatible avec NM 0.7.x) cette propriété doit être définie sur les "
-"données codées DER du certificat. Si vous utilisez le schéma path, cette "
-"propriété doit être définie au chemin complet UTF-8, préfixée de \"file://\" "
-"et terminant par un byte NUL final."
+msgstr "Contient le certificat du client s'il est utilisé par la méthode EAP spécifiée dans la propriété \"eap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et pat. Si vous utilisez le schéma blob (qui est rétrocompatible avec NM 0.7.x) cette propriété doit être définie sur les données codées DER du certificat. Si vous utilisez le schéma path, cette propriété doit être définie au chemin complet UTF-8, préfixée de \"file://\" et terminant par un byte NUL final."
 
 #: ../clients/common/settings-docs.h.in:52
 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 "
 "that requires a login."
-msgstr ""
-"Le mot de passe utilisé pour accéder au certificat client stocké dans la "
-"propriété \"client-cert\". N'a de sens que si le certificat est stocké sur "
-"un jeton PKCS#11 qui nécessite un login."
+msgstr "Le mot de passe utilisé pour accéder au certificat client stocké dans la propriété \"client-cert\". N'a de sens que si le certificat est stocké sur un jeton PKCS#11 qui nécessite un login."
 
 #: ../clients/common/settings-docs.h.in:53
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
-msgstr ""
-"Marqueurs indiquant comment gérer la propriété \"client-cert-password\"."
+msgstr "Marqueurs indiquant comment gérer la propriété \"client-cert-password\"."
 
 #: ../clients/common/settings-docs.h.in:54
 msgid ""
@@ -6713,13 +6262,7 @@ msgid ""
 "authentication server.  If a matching dNSName is found, this constraint is "
 "met.  If no dNSName values are present, this constraint is matched against "
 "SubjectName CN using same suffix match comparison."
-msgstr ""
-"Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est "
-"utilisé comme correspondance de suffixe pour le ou les éléments dNSName du "
-"certificat présenté par le serveur d'authentification.  Si un dNSName "
-"correspondant est trouvé, cette contrainte est remplie.  Si aucune valeur "
-"dNSName est présente, cette contrainte est comparée au CN du SubjectName en "
-"utilisant cette correspondance de suffixe."
+msgstr "Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est utilisé comme correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification.  Si un dNSName correspondant est trouvé, cette contrainte est remplie.  Si aucune valeur dNSName est présente, cette contrainte est comparée au CN du SubjectName en utilisant cette correspondance de suffixe."
 
 #: ../clients/common/settings-docs.h.in:55
 msgid ""
@@ -6728,60 +6271,54 @@ msgid ""
 "\"pwd\", and \"fast\".  Each method requires different configuration using "
 "the properties of this setting; refer to wpa_supplicant documentation for "
 "the allowed combinations."
-msgstr ""
-"La méthode EAP autorisée lors de l'authentification au réseau avec 802.1x.  "
-"Les méthodes valides sont : \"saut\", \"md5\", \"tls\", \"peap\", \"ttls\", "
-"\"ttls\", \"pwd\" et \"fast\".  Chaque méthode nécessite différentes "
-"configurations utilisant les propriétés de ce paramètre ; consultez la "
-"documentation wpa_supplicant pour les combinaisons possibles."
+msgstr "La méthode EAP autorisée lors de l'authentification au réseau avec 802.1x.  Les méthodes valides sont : \"saut\", \"md5\", \"tls\", \"peap\", \"ttls\", \"ttls\", \"pwd\" et \"fast\".  Chaque méthode nécessite différentes configurations utilisant les propriétés de ce paramètre ; consultez la documentation wpa_supplicant pour les combinaisons possibles."
 
 #: ../clients/common/settings-docs.h.in:56
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
-msgstr ""
-"Chaîne d'identité pour les méthodes d'authentification EAP.  Souvent le nom "
-"d'utilisateur ou de connexion de l'utilisateur."
+msgstr "Chaîne d'identité pour les méthodes d'authentification EAP.  Souvent le nom d'utilisateur ou de connexion de l'utilisateur."
 
 #: ../clients/common/settings-docs.h.in:57
+msgid ""
+"Whether the 802.1X authentication is optional. If TRUE, the activation will "
+"continue even after a timeout or an authentication failure. Setting the "
+"property to TRUE is currently allowed only for Ethernet connections. If set "
+"to FALSE, the activation can continue only after a successful authentication."
+msgstr "Si l'authentification 802.1X est facultative. Si elle est TRUE, l'activation se poursuivra même après un délai d'attente ou un échec d'authentification. Le réglage de la propriété sur TRUE n'est actuellement autorisé que pour les connexions Ethernet. Si elle est réglée sur FALSE, l'activation ne peut se poursuivre qu'après une authentification réussie."
+
+#: ../clients/common/settings-docs.h.in:58
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr "Chemin de fichier encodé UTF-8 contenant PAC pour EAP-FAST."
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:59
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
-msgstr ""
-"Mot de passe encodé UTF-8 utilisé pour les méthodes d'authentification EAP. "
-"Si la propriété \"password\" et la propriété \"password-raw\" sont toutes "
-"deux spécifiées, on choisira \"password\"."
+msgstr "Mot de passe encodé UTF-8 utilisé pour les méthodes d'authentification EAP. Si la propriété \"password\" et la propriété \"password-raw\" sont toutes deux spécifiées, on choisira \"password\"."
 
-#: ../clients/common/settings-docs.h.in:59
-#: ../clients/common/settings-docs.h.in:104
-#: ../clients/common/settings-docs.h.in:131
-#: ../clients/common/settings-docs.h.in:179
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:299
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "Marqueurs indiquant comment gérer la propriété \"password\"."
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:61
 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\" "
 "property and the \"password-raw\" property are specified, \"password\" is "
 "preferred."
-msgstr ""
-"Mot de passe utilisé pour les méthodes d'authentification EAP, donné sous "
-"forme de tableau d'octets pour permettre l'utilisation de mots de passe dans "
-"d'autres encodages que UTF-8. Si la propriété \"password\" et la propriété "
-"\"password-raw\" sont spécifiées, on choisira \"password\"."
+msgstr "Mot de passe utilisé pour les méthodes d'authentification EAP, donné sous forme de tableau d'octets pour permettre l'utilisation de mots de passe dans d'autres encodages que UTF-8. Si la propriété \"password\" et la propriété \"password-raw\" sont spécifiées, on choisira \"password\"."
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:62
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr "Marqueurs indiquant comment gérer la propriété \"password-raw\"."
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:63
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6789,106 +6326,64 @@ msgid ""
 "the supplicant to allow or forbid it. The TLS options map to "
 "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
 "details."
-msgstr ""
-"Spécifie les marqueurs d'authentification à utiliser dans l'authentification "
-"externe \"phase 1\" en utilisant les options NMSetting8021xAuthFlags Les "
-"versions TLS individuelles peuvent être explicitement désactivées. Si un "
-"certain marqueur TLS désactivé n'est pas activé, il appartient au suppliant "
-"de l'autoriser ou non. Les options TLS correspondent aux paramètres "
-"tls_disable_tlsv1_x. Consultez la documentation wpa_supplicant pour plus de "
-"détails."
+msgstr "Spécifie les marqueurs d'authentification à utiliser dans l'authentification externe \"phase 1\" en utilisant les options NMSetting8021xAuthFlags Les versions TLS individuelles peuvent être explicitement désactivées. Si un certain marqueur TLS désactivé n'est pas activé, il appartient au suppliant de l'autoriser ou non. Les options TLS correspondent aux paramètres tls_disable_tlsv1_x. Consultez la documentation wpa_supplicant pour plus de détails."
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.h.in:64
 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 "
-"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), \"2\" "
-"(allow authenticated provisioning), and \"3\" (allow both authenticated and "
-"unauthenticated provisioning).  See the wpa_supplicant documentation for "
-"more details."
-msgstr ""
-"Active ou désactive le provisionnement en ligne des identifiants EAP-FAST "
-"lorsque FAST est spécifié comme méthode EAP dans la propriété \"eap\". Les "
-"valeurs reconnues sont \"0\" (désactivé), \"1\" (autorise le provisionnement "
-"non authentifié), \"2\" (autorise le provisionnement authentifié) et \"3\" "
-"(autorise le provisionnement authentifié et non authentifié).  Voir la "
-"documentation wpa_supplicant pour plus de détails."
+"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), "
+"\"2\" (allow authenticated provisioning), and \"3\" (allow both "
+"authenticated and unauthenticated provisioning).  See the wpa_supplicant "
+"documentation for more details."
+msgstr "Active ou désactive le provisionnement en ligne des identifiants EAP-FAST lorsque FAST est spécifié comme méthode EAP dans la propriété \"eap\". Les valeurs reconnues sont \"0\" (désactivé), \"1\" (autorise le provisionnement non authentifié), \"2\" (autorise le provisionnement authentifié) et \"3\" (autorise le provisionnement authentifié et non authentifié).  Voir la documentation wpa_supplicant pour plus de détails."
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.h.in:65
 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 "
 "\"1\" to force use of the new PEAP label.  See the wpa_supplicant "
 "documentation for more details."
-msgstr ""
-"Force l'utilisation du nouveau label PEAP lors de la dérivation des clés.  "
-"Certains serveurs RADIUS peuvent nécessiter de forcer le nouveau label PEAP "
-"à inter opérer avec PEAPv1.  Définir sur \"1\" pour forcer l'utilisation du "
-"nouveau label PEAP. Consultez la documentation wpa_supplicant pour plus de "
-"détails."
+msgstr "Force l'utilisation du nouveau label PEAP lors de la dérivation des clés.  Certains serveurs RADIUS peuvent nécessiter de forcer le nouveau label PEAP à inter opérer avec PEAPv1.  Définir sur \"1\" pour forcer l'utilisation du nouveau label PEAP. Consultez la documentation wpa_supplicant pour plus de détails."
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.h.in:66
 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 "
 "used.  Sometimes when using older RADIUS servers, it is necessary to force "
 "the client to use a particular PEAP version.  To do so, this property may be "
 "set to \"0\" or \"1\" to force that specific PEAP version."
-msgstr ""
-"Force quelle version de PEAP est utilisée lorsque PEAP est définie comme "
-"méthode EAP dans la propriété \"eap\".  Lorsqu'elle est désactivée, la "
-"version signalée par le serveur sera utilisée.  Parfois, lors de "
-"l'utilisation d'anciens serveurs RADIUS, il est nécessaire de forcer le "
-"client à utiliser une version PEAP particulière. Pour ce faire, cette "
-"propriété peut être définie sur \"0\" ou \"1\" pour forcer cette version "
-"spécifique de PEAP."
+msgstr "Force quelle version de PEAP est utilisée lorsque PEAP est définie comme méthode EAP dans la propriété \"eap\".  Lorsqu'elle est désactivée, la version signalée par le serveur sera utilisée.  Parfois, lors de l'utilisation d'anciens serveurs RADIUS, il est nécessaire de forcer le client à utiliser une version PEAP particulière. Pour ce faire, cette propriété peut être définie sur \"0\" ou \"1\" pour forcer cette version spécifique de PEAP."
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
 "authentication. If the list is empty, no verification of the server "
 "certificate's altSubjectName is performed."
-msgstr ""
-"Liste des chaînes à comparer avec le nom altSubjectName du certificat "
-"présenté par le serveur d'authentification lors de l'authentification "
-"interne \"phase 2\" Si la liste est vide, aucune vérification du nom "
-"altSubjectName du certificat du serveur n'est effectuée."
+msgstr "Liste des chaînes à comparer avec le nom altSubjectName du certificat présenté par le serveur d'authentification lors de l'authentification interne \"phase 2\" Si la liste est vide, aucune vérification du nom altSubjectName du certificat du serveur n'est effectuée."
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
-"Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
+"Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
 "property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", "
 "\"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each "
 "\"phase 2\" inner method requires specific parameters for successful "
 "authentication; see the wpa_supplicant documentation for more details."
-msgstr ""
-"Spécifie les méthodes d'authentification interne non-EAP \"phase 2\" "
-"autorisées lorsqu'une méthode EAP utilisant un tunnel TLS interne est "
-"spécifiée dans la propriété \"eap\".  Les méthodes reconnues non-EAP \"phase "
-"2\" sont \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", "
-"\"md5\" et \"tls\". chaque méthode interne \"phase 2\" requiert des "
-"paramètres spécifiques pour réussir une authentification. Consultez la "
-"documentation wpa_supplicant pour plus de détails."
+msgstr "Spécifie la méthode d'authentification interne non-EAP \"phase 2\" autorisée lorsqu'une méthode EAP qui utilise un tunnel TLS interne est spécifiée dans la propriété \"eap\".  Les méthodes reconnues de la \" phase 2 \" qui ne font pas partie du PAE sont \" pap \", \" chap \", \" mschap \", \" mschapv2 \", \" gtc \", \" otp \", \" md5 \" et \" tls \". Chaque méthode interne de \"phase 2\" nécessite des paramètres spécifiques pour une authentification réussie ; voir la documentation de wpa_supplicant pour plus de détails."
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.h.in:69
 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\" "
+"Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
+"an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
 "property.  Recognized EAP-based \"phase 2\" methods are \"md5\", "
 "\"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method "
 "requires specific parameters for successful authentication; see the "
 "wpa_supplicant documentation for more details."
-msgstr ""
-"Spécifie les méthodes d'authentification interne EAP \"phase 2\" autorisées "
-"lorsqu'une méthode EAP utilisant un tunnel TLS interne est spécifiée dans la "
-"propriété \"eap\"  Les méthodes reconnues EAP \"phase 2\" sont \"md5\", "
-"\"mschapv2\", \"otp\", \"gtc\" et \"tls\". Chaque méthode interne \"phase "
-"2\" nécessite des paramètres spécifiques pour une authentification réussie. "
-"Consultez la documentation wpa_supplicant pour plus de détails."
+msgstr "Spécifie la méthode d'authentification interne non-EAP \"phase 2\" autorisée lorsqu'une méthode EAP qui utilise un tunnel TLS interne est spécifiée dans la propriété \"eap\".  Les méthodes reconnues de la \" phase 2 \" qui ne font pas partie du PAE sont \" pap \", \" chap \", \" mschap \", \" md5 \", \" gtc \", \" otp \", \" mschapv2 \" et \" tls \". Chaque méthode interne de \"phase 2\" nécessite des paramètres spécifiques pour une authentification réussie ; voir la documentation de wpa_supplicant pour plus de détails."
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.h.in:70
 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 "
@@ -6900,45 +6395,28 @@ msgid ""
 "with a terminating NUL byte. This property can be unset even if the EAP "
 "method supports CA certificates, but this allows man-in-the-middle attacks "
 "and is NOT recommended."
-msgstr ""
-"Contient le certificat CA \"phase 2\" si utilisé par la méthode EAP "
-"spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\". Les "
-"données du certificat sont spécifiées à l'aide d'un \"schéma\" ; deux sont "
-"actuellement supportées : blob et path. Lorsque le schéma blob (qui est "
-"rétrocompatible avec NM 0.7.x) est utilisé, cette propriété doit être "
-"définie sur les données du certificat encodées DER. Lorsque le schéma path "
-"est utilisé, cette propriété doit être définie comme chemin complet UTF-8, "
-"préfixée de \"file://\" et se terminant par un octet NUL de terminaison. "
-"Cette propriété peut être désactivée même si la méthode EAP supporte les "
-"certificats CA, mais cela permet les attaques malveillantes et n'est PAS "
-"recommandé."
+msgstr "Contient le certificat CA \"phase 2\" si utilisé par la méthode EAP spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\". Les données du certificat sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement supportées : blob et path. Lorsque le schéma blob (qui est rétrocompatible avec NM 0.7.x) est utilisé, cette propriété doit être définie sur les données du certificat encodées DER. Lorsque le schéma path est utilisé, cette propriété doit être définie comme chemin complet UTF-8, préfixée de \"file://\" et se terminant par un octet NUL de terminaison. Cette propriété peut être désactivée même si la méthode EAP supporte les certificats CA, mais cela permet les attaques malveillantes et n'est PAS recommandé."
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.h.in:71
 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 "
 "PKCS#11 token that requires a login."
-msgstr ""
-"Le mot de passe utilisé pour accéder au certificat CA \"phase2\" stocké dans "
-"la propriété \"phase2-ca-cert\" n'a de sens que si le certificat est stocké "
-"sur un jeton PKCS#11 qui nécessite un login."
-
-#: ../clients/common/settings-docs.h.in:71
-msgid "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
-msgstr ""
-"Marqueurs indiquant comment gérer la propriété \"phase2-ca-cert-password\"."
+msgstr "Le mot de passe utilisé pour accéder au certificat CA \"phase2\" stocké dans la propriété \"phase2-ca-cert\" n'a de sens que si le certificat est stocké sur un jeton PKCS#11 qui nécessite un login."
 
 #: ../clients/common/settings-docs.h.in:72
 msgid ""
+"Flags indicating how to handle the \"phase2-ca-cert-password\" property."
+msgstr "Marqueurs indiquant comment gérer la propriété \"phase2-ca-cert-password\"."
+
+#: ../clients/common/settings-docs.h.in:73
+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 "
 "certificate specified in the \"phase2-ca-cert\" property."
-msgstr ""
-"Chemin encodé en UTF-8 vers un répertoire contenant les certificats formatés "
-"PEM ou DER à ajouter à la chaîne de vérification en plus du certificat "
-"spécifié dans la propriété \"phase2-ca-cert\"."
+msgstr "Chemin encodé en UTF-8 vers un répertoire contenant les certificats formatés PEM ou DER à ajouter à la chaîne de vérification en plus du certificat spécifié dans la propriété \"phase2-ca-cert\"."
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6950,36 +6428,21 @@ msgid ""
 "\"file://\" and ending with a terminating NUL byte. This property can be "
 "unset even if the EAP method supports CA certificates, but this allows man-"
 "in-the-middle attacks and is NOT recommended."
-msgstr ""
-"Contient le certificat client \"phase 2\" si utilisé par la méthode EAP "
-"spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\" ; les "
-"données du certificat sont spécifiées en utilisant un \"schéma\" ; deux sont "
-"actuellement supportées : blob et path ; lorsque vous utilisez le schéma "
-"blob (qui est rétrocompatible avec NM 0.7.x) cette propriété doit être "
-"définie comme les données codées DER du certificat, et le chemin complet du "
-"certificat doit être défini en UTF-8, avec le \"file://\" et se terminant "
-"par un octet NUL de terminaison. Cette propriété peut être désactivée même "
-"si la méthode EAP supporte les certificats CA, mais cela permet les attaques "
-"malveillantes et n'est PAS recommandé."
+msgstr "Contient le certificat client \"phase 2\" si utilisé par la méthode EAP spécifiée dans les propriétés \"phase2-auth\" ou \"phase2-autheap\" ; les données du certificat sont spécifiées en utilisant un \"schéma\" ; deux sont actuellement supportées : blob et path ; lorsque vous utilisez le schéma blob (qui est rétrocompatible avec NM 0.7.x) cette propriété doit être définie comme les données codées DER du certificat, et le chemin complet du certificat doit être défini en UTF-8, avec le \"file://\" et se terminant par un octet NUL de terminaison. Cette propriété peut être désactivée même si la méthode EAP supporte les certificats CA, mais cela permet les attaques malveillantes et n'est PAS recommandé."
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
-msgstr ""
-"Le mot de passe utilisé pour accéder au certificat client \"phase2\" stocké "
-"dans la propriété \"phase2-client-cert\" n'a de sens que si le certificat "
-"est stocké sur un jeton PKCS#11 qui nécessite un login."
+msgstr "Le mot de passe utilisé pour accéder au certificat client \"phase2\" stocké dans la propriété \"phase2-client-cert\" n'a de sens que si le certificat est stocké sur un jeton PKCS#11 qui nécessite un login."
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
-msgstr ""
-"Marqueurs indiquant comment gérer la propriété \"phase2-client-cert-"
-"password\"."
+msgstr "Marqueurs indiquant comment gérer la propriété \"phase2-client-cert-password\"."
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.h.in:77
 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 "
@@ -6987,16 +6450,9 @@ msgid ""
 "matching dNSName is found, this constraint is met.  If no dNSName values are "
 "present, this constraint is matched against SubjectName CN using same suffix "
 "match comparison."
-msgstr ""
-"Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est "
-"utilisé comme exigence de correspondance de suffixe pour le ou les éléments "
-"dNSName du certificat présenté par le serveur d'authentification pendant "
-"l'authentification interne \"phase 2\".  Si un dNSName correspondant est "
-"trouvé, cette contrainte est remplie. Si aucune valeur dNSName n'est "
-"présente, cette contrainte est comparée à CN SubjectName utilisant la même "
-"correspondance de suffixe."
+msgstr "Contrainte pour le nom de domaine du serveur. Si définie, ce FQDN est utilisé comme exigence de correspondance de suffixe pour le ou les éléments dNSName du certificat présenté par le serveur d'authentification pendant l'authentification interne \"phase 2\".  Si un dNSName correspondant est trouvé, cette contrainte est remplie. Si aucune valeur dNSName n'est présente, cette contrainte est comparée à CN SubjectName utilisant la même correspondance de suffixe."
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.h.in:78
 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 "
@@ -7013,66 +6469,39 @@ msgid ""
 "and ending with a terminating NUL byte, and as with the blob scheme the "
 "\"phase2-private-key-password\" property must be set to the password used to "
 "decode the PKCS#12 private key and certificate."
-msgstr ""
-"Contient la clé privée interne \"phase 2\" lorsque la propriété \"phase2-"
-"auth\" ou \"phase2-autheap\" est définie sur \"tls\". Les données clés sont "
-"spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en "
-"charge : blob et path. Lors de l'utilisation du schéma blob et des clés "
-"privées, cette propriété doit être définie sur les données codées PEM "
-"cryptées de la clé. Lors de l'utilisation de clés privées avec le schéma de "
-"chemin d'accès, cette propriété doit être définie sur le chemin d'accès "
-"encodé UTF-8 complet de la clé, préfixé par la chaîne \"file:///\" et se "
-"terminant par un octet NUL de fin. Lors de l'utilisation des clés privées au "
-"format PKCS#12 et du schéma blob, cette propriété doit être définie sur les "
-"données PKCS#12 et la propriété \"phase2-private-key-password\" doit être "
-"définie sur le mot de passe utilisé pour décrypter le certificat et la clé "
-"PKCS#12. Lors de l'utilisation des fichiers PKCS#12 et du schéma de chemins, "
-"cette propriété doit être définie sur le chemin complet encodé en UTF-8 de "
-"la clé, préfixé par la chaîne \"file://\" et se terminant par un octet NUL "
-"de fin, et comme pour le schéma blob, la propriété \"phase2-private-key-"
-"password\" doit être définie comme le mot de passe utilisé pour décoder la "
-"clé privée PKCS#12 et son certificat."
+msgstr "Contient la clé privée interne \"phase 2\" lorsque la propriété \"phase2-auth\" ou \"phase2-autheap\" est définie sur \"tls\". Les données clés sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et path. Lors de l'utilisation du schéma blob et des clés privées, cette propriété doit être définie sur les données codées PEM cryptées de la clé. Lors de l'utilisation de clés privées avec le schéma de chemin d'accès, cette propriété doit être définie sur le chemin d'accès encodé UTF-8 complet de la clé, préfixé par la chaîne \"file:///\" et se terminant par un octet NUL de fin. Lors de l'utilisation des clés privées au format PKCS#12 et du schéma blob, cette propriété doit être définie sur les données PKCS#12 et la propriété \"phase2-private-key-password\" doit être définie sur le mot de passe utilisé pour décrypter le certificat et la clé PKCS#12. Lors de l'utilisation des fichiers PKCS#12 et du schéma de chemins, cette propriété doit être définie sur le chemin complet encodé en UTF-8 de la clé, préfixé par la chaîne \"file://\" et se terminant par un octet NUL de fin, et comme pour le schéma blob, la propriété \"phase2-private-key-password\" doit être définie comme le mot de passe utilisé pour décoder la clé privée PKCS#12 et son certificat."
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.h.in:79
 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 "
 "scheme, or is a PKCS#12 format key."
-msgstr ""
-"Le mot de passe utilisé pour déchiffrer la clé privée \"phase 2\" spécifiée "
-"dans la propriété \"phase2-private-key\" lorsque la clé privée utilise le "
-"schéma de chemins ou est une clé au format PKCS#12."
+msgstr "Le mot de passe utilisé pour déchiffrer la clé privée \"phase 2\" spécifiée dans la propriété \"phase2-private-key\" lorsque la clé privée utilise le schéma de chemins ou est une clé au format PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr "Indicateurs de gestion de la propriété \"phase2-private-key-password\"."
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
 "unset, no verification of the authentication server certificate's subject is "
 "performed.  This property provides little security, if any, and its use is "
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
-msgstr ""
-"Substring à faire correspondre à l'objet du certificat présenté par le "
-"serveur d'authentification lors de l'authentification interne \"phase 2\". "
-"Si non défini, on ne peut vérifier l'objet du certificat du serveur "
-"d'authentification. Cette propriété fournit peu de sécurité, si elle existe, "
-"et son utilisation est dépréciée en faveur du NMSetting8021x:phase2-domain-"
-"suffix-match."
+msgstr "Substring à faire correspondre à l'objet du certificat présenté par le serveur d'authentification lors de l'authentification interne \"phase 2\". Si non défini, on ne peut vérifier l'objet du certificat du serveur d'authentification. Cette propriété fournit peu de sécurité, si elle existe, et son utilisation est dépréciée en faveur du NMSetting8021x:phase2-domain-suffix-match."
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.h.in:82
 msgid "PIN used for EAP authentication methods."
 msgstr "PIN utilisé pour les méthodes d'authentification EAP."
 
-#: ../clients/common/settings-docs.h.in:82
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:183
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "Marqueurs indiquant comment gérer la propriété \"pin\"."
 
-#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:84
 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 "
@@ -7087,105 +6516,57 @@ msgid ""
 "property should be set to the full UTF-8 encoded path of the key, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte, and as "
 "with the blob scheme the \"private-key-password\" property must be set to "
-"the password used to decode the PKCS#12 private key and certificate. WARNING:"
-" \"private-key\" is not a \"secret\" property, and thus unencrypted private "
-"key data using the BLOB scheme may be readable by unprivileged users.  "
-"Private keys should always be encrypted with a private key password to "
-"prevent unauthorized access to unencrypted private key data."
-msgstr ""
-"Contient la clé privée lorsque la propriété \"eap\" est définie sur \"tls\". "
-"Les données clés sont spécifiées à l'aide d'un \"schéma\" ; deux sont "
-"actuellement prises en charge : blob et path. Lors de l'utilisation du "
-"schéma blob et des clés privées, cette propriété doit être définie sur les "
-"données codées PEM cryptées de la clé. Lors de l'utilisation de clés privées "
-"avec le schéma de chemin d'accès, cette propriété doit être définie sur le "
-"chemin d'accès encodé UTF-8 complet de la clé, préfixé par la chaîne \"file:/"
-"//\" et se terminant par un octet NUL de fin. Lors de l'utilisation des clés "
-"privées au format PKCS#12 et du schéma blob, cette propriété doit être "
-"définie sur les données PKCS#12 et la propriété \"clé privée-mot de passe\" "
-"doit être définie sur mot de passe utilisé pour décrypter le certificat et "
-"la clé PKCS#12. Lors de l'utilisation des fichiers PKCS#12 et du schéma de "
-"chemins, cette propriété doit être définie sur le chemin complet encodé en "
-"UTF-8 de la clé, préfixé par la chaîne \"file://\" et se terminant par un "
-"octet NUL de fin, et comme pour le schéma blob, la propriété \"private key-"
-"password\" doit être définie par le mot de passe utilisé pour décoder la clé "
-"privée et le certificat PKCS#12. ATTENTION : \"clé privée\" n'est pas une "
-"propriété \"secrète\", et donc des données de clé privée non cryptées "
-"utilisant le schéma BLOB peuvent être lues par des utilisateurs non "
-"privilégiés.  Les clés privées doivent toujours être cryptées à l'aide d'un "
-"mot de passe de clé privée afin d'empêcher tout accès non autorisé aux "
-"données non cryptées des clés privées."
+"the password used to decode the PKCS#12 private key and certificate. "
+"WARNING: \"private-key\" is not a \"secret\" property, and thus unencrypted "
+"private key data using the BLOB scheme may be readable by unprivileged "
+"users.  Private keys should always be encrypted with a private key password "
+"to prevent unauthorized access to unencrypted private key data."
+msgstr "Contient la clé privée lorsque la propriété \"eap\" est définie sur \"tls\". Les données clés sont spécifiées à l'aide d'un \"schéma\" ; deux sont actuellement prises en charge : blob et path. Lors de l'utilisation du schéma blob et des clés privées, cette propriété doit être définie sur les données codées PEM cryptées de la clé. Lors de l'utilisation de clés privées avec le schéma de chemin d'accès, cette propriété doit être définie sur le chemin d'accès encodé UTF-8 complet de la clé, préfixé par la chaîne \"file:///\" et se terminant par un octet NUL de fin. Lors de l'utilisation des clés privées au format PKCS#12 et du schéma blob, cette propriété doit être définie sur les données PKCS#12 et la propriété \"clé privée-mot de passe\" doit être définie sur mot de passe utilisé pour décrypter le certificat et la clé PKCS#12. Lors de l'utilisation des fichiers PKCS#12 et du schéma de chemins, cette propriété doit être définie sur le chemin complet encodé en UTF-8 de la clé, préfixé par la chaîne \"file://\" et se terminant par un octet NUL de fin, et comme pour le schéma blob, la propriété \"private key-password\" doit être définie par le mot de passe utilisé pour décoder la clé privée et le certificat PKCS#12. ATTENTION : \"clé privée\" n'est pas une propriété \"secrète\", et donc des données de clé privée non cryptées utilisant le schéma BLOB peuvent être lues par des utilisateurs non privilégiés.  Les clés privées doivent toujours être cryptées à l'aide d'un mot de passe de clé privée afin d'empêcher tout accès non autorisé aux données non cryptées des clés privées."
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:85
 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 "
+"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 "
 "private key is a PKCS#12 format key."
-msgstr ""
-"Le mot de passe utilisé pour déchiffrer la clé privée spécifiée dans la "
-"propriété \" private key \" lorsque la clé privée utilise le schéma de "
-"chemins ou si la clé privée est une clé au format PKCS#12."
+msgstr "Le mot de passe utilisé pour déchiffrer la clé privée spécifiée dans la propriété \" private key \" lorsque la clé privée utilise le schéma de chemins ou si la clé privée est une clé au format PKCS#12."
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:86
 msgid "Flags indicating how to handle the \"private-key-password\" property."
-msgstr ""
-"Marqueurs indiquant comment gérer la propriété \"private-key-password\"."
+msgstr "Marqueurs indiquant comment gérer la propriété \"private-key-password\"."
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.h.in:87
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
 "server certificate's subject is performed.  This property provides little "
 "security, if any, and its use is deprecated in favor of NMSetting8021x:"
 "domain-suffix-match."
-msgstr ""
-"Sous-chaîne à faire correspondre à l'objet du certificat présenté par le "
-"serveur d'authentification. Lorsqu'il est désactivé, aucune vérification de "
-"l'objet du certificat du serveur d'authentification n'est effectuée.  Cette "
-"propriété offre peu de sécurité, voire aucune, et son utilisation est "
-"dépréciée en faveur de NMSetting8021x:domain-suffix-match"
+msgstr "Sous-chaîne à faire correspondre à l'objet du certificat présenté par le serveur d'authentification. Lorsqu'il est désactivé, aucune vérification de l'objet du certificat du serveur d'authentification n'est effectuée.  Cette propriété offre peu de sécurité, voire aucune, et son utilisation est dépréciée en faveur de NMSetting8021x:domain-suffix-match"
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.h.in:88
 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-"
 "path switch.  The certificates in this directory are added to the "
-"verification chain in addition to any certificates specified by the \"ca-"
-"cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-"
-"ca-path is rather a file name (bundle of trusted CA certificates), it "
-"overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets "
-"ca_cert/ca_cert2 options for wpa_supplicant)."
-msgstr ""
-"Si définie sur TRUE, remplace les propriétés \"ca-path\" et \"phase2-ca-"
-"path\" en utilisant le répertoire CA système spécifié lors de la "
-"configuration avec le commutateur --system-ca-path.  Les certificats de ce "
-"répertoire sont ajoutés à la chaîne de vérification en plus des certificats "
-"spécifiés par les propriétés \"ca-cert\" et \"phase2-ca-cert\". Si le chemin "
-"fourni avec --system-ca-path est plutôt un nom de fichier (paquet de "
-"certificats CA de confiance), il remplace les propriétés \"ca-cert\" et "
-"\"phase2-ca-cert\" (définit les options ca_cert/ca_cert2 pour "
-"wpa_supplicant)."
+"verification chain in addition to any certificates specified by the \"ca-cert"
+"\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-"
+"path is rather a file name (bundle of trusted CA certificates), it overrides "
+"\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
+"options for wpa_supplicant)."
+msgstr "Si définie sur TRUE, remplace les propriétés \"ca-path\" et \"phase2-ca-path\" en utilisant le répertoire CA système spécifié lors de la configuration avec le commutateur --system-ca-path.  Les certificats de ce répertoire sont ajoutés à la chaîne de vérification en plus des certificats spécifiés par les propriétés \"ca-cert\" et \"phase2-ca-cert\". Si le chemin fourni avec --system-ca-path est plutôt un nom de fichier (paquet de certificats CA de confiance), il remplace les propriétés \"ca-cert\" et \"phase2-ca-cert\" (définit les options ca_cert/ca_cert2 pour wpa_supplicant)."
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "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 ""
-"Si défini sur TRUE, applique la négociation automatique de la vitesse et du "
-"mode duplex. Si les propriétés \"speed\" et \"duplex\" sont toutes les deux "
-"spécifiées, seul ce mode unique sera annoncé et accepté pendant le processus "
-"d'auto-négociation des liens : cela ne fonctionne que pour les "
-"spécifications BASE-T 802.3 et est utile pour faire respecter les modes "
-"gigabits, car dans ces cas, la négociation des liens est obligatoire. Si "
-"défini sur FALSE, les propriétés \"speed\" et \"duplex\" doivent être toutes "
-"les deux réglées ou la configuration de la liaison sera ignorée."
+"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 "Si défini sur TRUE, applique la négociation automatique de la vitesse et du mode duplex. Si les propriétés \"speed\" et \"duplex\" sont toutes les deux spécifiées, seul ce mode unique sera annoncé et accepté pendant le processus d'auto-négociation des liens : cela ne fonctionne que pour les spécifications BASE-T 802.3 et est utile pour faire respecter les modes gigabits, car dans ces cas, la négociation des liens est obligatoire. Si défini sur FALSE, les propriétés \"speed\" et \"duplex\" doivent être toutes les deux réglées ou la configuration de la liaison sera ignorée."
 
-#: ../clients/common/settings-docs.h.in:89
+#: ../clients/common/settings-docs.h.in:90
 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 "
@@ -7196,26 +6577,13 @@ msgid ""
 "creates a random MAC address on each connect. \"stable\" creates a hashed "
 "MAC address based on connection.stable-id and a machine dependent key. If "
 "unspecified, the value can be overwritten via global defaults, see manual of "
-"NetworkManager.conf. If still unspecified, it defaults to \"preserve\" "
-"(older versions of NetworkManager may use a different default value). On D-"
-"Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
+"NetworkManager.conf. If still unspecified, it defaults to \"preserve"
+"\" (older versions of NetworkManager may use a different default value). On "
+"D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
 "\"cloned-mac-address\"."
-msgstr ""
-"Si spécifié, demande au périphérique d'utiliser cette adresse MAC à la place."
-" C'est ce qu'on appelle le clonage ou l'usurpation d'identité MAC. Outre la "
-"spécification explicite d'une adresse MAC, les valeurs spéciales "
-"\"preserve\", \"permanent\", \"random\" et \"stable\" sont supportées. "
-"\"préserver\" signifie ne pas toucher l'adresse MAC lors de l'activation. "
-"\"permanent\" signifie l'utilisation de l'adresse matérielle permanente du "
-"dispositif. \"random\" crée une adresse MAC aléatoire sur chaque connexion. "
-"\"stable\" crée une adresse MAC hachée basée sur connection.stable-id et une "
-"clé dépendante de la machine. Si elle n'est pas spécifiée, la valeur peut "
-"être écrasée via les valeurs par défaut globales, voir le manuel de "
-"NetworkManager.conf. Si elle n'est pas encore spécifiée, elle correspondra à "
-"\"permanent\" par défaut. Sur le bus D, ce champ est « assigned-mac-"
-"address » ou « cloned-mac-address » (déprécié)."
+msgstr "Si spécifié, demande au périphérique d'utiliser cette adresse MAC à la place. C'est ce qu'on appelle le clonage ou l'usurpation d'identité MAC. Outre la spécification explicite d'une adresse MAC, les valeurs spéciales \"preserve\", \"permanent\", \"random\" et \"stable\" sont supportées. \"préserver\" signifie ne pas toucher l'adresse MAC lors de l'activation. \"permanent\" signifie l'utilisation de l'adresse matérielle permanente du dispositif. \"random\" crée une adresse MAC aléatoire sur chaque connexion. \"stable\" crée une adresse MAC hachée basée sur connection.stable-id et une clé dépendante de la machine. Si elle n'est pas spécifiée, la valeur peut être écrasée via les valeurs par défaut globales, voir le manuel de NetworkManager.conf. Si elle n'est pas encore spécifiée, elle correspondra à \"permanent\" par défaut. Sur le bus D, ce champ est « assigned-mac-address » ou « cloned-mac-address » (déprécié)."
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.h.in:91
 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 "
@@ -7228,78 +6596,45 @@ msgid ""
 "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 ""
-"Lorsqu'une valeur est définie, \"half\" ou \"full\", ella a pour effet de "
-"configurer l'appareil pour qu'il utilise le mode duplex spécifié. Si \"auto-"
-"negociate\" est sur \"yes\", le mode duplex spécifié sera le seul proposé "
-"lors de la négociation du lien : il ne fonctionne que pour les "
-"spécifications BASE-T 802.3 et est utile pour faire respecter les modes "
-"gigabits, car dans ces cas la négociation du lien est obligatoire. Si la "
-"valeur n'est pas définie (valeur par défaut), la configuration du lien sera "
-"soit ignorée (si \"auto-negociate\" est sur \"no\", la valeur par défaut), "
-"soit négociée automatiquement (si \"auto-negociate\" est sur \"yes\") et le "
-"périphérique local annoncera tous les modes duplex supportés. Doit être "
-"défini avec la propriété \"speed\" si spécifié. Avant de spécifier un mode "
-"duplex, assurez-vous que votre périphérique le prenne bien en charge."
+msgstr "Lorsqu'une valeur est définie, \"half\" ou \"full\", ella a pour effet de configurer l'appareil pour qu'il utilise le mode duplex spécifié. Si \"auto-negociate\" est sur \"yes\", le mode duplex spécifié sera le seul proposé lors de la négociation du lien : il ne fonctionne que pour les spécifications BASE-T 802.3 et est utile pour faire respecter les modes gigabits, car dans ces cas la négociation du lien est obligatoire. Si la valeur n'est pas définie (valeur par défaut), la configuration du lien sera soit ignorée (si \"auto-negociate\" est sur \"no\", la valeur par défaut), soit négociée automatiquement (si \"auto-negociate\" est sur \"yes\") et le périphérique local annoncera tous les modes duplex supportés. Doit être défini avec la propriété \"speed\" si spécifié. Avant de spécifier un mode duplex, assurez-vous que votre périphérique le prenne bien en charge."
 
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.h.in:93
 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 "
 "of the device (i.e. MAC spoofing)."
-msgstr ""
-"Si spécifiée, cette connexion ne s'applique qu'au périphérique Ethernet dont "
-"l'adresse MAC permanente correspond à l'adresse MAC. Cette propriété ne "
-"change pas l'adresse MAC du périphérique (c'est-à-dire l'usurpation "
-"d'identité MAC)."
+msgstr "Si spécifiée, cette connexion ne s'applique qu'au périphérique Ethernet dont l'adresse MAC permanente correspond à l'adresse MAC. Cette propriété ne change pas l'adresse MAC du périphérique (c'est-à-dire l'usurpation d'identité MAC)."
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.h.in:94
 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 "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
-msgstr ""
-"Si spécifiée, cette connexion ne s'appliquera jamais au périphérique "
-"Ethernet dont l'adresse MAC permanente correspond à une adresse dans la "
-"liste.  Chaque adresse MAC est en notation standard hexadécimale (00:11:22:"
-"33:44:55)."
+msgstr "Si spécifiée, cette connexion ne s'appliquera jamais au périphérique Ethernet dont l'adresse MAC permanente correspond à une adresse dans la liste.  Chaque adresse MAC est en notation standard hexadécimale (00:11:22:33:44:55)."
 
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
-"Specific port type to use if the device supports multiple attachment methods."
-"  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), \"bnc\" "
-"(Thin Ethernet) or \"mii\" (Media Independent Interface). If the device "
-"supports only one port type, this setting is ignored."
-msgstr ""
-"Type de port spécifique à utiliser si l'appareil prend en charge plusieurs "
-"méthodes de connexion. Un des types \"tp\" (Twisted Pair), \"aui\" "
-"(Attachment Unit Interface), \"bnc\" (Thin Ethernet) ou \"mii\" (Media "
-"Independent Interface). Si l'appareil ne prend en charge qu'un type de port, "
-"ce paramètre sera ignoré."
+"Specific port type to use if the device supports multiple attachment "
+"methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
+"\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
+"device supports only one port type, this setting is ignored."
+msgstr "Type de port spécifique à utiliser si l'appareil prend en charge plusieurs méthodes de connexion. Un des types \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), \"bnc\" (Thin Ethernet) ou \"mii\" (Media Independent Interface). Si l'appareil ne prend en charge qu'un type de port, ce paramètre sera ignoré."
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.h.in:97
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
-msgstr ""
-"type de périphérique réseau s390 ; un parmi \"qeth\", \"lcs\" ou \"ctc\", "
-"représentant les différents types de périphériques réseau virtuels "
-"disponibles sur les systèmes s390."
+msgstr "type de périphérique réseau s390 ; un parmi \"qeth\", \"lcs\" ou \"ctc\", représentant les différents types de périphériques réseau virtuels disponibles sur les systèmes s390."
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:98
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
 "\"portname\", \"protocol\", among others.  Key names must contain only "
 "alphanumeric characters (ie, [a-zA-Z0-9])."
-msgstr ""
-"Dictionnaire des paires clé/valeur des options de périphériques spécifiques "
-"à s390. Les clés et les valeurs doivent correspondre à des chaînes de "
-"caractères. Les clés autorisées comprennent \"portno\", \"layer2\", "
-"\"portname\", \"protocol\", entre autres. Les noms des clés doivent contenir "
-"uniquement des caractères alphanumériques (c'est-à-dire[a-zA-Z0-9])."
+msgstr "Dictionnaire des paires clé/valeur des options de périphériques spécifiques à s390. Les clés et les valeurs doivent correspondre à des chaînes de caractères. Les clés autorisées comprennent \"portno\", \"layer2\", \"portname\", \"protocol\", entre autres. Les noms des clés doivent contenir uniquement des caractères alphanumériques (c'est-à-dire[a-zA-Z0-9])."
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -7307,44 +6642,24 @@ msgid ""
 "applies to the network device that uses these subchannels.  The list should "
 "contain exactly 3 strings, and each string may only be composed of "
 "hexadecimal characters and the period (.) character."
-msgstr ""
-"Identifie les sous-canaux spécifiques que ce périphérique réseau utilise "
-"pour communiquer avec l'hôte z/VM ou s390.  Comme la propriété \"mac-"
-"address\" pour les périphériques non z/VM, cette propriété peut être "
-"utilisée pour garantir que cette connexion ne s'applique qu'au périphérique "
-"réseau qui utilise ces sous-canaux.  La liste doit contenir exactement 3 "
-"chaînes, et chaque chaîne ne peut être composée que de caractères "
-"hexadécimaux et le caractère point (.)."
+msgstr "Identifie les sous-canaux spécifiques que ce périphérique réseau utilise pour communiquer avec l'hôte z/VM ou s390.  Comme la propriété \"mac-address\" pour les périphériques non z/VM, cette propriété peut être utilisée pour garantir que cette connexion ne s'applique qu'au périphérique réseau qui utilise ces sous-canaux.  La liste doit contenir exactement 3 chaînes, et chaque chaîne ne peut être composée que de caractères hexadécimaux et le caractère point (.)."
 
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "When a value greater 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 ""
-"Lorsqu'une valeur supérieure à 0 est définie, configure l'appareil pour "
-"qu'il utilise la vitesse spécifiée. Si \"auto-négocier\" est sur \"yes\", la "
-"vitesse spécifiée sera la seule annoncée lors de la négociation du lien : "
-"cela ne fonctionne que pour les spécifications BASE-T 802.3 et est utile "
-"pour imposer des vitesses gigabit, car dans ce cas la négociation du lien "
-"est obligatoire. Si la valeur n'est pas réglée (0, la valeur par défaut), la "
-"configuration du lien sera soit ignorée (si \"auto-negociate\" est sur "
-"\"no\", la valeur par défaut), soit négociée automatiquement (si \"auto-"
-"negociate\" est sur \"yes\") et le périphérique local affichera toutes les "
-"vitesses supportées. En Mbit/s, soit 100 == 100Mbit/s. Doit être défini "
-"ainsi quela propriété \"duplex\" si elle est différente de zéro. Avant de "
-"spécifier une valeur de vitesse, assurez-vous que votre périphérique la "
-"prenne bien en charge."
+"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 "Lorsqu'une valeur supérieure à 0 est définie, configure l'appareil pour qu'il utilise la vitesse spécifiée. Si \"auto-négocier\" est sur \"yes\", la vitesse spécifiée sera la seule annoncée lors de la négociation du lien : cela ne fonctionne que pour les spécifications BASE-T 802.3 et est utile pour imposer des vitesses gigabit, car dans ce cas la négociation du lien est obligatoire. Si la valeur n'est pas réglée (0, la valeur par défaut), la configuration du lien sera soit ignorée (si \"auto-negociate\" est sur \"no\", la valeur par défaut), soit négociée automatiquement (si \"auto-negociate\" est sur \"yes\") et le périphérique local affichera toutes les vitesses supportées. En Mbit/s, soit 100 == 100Mbit/s. Doit être défini ainsi quela propriété \"duplex\" si elle est différente de zéro. Avant de spécifier une valeur de vitesse, assurez-vous que votre périphérique la prenne bien en charge."
 
-#: ../clients/common/settings-docs.h.in:100
+#: ../clients/common/settings-docs.h.in:101
 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), "
@@ -7355,171 +6670,121 @@ msgid ""
 "(0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to "
 "use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
 "disable management of Wake-on-LAN in NetworkManager)."
-msgstr ""
-"Les options NMSettingWiredWakeOnLan à activer. Les périphériques ne prennent "
-"pas tous en charge toutes les options. Peut correspondre à une combinaison "
-"de NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), "
-"NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC "
-"(0x40) ou les valeurs spéciales NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) "
-"(pour utiliser les paramètres globaux) et "
-"NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (pour déactiver la gestion de "
-"Wake-on-LAN du NetworkManager)."
+msgstr "Les options NMSettingWiredWakeOnLan à activer. Les périphériques ne prennent pas tous en charge toutes les options. Peut correspondre à une combinaison de NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) ou les valeurs spéciales NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (pour utiliser les paramètres globaux) et NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (pour déactiver la gestion de Wake-on-LAN du NetworkManager)."
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.h.in:102
 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 "
 "required."
-msgstr ""
-"Si spécifié, le mot de passe utilisé avec Wake-on-LAN basé sur magic-packet, "
-"représenté par une adresse Ethernet MAC.  Si NULL, aucun mot de passe ne "
-"sera requis."
+msgstr "Si spécifié, le mot de passe utilisé avec Wake-on-LAN basé sur magic-packet, représenté par une adresse Ethernet MAC.  Si NULL, aucun mot de passe ne sera requis."
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.h.in:103
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
-msgstr ""
-"Encapsulation de la connexion ADSL. Peut correspondre à \"vcmux\" ou \"llc\"."
-""
+msgstr "Encapsulation de la connexion ADSL. Peut correspondre à \"vcmux\" ou \"llc\"."
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.h.in:104
 msgid "Password used to authenticate with the ADSL service."
 msgstr "Mot de passe utilisé pour s'authentifier avec le service ADSL."
 
-#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:106
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
-msgstr ""
-"Protocole de connexion ADSL. Peut correspondre à \"pppoa\", \"pppoe\" ou "
-"\"ipoatm\"."
+msgstr "Protocole de connexion ADSL. Peut correspondre à \"pppoa\", \"pppoe\" ou \"ipoatm\"."
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:107
 msgid "Username used to authenticate with the ADSL service."
 msgstr "Nom d'utilisateur utilisé pour s'authentifier avec le service ADSL."
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:108
 msgid "VCI of ADSL connection"
 msgstr "VCI de connexion ADSL"
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:109
 msgid "VPI of ADSL connection"
 msgstr "VPI de connexion ADSL"
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:110
 msgid "The Bluetooth address of the device."
 msgstr "L'adresse Bluetooth de l'appareil."
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.h.in:111
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
-msgstr ""
-"Soit \"dun\" pour les connexions au réseau Dial-Up, soit \"panu\" pour les "
-"connexions au réseau local personnel vers des périphériques prenant en "
-"charge le profil NAP."
+msgstr "Soit \"dun\" pour les connexions au réseau Dial-Up, soit \"panu\" pour les connexions au réseau local personnel vers des périphériques prenant en charge le profil NAP."
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.h.in:112
 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-"
 "zA-Z0-9])."
-msgstr ""
-"Dictionnaire des combinaisons clé/valeur des options de collage  Les clés et "
-"les valeurs doivent être des chaînes de caractères et les noms des options "
-"ne doivent contenir que des caractères alphanumériques (c.-à-d.,[a-zA-Z0-9])."
-""
+msgstr "Dictionnaire des combinaisons clé/valeur des options de collage  Les clés et les valeurs doivent être des chaînes de caractères et les noms des options ne doivent contenir que des caractères alphanumériques (c.-à-d.,[a-zA-Z0-9])."
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.h.in:113
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "Le temps de vieillissement de l'adresse Ethernet MAC, en secondes."
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.h.in:114
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
-msgstr ""
-"Le délai de transmission du protocole Spanning Tree Protocol (STP), en "
-"secondes."
+msgstr "Le délai de transmission du protocole Spanning Tree Protocol (STP), en secondes."
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:115
 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 "
 "standards. This property is a mask of 16 bits, each corresponding to a group "
 "address in that range that must be forwarded. The mask can't have bits 0, 1 "
 "or 2 set because they are used for STP, MAC pause frames and LACP."
-msgstr ""
-"Un masque d'adresses de groupe à transférer. Habituellement, les adresses de "
-"groupe comprises entre 01:80:C2:00:00:00:00:00 et 01:80:C2:00:00:0F ne sont "
-"pas transmises conformément aux normes. Cette propriété est un masque de 16 "
-"bits, chacun correspondant à une adresse de groupe dans cette plage qui doit "
-"être transmise. Le masque ne peut pas avoir les bits 0, 1 ou 2 car ils sont "
-"utilisés pour STP, les frames de pause MAC et LACP."
+msgstr "Un masque d'adresses de groupe à transférer. Habituellement, les adresses de groupe comprises entre 01:80:C2:00:00:00:00:00 et 01:80:C2:00:00:0F ne sont pas transmises conformément aux normes. Cette propriété est un masque de 16 bits, chacun correspondant à une adresse de groupe dans cette plage qui doit être transmise. Le masque ne peut pas avoir les bits 0, 1 ou 2 car ils sont utilisés pour STP, les frames de pause MAC et LACP."
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:116
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "Le protocole Spanning Tree Protocol (STP) hello time, en secondes."
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:117
 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."
-"cloned-mac-address\" is referred instead to generate the initial MAC address."
-" Note that setting \"ethernet.cloned-mac-address\" anyway overwrites the MAC "
-"address of the bridge later while activating the bridge. Hence, this "
+"cloned-mac-address\" is referred instead to generate the initial MAC "
+"address. Note that setting \"ethernet.cloned-mac-address\" anyway overwrites "
+"the MAC address of the bridge later while activating the bridge. Hence, this "
 "property is deprecated. Deprecated: 1"
-msgstr ""
-"Si définie, l’adresse MAC d’un pontage. Lors de la création d'un nouveau "
-"pontage, cette adresse MAC est définie ; si ce champ n'est pas spécifié, "
-"l'adresse \"ethernet.cloned-mac-address\" est utilisée pour générer "
-"l'adresse MAC initiale. Notez que le paramètre \"ethernet.cloned-mac-"
-"address\" écrase l'adresse MAC du pont lors de son activation ultérieure. "
-"Cette propriété est donc obsolète. Dépréciation: 1"
+msgstr "Si définie, l’adresse MAC d’un pontage. Lors de la création d'un nouveau pontage, cette adresse MAC est définie ; si ce champ n'est pas spécifié, l'adresse \"ethernet.cloned-mac-address\" est utilisée pour générer l'adresse MAC initiale. Notez que le paramètre \"ethernet.cloned-mac-address\" écrase l'adresse MAC du pont lors de son activation ultérieure. Cette propriété est donc obsolète. Dépréciation: 1"
 
-#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.h.in:118
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "Le protocole Spanning Tree Protocol (STP) hello time, en secondes."
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.h.in:119
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
-msgstr ""
-"Vérifie si IGMP Snooping est activé pour ce pontage, mais si le snooping a "
-"été automatiquement désactivé en raison des collisions de hachage, le "
-"système peut refuser d'activer la fonction jusqu'à ce que les collisions "
-"soient résolues."
+msgstr "Vérifie si IGMP Snooping est activé pour ce pontage, mais si le snooping a été automatiquement désactivé en raison des collisions de hachage, le système peut refuser d'activer la fonction jusqu'à ce que les collisions soient résolues."
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.h.in:120
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
-msgstr ""
-"Définit la priorité du protocole Spanning Tree Protocol (STP) pour ce pont : "
-"les valeurs inférieures sont \"meilleures\" ; le pont de priorité inférieure "
-"sera élu pont racine."
+msgstr "Définit la priorité du protocole Spanning Tree Protocol (STP) pour ce pont : les valeurs inférieures sont \"meilleures\" ; le pont de priorité inférieure sera élu pont racine."
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.h.in:121
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
-msgstr ""
-"Contrôle si le protocole Spanning Tree Protocol (STP) est activé pour ce "
-"pont."
+msgstr "Contrôle si le protocole Spanning Tree Protocol (STP) est activé pour ce pont."
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.h.in:122
 msgid ""
 "The default PVID for the ports of the bridge, that is the VLAN id assigned "
 "to incoming untagged frames."
-msgstr ""
-"Le PVID par défaut des ports du pontage, c'est à dire l'id VLAN qui a été "
-"attribué aux trames entrantes non balisées."
+msgstr "Le PVID par défaut des ports du pontage, c'est à dire l'id VLAN qui a été attribué aux trames entrantes non balisées."
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.h.in:123
 msgid "Control whether VLAN filtering is enabled on the bridge."
 msgstr "Contrôle l'activation du filtrage VLAN sur le pontage."
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.h.in:124
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "bridge will also have the default-pvid VLAN configured  by the bridge.vlan-"
@@ -7527,107 +6792,73 @@ msgid ""
 "following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where "
 "$vid is either a single id between 1 and 4094 or a range, represented as a "
 "couple of ids separated by a dash."
-msgstr ""
-"Tableau d'objets VLAN en pontage. En plus des VLAN spécifiés ici, le port "
-"aura aussi le VLAN pvid fourni par défaut configuré par la propriété bridge."
-"vlan-default-pvid. Dans nmcli, la liste des VLAN peut être spécifiée avec la "
-"syntaxe suivante : $vid[pvid][untagged][untagged] [, $vid[pvid][untagged]]].."
-".. où $vid est soit un identifiant unique entre 1 et 4094, soit une plage, "
-"représentée par un couple d'identifiants séparés par un trait."
+msgstr "Tableau d'objets VLAN en pontage. En plus des VLAN spécifiés ici, le port aura aussi le VLAN pvid fourni par défaut configuré par la propriété bridge.vlan-default-pvid. Dans nmcli, la liste des VLAN peut être spécifiée avec la syntaxe suivante : $vid[pvid][untagged][untagged] [, $vid[pvid][untagged]]].... où $vid est soit un identifiant unique entre 1 et 4094, soit une plage, représentée par un couple d'identifiants séparés par un trait."
 
-#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.h.in:125
 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."
-msgstr ""
-"Active ou désactive le mode « hairpin »  pour le port, qui permet de "
-"renvoyer les trames par le port sur lequel la trame a été reçue."
+msgstr "Active ou désactive le mode « hairpin »  pour le port, qui permet de renvoyer les trames par le port sur lequel la trame a été reçue."
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
-msgstr ""
-"Le coût du port STP (Spanning Tree Protocol) pour les destinations via ce "
-"port."
+msgstr "Le coût du port STP (Spanning Tree Protocol) pour les destinations via ce port."
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:127
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr "La priorité STP (Spanning Tree Protocol) de ce port du pont."
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:128
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "port will also have the default-pvid VLAN configured on the bridge by the "
 "bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified "
-"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]."
-".. where $vid is either a single id between 1 and 4094 or a range, "
-"represented as a couple of ids separated by a dash."
-msgstr ""
-"Tableau d'objets VLAN en pontage. En plus des VLAN spécifiés ici, le port "
-"aura aussi le VLAN pvid fourni par défaut configuré par la propriété bridge."
-"vlan-default-pvid. Dans nmcli, la liste des VLAN peut être spécifiée avec la "
-"syntaxe suivante : $vid[pvid][untagged][untagged] [, $vid[pvid][untagged]]].."
-".. où $vid est soit un identifiant unique entre 1 et 4094, soit une plage, "
-"représentée par un couple d'identifiants séparés par un trait."
+"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] "
+"[untagged]]... where $vid is either a single id between 1 and 4094 or a "
+"range, represented as a couple of ids separated by a dash."
+msgstr "Tableau d'objets VLAN en pontage. En plus des VLAN spécifiés ici, le port aura aussi le VLAN pvid fourni par défaut configuré par la propriété bridge.vlan-default-pvid. Dans nmcli, la liste des VLAN peut être spécifiée avec la syntaxe suivante : $vid[pvid][untagged][untagged] [, $vid[pvid][untagged]]].... où $vid est soit un identifiant unique entre 1 et 4094, soit une plage, représentée par un couple d'identifiants séparés par un trait."
 
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:175
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
-msgstr ""
-"Si différent de zéro, ne transmettez que des paquets de la taille spécifiée "
-"ou plus petits, divisant les paquets plus grands en plusieurs trames."
+msgstr "Si différent de zéro, ne transmettez que des paquets de la taille spécifiée ou plus petits, divisant les paquets plus grands en plusieurs trames."
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:130
 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 "
 "used when required."
-msgstr ""
-"Le numéro à composer pour établir la connexion au réseau mobile à large "
-"bande CDMA, s'il y a lieu.  Si non spécifié, le numéro par défaut (#777) est "
-"utilisé au besoin."
+msgstr "Le numéro à composer pour établir la connexion au réseau mobile à large bande CDMA, s'il y a lieu.  Si non spécifié, le numéro par défaut (#777) est utilisé au besoin."
 
-#: ../clients/common/settings-docs.h.in:130
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:180
 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 "
 "password is required, it is specified here."
-msgstr ""
-"Le mot de passe utilisé pour s'authentifier auprès du réseau, si nécessaire. "
-" De nombreux fournisseurs n'ont pas besoin d'un mot de passe ou acceptent "
-"n’importe quel mot de passe.  Mais si un mot de passe est requis, il est "
-"spécifié ici."
+msgstr "Le mot de passe utilisé pour s'authentifier auprès du réseau, si nécessaire.  De nombreux fournisseurs n'ont pas besoin d'un mot de passe ou acceptent n’importe quel mot de passe.  Mais si un mot de passe est requis, il est spécifié ici."
 
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:186
 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 "
 "username is required, it is specified here."
-msgstr ""
-"Le mot de passe utilisé pour s'authentifier auprès du réseau, si nécessaire. "
-" De nombreux fournisseurs n'ont pas besoin d'un mot de passe ou acceptent "
-"n’importe quel mot de passe.  Mais si un mot de passe est requis, il est "
-"spécifié ici."
+msgstr "Le mot de passe utilisé pour s'authentifier auprès du réseau, si nécessaire.  De nombreux fournisseurs n'ont pas besoin d'un mot de passe ou acceptent n’importe quel mot de passe.  Mais si un mot de passe est requis, il est spécifié ici."
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:134
 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 "
 "set, the authentication retries for 3 times before failing the connection. "
 "Currently this only applies to 802-1x authentication."
-msgstr ""
-"Le nombre de tentatives d'authentification : Zéro signifie essayer "
-"indéfiniment ; -1 signifie utiliser une valeur par défaut globale. Si la "
-"valeur par défaut globale n'est pas définie, l'authentification est tentée à "
-"nouveau 3 fois avant de faire échouer la connexion, ce qui ne s'applique "
-"actuellement qu'à l'authentification 802-1x."
+msgstr "Le nombre de tentatives d'authentification : Zéro signifie essayer indéfiniment ; -1 signifie utiliser une valeur par défaut globale. Si la valeur par défaut globale n'est pas définie, l'authentification est tentée à nouveau 3 fois avant de faire échouer la connexion, ce qui ne s'applique actuellement qu'à l'authentification 802-1x."
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:135
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
@@ -7635,41 +6866,25 @@ msgid ""
 "to activate the connection. Note that autoconnect is not implemented for VPN "
 "profiles. See \"secondaries\" as an alternative to automatically connect VPN "
 "profiles."
-msgstr ""
-"Indique si la connexion doit ou non être automatiquement connectée par "
-"NetworkManager lorsque les ressources pour la connexion sont disponibles. "
-"TRUE pour activer automatiquement la connexion, FALSE pour demander une "
-"intervention manuelle pour activer la connexion. Notez que la connexion "
-"automatique n'est pas implémentée pour les profils VPN. Voir \"secondaires\" "
-"comme alternative pour connecter automatiquement les profils VPN."
+msgstr "Indique si la connexion doit ou non être automatiquement connectée par NetworkManager lorsque les ressources pour la connexion sont disponibles. TRUE pour activer automatiquement la connexion, FALSE pour demander une intervention manuelle pour activer la connexion. Notez que la connexion automatique n'est pas implémentée pour les profils VPN. Voir \"secondaires\" comme alternative pour connecter automatiquement les profils VPN."
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.h.in:136
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
-msgstr ""
-"La priorité de connexion automatique : si la connexion est configurée sur "
-"connexion automatique, les connexions avec une priorité plus élevée seront "
-"préférées ; par défaut, la valeur est 0 ; le nombre le plus élevé signifie "
-"une priorité plus élevée."
+msgstr "La priorité de connexion automatique : si la connexion est configurée sur connexion automatique, les connexions avec une priorité plus élevée seront préférées ; par défaut, la valeur est 0 ; le nombre le plus élevé signifie une priorité plus élevée."
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:137
 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 "
 "overridden). Setting this to 1 means to try activation only once before "
 "blocking autoconnect. Note that after a timeout, NetworkManager will try to "
 "autoconnect again."
-msgstr ""
-"Le nombre de fois qu'une connexion doit être essayée lors de l'activation "
-"automatique avant d'abandonner. Zéro signifie pour toujours, -1 signifie la "
-"valeur par défaut globale (4 fois si elle n'est pas annulée) et 1 signifie "
-"qu'il faut essayer l'activation une seule fois avant de bloquer la connexion "
-"automatique. Notez qu’après un timeout, NetworkManager va essayer de se "
-"reconnecter automatiquement."
+msgstr "Le nombre de fois qu'une connexion doit être essayée lors de l'activation automatique avant d'abandonner. Zéro signifie pour toujours, -1 signifie la valeur par défaut globale (4 fois si elle n'est pas annulée) et 1 signifie qu'il faut essayer l'activation une seule fois avant de bloquer la connexion automatique. Notez qu’après un timeout, NetworkManager va essayer de se reconnecter automatiquement."
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
@@ -7679,35 +6894,21 @@ msgid ""
 "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 ""
-"Indique si les esclaves de cette connexion doivent être automatiquement "
-"rappelés lorsque NetworkManager active cette connexion. Ceci n'a d'effet "
-"réel que pour les connexions maître. Les propriétés \"autoconnect\", "
-"\"autoconnect-priority\" et \"autoconnect-retries\" ne sont pas liées à ce "
-"paramètre. Les valeurs autorisées sont : 0 : ne pas toucher aux connexions "
-"esclaves, 1 : activer toutes les connexions esclaves avec cette connexion, -"
-"1 : par défaut. Si -1 (par défaut) est défini, le fichier global connection."
-"autoconnect-slaves est lu pour déterminer la valeur réelle. Si c'est "
-"également le cas par défaut, cette valeur est ramenée à 0."
+msgstr "Indique si les esclaves de cette connexion doivent être automatiquement rappelés lorsque NetworkManager active cette connexion. Ceci n'a d'effet réel que pour les connexions maître. Les propriétés \"autoconnect\", \"autoconnect-priority\" et \"autoconnect-retries\" ne sont pas liées à ce paramètre. Les valeurs autorisées sont : 0 : ne pas toucher aux connexions esclaves, 1 : activer toutes les connexions esclaves avec cette connexion, -1 : par défaut. Si -1 (par défaut) est défini, le fichier global connection.autoconnect-slaves est lu pour déterminer la valeur réelle. Si c'est également le cas par défaut, cette valeur est ramenée à 0."
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
-msgstr ""
-"Indique si cette valeur est supérieure à zéro, retardez le succès de "
-"l'adressage IP jusqu'à ce que le délai d'attente soit atteint ou qu'une "
-"passerelle IP réponde à un ping."
+msgstr "Indique si cette valeur est supérieure à zéro, retardez le succès de l'adressage IP jusqu'à ce que le délai d'attente soit atteint ou qu'une passerelle IP réponde à un ping."
 
-#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:140
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
-msgstr ""
-"Un identifiant unique lisible par l'homme pour la connexion, comme \"Work Wi-"
-"Fi\" ou \"T-Mobile 3G\"."
+msgstr "Un identifiant unique lisible par l'homme pour la connexion, comme \"Work Wi-Fi\" ou \"T-Mobile 3G\"."
 
-#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.h.in:141
 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 "
@@ -7718,23 +6919,13 @@ msgid ""
 "restricts the interfaces a connection can be used with, and if interface "
 "names change or are reordered the connection may be applied to the wrong "
 "interface."
-msgstr ""
-"Le nom de l'interface réseau à laquelle cette connexion est liée, si elle "
-"n'est pas définie, la connexion peut être attachée à n'importe quelle "
-"interface du type approprié (sous réserve des restrictions imposées par "
-"d'autres paramètres), ce qui spécifie le nom du périphérique créé pour les "
-"périphériques logiciels. Pour les types de connexion où les noms des "
-"interfaces ne sont pas facilement persistants (par exemple, mobile haut "
-"débit ou Ethernet USB), cette propriété ne doit pas être utilisée, et si les "
-"noms des interfaces peuvent être utilisés avec la connexion, la connexion "
-"est limitée, ou bien en cas de changement de changement du nom des "
-"interfaces, elle peut être appliquée sur la mauvaise interface."
+msgstr "Le nom de l'interface réseau à laquelle cette connexion est liée, si elle n'est pas définie, la connexion peut être attachée à n'importe quelle interface du type approprié (sous réserve des restrictions imposées par d'autres paramètres), ce qui spécifie le nom du périphérique créé pour les périphériques logiciels. Pour les types de connexion où les noms des interfaces ne sont pas facilement persistants (par exemple, mobile haut débit ou Ethernet USB), cette propriété ne doit pas être utilisée, et si les noms des interfaces peuvent être utilisés avec la connexion, la connexion est limitée, ou bien en cas de changement de changement du nom des interfaces, elle peut être appliquée sur la mauvaise interface."
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:142
 msgid "Whether LLDP is enabled for the connection."
 msgstr "Indique si LLDP est activé pour la connexion."
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:143
 msgid ""
 "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the "
 "connection. LLMNR is a protocol based on the Domain Name System (DNS) packet "
@@ -7744,109 +6935,68 @@ msgid ""
 "interface, resolve: do not register hostname but allow resolving of LLMNR "
 "host names. This feature requires a plugin which supports LLMNR. One such "
 "plugin is dns-systemd-resolved."
-msgstr ""
-"LLMNR est un protocole basé sur le format de paquets DNS (Domain Name "
-"System) qui permet aux hôtes IPv4 et IPv6 d'effectuer la résolution de noms "
-"pour les hôtes sur le même lien local. Les valeurs autorisées sont : oui : "
-"enregistrer nom d'hôte et résolution pour la connexion, non : désactiver "
-"LLMNR pour l'interface, résoudre : ne pas enregistrer nom d'hôte mais "
-"permettre la résolution de noms d'hôtes LLMNR. Cette fonctionnalité "
-"nécessite un plugin qui supporte LLMNR. Un de ces plug-ins est dns-systemd-"
-"resolved."
+msgstr "LLMNR est un protocole basé sur le format de paquets DNS (Domain Name System) qui permet aux hôtes IPv4 et IPv6 d'effectuer la résolution de noms pour les hôtes sur le même lien local. Les valeurs autorisées sont : oui : enregistrer nom d'hôte et résolution pour la connexion, non : désactiver LLMNR pour l'interface, résoudre : ne pas enregistrer nom d'hôte mais permettre la résolution de noms d'hôtes LLMNR. Cette fonctionnalité nécessite un plugin qui supporte LLMNR. Un de ces plug-ins est dns-systemd-resolved."
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.h.in:144
 msgid "Interface name of the master device or UUID of the master connection."
-msgstr ""
-"Nom de l'interface de l'appareil maître ou UUID de la connexion maître."
+msgstr "Nom de l'interface de l'appareil maître ou UUID de la connexion maître."
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:145
 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. This feature requires a plugin which supports mDNS. One such "
 "plugin is dns-systemd-resolved."
-msgstr ""
-"Indique si mDNS est activé pour la connexion. Les valeurs autorisées sont : "
-"oui : enregistrer le nom d'hôte et la résolution pour la connexion, non : "
-"désactiver mDNS pour l'interface, résoudre : ne pas enregistrer le nom "
-"d'hôte mais autoriser la résolution des noms d'hôte mDNS. Cette "
-"fonctionnalité nécessite un plugin qui supporte mDNS. dns-systemd-resolved "
-"est l'un de ces plug-ins."
+msgstr "Indique si mDNS est activé pour la connexion. Les valeurs autorisées sont : oui : enregistrer le nom d'hôte et la résolution pour la connexion, non : désactiver mDNS pour l'interface, résoudre : ne pas enregistrer le nom d'hôte mais autoriser la résolution des noms d'hôte mDNS. Cette fonctionnalité nécessite un plugin qui supporte mDNS. dns-systemd-resolved est l'un de ces plug-ins."
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.h.in:146
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
-msgstr ""
-"Indique si la connexion est mesurée. Lors de la mise à jour de cette "
-"propriété sur une connexion actuellement activée, le changement prend effet "
-"immédiatement."
+msgstr "Indique si la connexion est mesurée. Lors de la mise à jour de cette propriété sur une connexion actuellement activée, le changement prend effet immédiatement."
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "Specifies whether the profile can be active multiple times at a particular "
 "moment. The value is of type NMConnectionMultiConnect."
-msgstr ""
-"Indique si le profil peut être actif plusieurs fois à un moment donné, la "
-"valeur est de type NMConnectionMultiConnect."
+msgstr "Indique si le profil peut être actif plusieurs fois à un moment donné, la valeur est de type NMConnectionMultiConnect."
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.h.in:148
 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 connection; "
-"otherwise users are allowed if and only if they are in this list.  When this "
-"is not empty, the connection can be active only when one of the specified "
-"users is logged into an active session.  Each entry is of the form \"[type]:"
-"[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the "
-"\"user\" [type] is allowed.  Any other values are ignored and reserved for "
-"future use.  [id] is the username that this permission refers to, which may "
-"not contain the \":\" character. Any [reserved] information present must be "
-"ignored and is reserved for future use.  All of [type], [id], and [reserved] "
-"must be valid UTF-8."
-msgstr ""
-"Un tableau de chaînes de caractères définissant l'accès d'un utilisateur "
-"donné à cette connexion.  Si elle est NULL ou vide, tous les utilisateurs "
-"sont autorisés à accéder à cette connexion ; sinon, les utilisateurs sont "
-"autorisés si et seulement s'ils sont dans cette liste.  Lorsque cette option "
-"n'est pas vide, la connexion ne peut être active que si l'un des "
-"utilisateurs spécifiés est connecté à une session active.  Chaque entrée est "
-"de la forme \"[type] :[id] :[réservé]\" ; par exemple, \"user:dcbw:blah\". "
-"Pour l'instant, seul l' \"utilisateur\"[type] est autorisé.  Toutes les "
-"autres valeurs sont ignorées et réservées pour une utilisation future.   "
-"[id] est le nom d'utilisateur auquel se réfère cette permission, qui ne peut "
-"pas contenir le caractère \" : \". Toute information[réservée] présente doit "
-"être ignorée et est réservée pour une utilisation future.  Tous "
-"les[type],[id] et[réservé] doivent être valides UTF-8."
+"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 "
+"connection; otherwise users are allowed if and only if they are in this "
+"list.  When this is not empty, the connection can be active only when one of "
+"the specified users is logged into an active session.  Each entry is of the "
+"form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this "
+"time only the \"user\" [type] is allowed.  Any other values are ignored and "
+"reserved for future use.  [id] is the username that this permission refers "
+"to, which may not contain the \":\" character. Any [reserved] information "
+"present must be ignored and is reserved for future use.  All of [type], "
+"[id], and [reserved] must be valid UTF-8."
+msgstr "Un tableau de chaînes de caractères définissant l'accès d'un utilisateur donné à cette connexion.  Si elle est NULL ou vide, tous les utilisateurs sont autorisés à accéder à cette connexion ; sinon, les utilisateurs sont autorisés si et seulement s'ils sont dans cette liste.  Lorsque cette option n'est pas vide, la connexion ne peut être active que si l'un des utilisateurs spécifiés est connecté à une session active.  Chaque entrée est de la forme \"[type] :[id] :[réservé]\" ; par exemple, \"user:dcbw:blah\". Pour l'instant, seul l' \"utilisateur\"[type] est autorisé.  Toutes les autres valeurs sont ignorées et réservées pour une utilisation future.   [id] est le nom d'utilisateur auquel se réfère cette permission, qui ne peut pas contenir le caractère \" : \". Toute information[réservée] présente doit être ignorée et est réservée pour une utilisation future.  Tous les[type],[id] et[réservé] doivent être valides UTF-8."
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:149
 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 "
 "connection is read-only and cannot be modified."
-msgstr ""
-"FALSE si la connexion peut être modifiée à l'aide de l'interface D-Bus du "
-"service de paramétrage fourni avec les bons privilèges, ou TRUE si la "
-"connexion est en lecture seule et ne peut être modifiée."
+msgstr "FALSE si la connexion peut être modifiée à l'aide de l'interface D-Bus du service de paramétrage fourni avec les bons privilèges, ou TRUE si la connexion est en lecture seule et ne peut être modifiée."
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:150
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
-msgstr ""
-"Liste des UUID de connexion qui doivent être activées lorsque la connexion "
-"de base elle-même est activée, actuellement seules les connexions VPN sont "
-"supportées."
+msgstr "Liste des UUID de connexion qui doivent être activées lorsque la connexion de base elle-même est activée, actuellement seules les connexions VPN sont supportées."
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:151
 msgid ""
-"Setting name of the device type of this slave's master connection (eg, "
-"\"bond\"), or NULL if this connection is not a slave."
-msgstr ""
-"Réglage du nom du type d'appareil de la connexion maître de cet esclave (par "
-"exemple, \"bond\"), ou NULL si cette connexion n'est pas un esclave."
+"Setting name of the device type of this slave's master connection (eg, \"bond"
+"\"), or NULL if this connection is not a slave."
+msgstr "Réglage du nom du type d'appareil de la connexion maître de cet esclave (par exemple, \"bond\"), ou NULL si cette connexion n'est pas un esclave."
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -7875,68 +7025,27 @@ msgid ""
 "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 ""
-"Il s'agit de l'identité de la connexion utilisée à diverses fins. Permet de "
-"configurer plusieurs profils pour partager l'identité. De plus, stable-id "
-"peut contenir des espaces réservés qui sont substitués dynamiquement et "
-"déterministiquement en fonction du contexte. Le stable-id est utilisé pour "
-"générer des adresses privées stables IPv6 avec ipv6.addr-gen-mode=stable-"
-"privacy. Il est également utilisé pour semer l'adresse MAC clonée générée "
-"pour ethernet.cloned-mac-address=stable et wifi.cloned-mac-address=stable. "
-"Il est également utilisé comme identifiant client DHCP avec ipv4.dhcp-client-"
-"id=stable et pour dériver le DUID DHCP avec ipv6.dhcp-duid=stable-"
-"[llt,ll,uuid]. Notez que selon le contexte dans lequel il est utilisé, "
-"d'autres paramètres sont également placés dans l'algorithme de génération. "
-"Par exemple, une clé par hôte est généralement incluse, de sorte que "
-"différents systèmes finissent par générer des ID différents. Ou avec ipv6."
-"addr-gen-mode=stable-privacy, le nom du périphérique est égaleme '$' est "
-"traité spécialement pour effectuer des substitutions dynamiques au moment de "
-"l'exécution. Les valeurs actuellement supportés sont \"${CONNECTION}\", "
-"\"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". Celles-ci créent effectivement "
-"des ID uniques par connexion, par périphérique, par amorçage ou à chaque "
-"fois. Notez que \"${DEVICE}\" correspond au nom de l'interface du "
-"périphérique. Tout modèle non reconnu après \" $ \" est traité mot pour mot, "
-"mais il est réservé pour une utilisation future. Il vous est donc conseillé "
-"d'éviter'$' ou d'y échapper par \"$$\". Par exemple, réglez-le sur "
-"\"${CONNECTION}-${BOOT}-${DEVICE}\" pour créer un identifiant unique pour "
-"cette connexion qui change avec chaque redémarrage et diffère selon "
-"l’interface sur laquelle le profil est activé. Si la valeur n’est pas "
-"définie, une valeur de connexion globale par défaut sera consultée. Si la "
-"valeur n’est toujours pas déterminée, la valeur par défaut est semblable à "
-"celle de \"${CONNECTION}\" et utilise un ID fixe et unique pour la connexion."
-""
+msgstr "Il s'agit de l'identité de la connexion utilisée à diverses fins. Permet de configurer plusieurs profils pour partager l'identité. De plus, stable-id peut contenir des espaces réservés qui sont substitués dynamiquement et déterministiquement en fonction du contexte. Le stable-id est utilisé pour générer des adresses privées stables IPv6 avec ipv6.addr-gen-mode=stable-privacy. Il est également utilisé pour semer l'adresse MAC clonée générée pour ethernet.cloned-mac-address=stable et wifi.cloned-mac-address=stable. Il est également utilisé comme identifiant client DHCP avec ipv4.dhcp-client-id=stable et pour dériver le DUID DHCP avec ipv6.dhcp-duid=stable-[llt,ll,uuid]. Notez que selon le contexte dans lequel il est utilisé, d'autres paramètres sont également placés dans l'algorithme de génération. Par exemple, une clé par hôte est généralement incluse, de sorte que différents systèmes finissent par générer des ID différents. Ou avec ipv6.addr-gen-mode=stable-privacy, le nom du périphérique est égaleme '$' est traité spécialement pour effectuer des substitutions dynamiques au moment de l'exécution. Les valeurs actuellement supportés sont \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". Celles-ci créent effectivement des ID uniques par connexion, par périphérique, par amorçage ou à chaque fois. Notez que \"${DEVICE}\" correspond au nom de l'interface du périphérique. Tout modèle non reconnu après \" $ \" est traité mot pour mot, mais il est réservé pour une utilisation future. Il vous est donc conseillé d'éviter'$' ou d'y échapper par \"$$\". Par exemple, réglez-le sur \"${CONNECTION}-${BOOT}-${DEVICE}\" pour créer un identifiant unique pour cette connexion qui change avec chaque redémarrage et diffère selon l’interface sur laquelle le profil est activé. Si la valeur n’est pas définie, une valeur de connexion globale par défaut sera consultée. Si la valeur n’est toujours pas déterminée, la valeur par défaut est semblable à celle de \"${CONNECTION}\" et utilise un ID fixe et unique pour la connexion."
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
 "timestamp periodically when the connection is active to ensure that an "
 "active connection has the latest timestamp. The property is only meant for "
 "reading (changes to this property will not be preserved)."
-msgstr ""
-"La durée, en secondes, depuis Unix Epoch, pendant lequel la connexion a été "
-"activée pour la dernière fois avec succès. NetworkManager met à jour "
-"périodiquement l'horodatage de connexion lorsque la connexion est active "
-"pour s'assurer qu'une connexion active dispose du dernier horodatage. La "
-"propriété est uniquement destinée à la lecture (les modifications apportées "
-"à cette propriété ne seront pas conservées)."
+msgstr "La durée, en secondes, depuis Unix Epoch, pendant lequel la connexion a été activée pour la dernière fois avec succès. NetworkManager met à jour périodiquement l'horodatage de connexion lorsque la connexion est active pour s'assurer qu'une connexion active dispose du dernier horodatage. La propriété est uniquement destinée à la lecture (les modifications apportées à cette propriété ne seront pas conservées)."
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
 "ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-"
 "hardware dependent connections like VPN or otherwise, should contain the "
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
-msgstr ""
-"Type de base de la connexion. Pour les connexions dépendantes du matériel, "
-"doit contenir le nom du paramètre spécifique au type de matériel (par "
-"exemple, \"802-3-ethernet\" ou \"802-11-wireless\" ou \"bluetooth\", etc), "
-"et pour les connexions non dépendantes du matériel comme VPN ou autre, doit "
-"contenir le nom du paramètre de ce type (par exemple, \"vpn\" ou \"pont\", "
-"etc)."
+msgstr "Type de base de la connexion. Pour les connexions dépendantes du matériel, doit contenir le nom du paramètre spécifique au type de matériel (par exemple, \"802-3-ethernet\" ou \"802-11-wireless\" ou \"bluetooth\", etc), et pour les connexions non dépendantes du matériel comme VPN ou autre, doit contenir le nom du paramètre de ce type (par exemple, \"vpn\" ou \"pont\", etc)."
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:155
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7946,18 +7055,9 @@ msgid ""
 "SSID, mobile broadband network provider, or \"type\" property changes. The "
 "UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, "
 "contains only hexadecimal characters and \"-\")."
-msgstr ""
-"Un identifiant universellement unique pour la connexion, par exemple généré "
-"avec libuuuid, qui doit être attribué lors de la création de la connexion et "
-"ne doit jamais être modifié tant que la connexion s'applique toujours au "
-"même réseau. Par exemple, il ne doit pas être modifié lorsque la propriété "
-"\"id\" ou NMSettingIP4Config change, mais doit être recréé lorsque le SSID "
-"Wi-Fi, le fournisseur de réseau mobile à large bande ou la propriété "
-"\"type\" change. l'UUID doit être au format \"2815492f-7e56-435e-bbd2e9-"
-"2467cdc667 (c-a-d ne doit contenir que des caractères hexadécimaux et \"-\")."
-""
+msgstr "Un identifiant universellement unique pour la connexion, par exemple généré avec libuuuid, qui doit être attribué lors de la création de la connexion et ne doit jamais être modifié tant que la connexion s'applique toujours au même réseau. Par exemple, il ne doit pas être modifié lorsque la propriété \"id\" ou NMSettingIP4Config change, mais doit être recréé lorsque le SSID Wi-Fi, le fournisseur de réseau mobile à large bande ou la propriété \"type\" change. l'UUID doit être au format \"2815492f-7e56-435e-bbd2e9-2467cdc667 (c-a-d ne doit contenir que des caractères hexadécimaux et \"-\")."
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "Timeout in milliseconds to wait for device at startup. During boot, devices "
 "may take a while to be detected by the driver. This property will cause to "
@@ -7966,190 +7066,123 @@ msgid ""
 "NMSettingConnection:interface-name to identify the device that will be "
 "waited for. The value 0 means no wait time. The default value is -1, which "
 "currently has the same meaning as no wait time."
-msgstr ""
-"Délai d'attente en millisecondes au démarrage des périphériques. Pendant le "
-"démarrage, les périphériques peuvent prendre un certain temps avant d'être "
-"détectés par le pilote. Cette propriété retardera NetworkManager-wait-online."
-"service et nm-online pour donner une chance à l'appareil d'apparaître. Notez "
-"que cette propriété ne fonctionne qu'avec NMSettingConnection:interface-name "
-"pour identifier le périphérique qui attendu. La valeur 0 signifie aucun "
-"temps d'attente. La valeur par défaut est -1, qui actuellement est "
-"l'équivalent de la valeur 0"
+msgstr "Délai d'attente en millisecondes au démarrage des périphériques. Pendant le démarrage, les périphériques peuvent prendre un certain temps avant d'être détectés par le pilote. Cette propriété retardera NetworkManager-wait-online.service et nm-online pour donner une chance à l'appareil d'apparaître. Notez que cette propriété ne fonctionne qu'avec NMSettingConnection:interface-name pour identifier le périphérique qui attendu. La valeur 0 signifie aucun temps d'attente. La valeur par défaut est -1, qui actuellement est l'équivalent de la valeur 0"
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
 "connection will be placed in the default zone as defined by the firewall. "
 "When updating this property on a currently activated connection, the change "
 "takes effect immediately."
-msgstr ""
-"Le niveau de confiance d'une connexion. Chaîne libre insensible à la casse "
-"(par exemple \"Home\", \"Work\", \"Public\"), NULL ou zone non spécifiée "
-"signifie que la connexion sera placée dans la zone par défaut définie par le "
-"pare-feu. La modification prend effet immédiatement lorsque cette propriété "
-"est mise à jour sur une connexion actuellement active."
+msgstr "Le niveau de confiance d'une connexion. Chaîne libre insensible à la casse (par exemple \"Home\", \"Work\", \"Public\"), NULL ou zone non spécifiée signifie que la connexion sera placée dans la zone par défaut définie par le pare-feu. La modification prend effet immédiatement lorsque cette propriété est mise à jour sur une connexion actuellement active."
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"Spécifie le NMSettingDcbFlags pour l'application FCoE du DCB  Les "
-"indicateurs peuvent être n'importe quelle combinaison de "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et "
-"NM_SETTING_DCB_FLAG_WILLING (0x4)."
+msgstr "Spécifie le NMSettingDcbFlags pour l'application FCoE du DCB  Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:159
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "Le mode contrôleur FCoE ; soit \"fabric\" (par défaut) ou \"vn2vn\"."
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:160
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"La priorité utilisateur la plus élevée (0 - 7) que les trames FCoE doivent "
-"utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la "
-"propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)."
+msgstr "La priorité utilisateur la plus élevée (0 - 7) que les trames FCoE doivent utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"Spécifie le NMSettingDcbFlags pour l'application FIP du DCB  Les indicateurs "
-"peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING "
-"(0x4)."
+msgstr "Spécifie le NMSettingDcbFlags pour l'application FIP du DCB  Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:162
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"La priorité utilisateur la plus élevée (0 - 7) que les trames FCoE doivent "
-"utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la "
-"propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)."
+msgstr "La priorité utilisateur la plus élevée (0 - 7) que les trames FCoE doivent utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la propriété \"app-fcoe-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"Spécifie le NMSettingDcbFlags pour l'application iSCSI du DCB  Les "
-"indicateurs peuvent être n'importe quelle combinaison de "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et "
-"NM_SETTING_DCB_FLAG_WILLING (0x4)."
+msgstr "Spécifie le NMSettingDcbFlags pour l'application iSCSI du DCB  Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:164
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"La priorité utilisateur la plus élevée (0 - 7) que les trames iSCSI doivent "
-"utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la "
-"propriété \"app-iscsi-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)."
+msgstr "La priorité utilisateur la plus élevée (0 - 7) que les trames iSCSI doivent utiliser, ou -1 pour la priorité par défaut. Utilisée uniquement lorsque la propriété \"app-iscsi-flags\" inclut l'indicateur NM_SETTING_DCB_FLAG_ENABLE (0x1)."
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:165
 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 "
 "priority's assigned group that the priority may use.  The sum of all "
 "percentages for priorities which belong to the same group must total 100 "
 "percents."
-msgstr ""
-"Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la "
-"priorité utilisateur (0 - 7) et la valeur indique le pourcentage de bande "
-"passante du groupe assigné à la priorité que la priorité peut utiliser. la "
-"somme de tous les pourcentages pour les priorités qui appartiennent au même "
-"groupe doit totaliser 100 pourcents."
+msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique le pourcentage de bande passante du groupe assigné à la priorité que la priorité peut utiliser. la somme de tous les pourcentages pour les priorités qui appartiennent au même groupe doit totaliser 100 pourcents."
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:166
 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 "
 "priority should transmit priority pause."
-msgstr ""
-"Un tableau de 8 valeurs booléennes, où l'index du tableau correspond à la "
-"priorité utilisateur (0 - 7) et la valeur indique si la priorité "
-"correspondante doit ou non transmettre une pause de priorité."
+msgstr "Un tableau de 8 valeurs booléennes, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique si la priorité correspondante doit ou non transmettre une pause de priorité."
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"Spécifie les indicateurs NMSettingDcbFlags pour le contrôle de débit "
-"prioritaire (PFC) du DCB, qui peuvent être n'importe quelle combinaison de "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et "
-"NM_SETTING_DCB_FLAG_WILLING (0x4)."
+msgstr "Spécifie les indicateurs NMSettingDcbFlags pour le contrôle de débit prioritaire (PFC) du DCB, qui peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2) et NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:168
 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 "
 "allocated to that group.  Allowed values are 0 - 100, and the sum of all "
 "values must total 100 percents."
-msgstr ""
-"Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à l'ID de "
-"groupe prioritaire (0 - 7) et la valeur indique le pourcentage de la largeur "
-"de bande de liaison allouée à ce groupe.  Les valeurs autorisées sont 0 - "
-"100, et la somme de toutes les valeurs doit totaliser 100 pourcent."
+msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à l'ID de groupe prioritaire (0 - 7) et la valeur indique le pourcentage de la largeur de bande de liaison allouée à ce groupe.  Les valeurs autorisées sont 0 - 100, et la somme de toutes les valeurs doit totaliser 100 pourcent."
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"Spécifie les indicateurs NMSettingDcbFlags des groupes de priorité DCB. Les "
-"indicateurs peuvent être n'importe quelle combinaison de "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), et "
-"NM_SETTING_DCB_FLAG_WILLING (0x4)."
+msgstr "Spécifie les indicateurs NMSettingDcbFlags des groupes de priorité DCB. Les indicateurs peuvent être n'importe quelle combinaison de NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), et NM_SETTING_DCB_FLAG_WILLING (0x4)."
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:170
 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 "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
-msgstr ""
-"Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la "
-"priorité utilisateur (0 - 7) et la valeur indique l'ID de groupe prioritaire."
-"  Les valeurs autorisées d'ID de groupe prioritaire sont 0 - 7 ou 15 pour le "
-"groupe sans restriction."
+msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique l'ID de groupe prioritaire.  Les valeurs autorisées d'ID de groupe prioritaire sont 0 - 7 ou 15 pour le groupe sans restriction."
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:171
 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 "
 "all of the bandwidth allocated to its assigned group."
-msgstr ""
-"Un tableau de 8 valeurs booléennes, où l'index du tableau correspond à la "
-"priorité utilisateur (0 - 7) et la valeur indique si la priorité peut ou non "
-"utiliser toute la bande passante allouée à son groupe attribué."
+msgstr "Un tableau de 8 valeurs booléennes, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique si la priorité peut ou non utiliser toute la bande passante allouée à son groupe attribué."
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:172
 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 "
 "the priority is mapped."
-msgstr ""
-"Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la "
-"priorité utilisateur (0 - 7) et la valeur indique la classe de trafic (0 - "
-"7) à laquelle la priorité est affectée."
+msgstr "Un tableau de 8 valeurs d'uint, où l'index du tableau correspond à la priorité utilisateur (0 - 7) et la valeur indique la classe de trafic (0 - 7) à laquelle la priorité est affectée."
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:173
 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 "
@@ -8158,137 +7191,99 @@ msgid ""
 "to use the correct APN for the user's mobile broadband plan. The APN may "
 "only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section "
 "14.9."
-msgstr ""
-"Nom du point d'accès GPRS spécifiant l'APN utilisé lors de l'établissement "
-"d'une session de données avec le réseau GSM.  L'APN détermine souvent "
-"comment l'utilisateur sera facturé pour l'utilisation de son réseau et si "
-"l'utilisateur a accès à l'Internet ou s'il n'a accès qu'à un endroit gardé "
-"propre à son fournisseur. Il est donc important d'utiliser le bon APN pour "
-"le plan haut débit mobile de l’utilisateur. L'APN ne peut être composé que "
-"des caractères a-z, 0-9, ., et - par GSM 03.60 Section 14.9."
+msgstr "Nom du point d'accès GPRS spécifiant l'APN utilisé lors de l'établissement d'une session de données avec le réseau GSM.  L'APN détermine souvent comment l'utilisateur sera facturé pour l'utilisation de son réseau et si l'utilisateur a accès à l'Internet ou s'il n'a accès qu'à un endroit gardé propre à son fournisseur. Il est donc important d'utiliser le bon APN pour le plan haut débit mobile de l’utilisateur. L'APN ne peut être composé que des caractères a-z, 0-9, ., et - par GSM 03.60 Section 14.9."
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:174
+msgid ""
+"When TRUE, the settings such as APN, username, or password will default to "
+"values that match the network the modem will register to in the Mobile "
+"Broadband Provider database."
+msgstr "Lorsque le paramètre est sur TRUE, les valeurs par défaut des paramètres tels que APN, nom d'utilisateur ou mot de passe correspondent au réseau auquel le modem s'inscrit dans la base de données du fournisseur de services mobiles à large bande."
+
+#: ../clients/common/settings-docs.h.in:175
 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 "
 "specified device."
-msgstr ""
-"L'identifiant unique de l'appareil (tel qu'indiqué par le service de gestion "
-"WWAN) auquel cette connexion s'applique.  Si donné, la connexion ne "
-"s'appliquera qu'à l'appareil spécifié."
+msgstr "L'identifiant unique de l'appareil (tel qu'indiqué par le service de gestion WWAN) auquel cette connexion s'applique.  Si donné, la connexion ne s'appliquera qu'à l'appareil spécifié."
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
-msgstr ""
-"Si sur TRUE, seules les connexions au réseau domestique seront autorisées, "
-"mais les connexions aux réseaux d'itinérance ne seront pas effectuées."
+msgstr "Si sur TRUE, seules les connexions au réseau domestique seront autorisées, mais les connexions aux réseaux d'itinérance ne seront pas effectuées."
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
 "to force the device to register only on the specified network. This can be "
 "used to ensure that the device does not roam when direct roaming control of "
 "the device is not otherwise possible."
-msgstr ""
-"L'ID réseau (format GSM LAI, c'est-à-dire MCC-MNC) pour forcer "
-"l'enregistrement d'un réseau spécifique. Si l'ID réseau est spécifié, "
-"NetworkManager tentera de forcer le périphérique à s'enregistrer uniquement "
-"sur le réseau spécifié. Ceci peut être utilisé pour garantir que le "
-"périphérique n'est pas en itinérance lorsque le contrôle direct roaming "
-"direct du périphérique n’est pas possible."
+msgstr "L'ID réseau (format GSM LAI, c'est-à-dire MCC-MNC) pour forcer l'enregistrement d'un réseau spécifique. Si l'ID réseau est spécifié, NetworkManager tentera de forcer le périphérique à s'enregistrer uniquement sur le réseau spécifié. Ceci peut être utilisé pour garantir que le périphérique n'est pas en itinérance lorsque le contrôle direct roaming direct du périphérique n’est pas possible."
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "Legacy setting that used to help establishing PPP data sessions for GSM-"
 "based modems. Deprecated: 1"
-msgstr ""
-"Numéro à composer lors de l'établissement d'une session de données PPP avec "
-"le réseau mobile à large bande GSM  De nombreux modems n'ont pas besoin de "
-"PPP pour les connexions au réseau mobile et donc cette propriété doit être "
-"laissée vide, ce qui permet à NetworkManager de sélectionner les paramètres "
-"appropriés automatiquement."
+msgstr "Numéro à composer lors de l'établissement d'une session de données PPP avec le réseau mobile à large bande GSM  De nombreux modems n'ont pas besoin de PPP pour les connexions au réseau mobile et donc cette propriété doit être laissée vide, ce qui permet à NetworkManager de sélectionner les paramètres appropriés automatiquement."
 
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:182
 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 "
 "device."
-msgstr ""
-"Si la carte SIM est verrouillée avec un code PIN, elle doit être "
-"déverrouillée avant toute autre opération.  Indiquez ici le code PIN pour "
-"permettre l'utilisation de l'appareil."
+msgstr "Si la carte SIM est verrouillée avec un code PIN, elle doit être déverrouillée avant toute autre opération.  Indiquez ici le code PIN pour permettre l'utilisation de l'appareil."
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:184
 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 "
 "any device also allowed by \"device-id\" which contains a SIM card matching "
 "the given identifier."
-msgstr ""
-"L'identifiant unique de la carte SIM (tel qu'il est donné par le service de "
-"gestion WWAN) auquel cette connexion s'applique. Si donnée, la connexion "
-"s'appliquera à tout appareil également autorisé par \"device-id\" qui "
-"contient une carte SIM correspondant à l'identifiant donné."
+msgstr "L'identifiant unique de la carte SIM (tel qu'il est donné par le service de gestion WWAN) auquel cette connexion s'applique. Si donnée, la connexion s'appliquera à tout appareil également autorisé par \"device-id\" qui contient une carte SIM correspondant à l'identifiant donné."
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
 "connection will apply to any device also allowed by \"device-id\" and \"sim-"
 "id\" which contains a SIM card provisioned by the given operator."
-msgstr ""
-"Une chaîne MCC/MNC telle que \"310260\" ou \"21601\" identifiant l'opérateur "
-"de réseau mobile spécifique auquel cette connexion s'applique.Si donnée, la "
-"connexion s'appliquera à tout dispositif également autorisé par \"device-"
-"id\" et \"sim-id\" qui contient une carte SIM fournie par cet opérateur."
+msgstr "Une chaîne MCC/MNC telle que \"310260\" ou \"21601\" identifiant l'opérateur de réseau mobile spécifique auquel cette connexion s'applique.Si donnée, la connexion s'appliquera à tout dispositif également autorisé par \"device-id\" et \"sim-id\" qui contient une carte SIM fournie par cet opérateur."
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:187
 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 "
 "of the device (i.e. MAC spoofing)."
-msgstr ""
-"Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique "
-"IPoIB dont l'adresse MAC permanente correspond. Cette propriété ne change "
-"pas l'adresse MAC du périphérique (c'est-à-dire l'usurpation d'adresse MAC)."
+msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique IPoIB dont l'adresse MAC permanente correspond. Cette propriété ne change pas l'adresse MAC du périphérique (c'est-à-dire l'usurpation d'adresse MAC)."
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:189
 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 "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
-""
-msgstr ""
-"La clé InfiniBand P_Key à utiliser pour cet appareil. Une valeur de -1 "
-"signifie utiliser la clé par défaut P_Key (alias \"la clé P_Key à l'index "
-"0\"). Sinon, c'est un entier non signé de 16 bits, dont le bit haut est "
-"défini si c'est une \"full membership\" P_Key."
+msgstr "La clé InfiniBand P_Key à utiliser pour cet appareil. Une valeur de -1 signifie utiliser la clé par défaut P_Key (alias \"la clé P_Key à l'index 0\"). Sinon, c'est un entier non signé de 16 bits, dont le bit haut est défini si c'est une \"full membership\" P_Key."
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:190
 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 "
 "setting either this property or \"mac-address\"."
-msgstr ""
-"Le nom de l'interface du dispositif parent de cet appareil. Normalement "
-"NULL, mais si la propriété \"p_key\" est définie, alors vous devez spécifier "
-"le périphérique de base en définissant cette propriété ou \"mac-adresse\"."
+msgstr "Le nom de l'interface du dispositif parent de cet appareil. Normalement NULL, mais si la propriété \"p_key\" est définie, alors vous devez spécifier le périphérique de base en définissant cette propriété ou \"mac-adresse\"."
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr "Le mode de transport IP-over-InfiniBand : \"datagramme\" ou \"connecté\"."
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr "Cette propriété ne s'applique qu'aux tunnels IPv6."
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -8297,110 +7292,80 @@ msgid ""
 "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 ""
-"Les valeurs suivantes sont actuellement prises en charge : "
-"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).  Elles ne sont valides "
-"que pour les tunels IPv6."
+msgstr "Les valeurs suivantes sont actuellement prises en charge : 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).  Elles ne sont valides que pour les tunels IPv6."
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
-msgstr ""
-"L'étiquette de flux à affecter aux paquets du tunnel. Cette propriété "
-"s'applique uniquement aux tunnels IPv6."
+msgstr "L'étiquette de flux à affecter aux paquets du tunnel. Cette propriété s'applique uniquement aux tunnels IPv6."
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:195
 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."
-msgstr ""
-"La clé utilisée pour les paquets d'entrée du tunnel ; la propriété n'est "
-"valide que pour certains modes de tunnel (GRE, IP6GRE), si vide, aucune clé "
-"n'est utilisée."
+msgstr "La clé utilisée pour les paquets d'entrée du tunnel ; la propriété n'est valide que pour certains modes de tunnel (GRE, IP6GRE), si vide, aucune clé n'est utilisée."
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
-msgstr ""
-"Le terminal local du tunnel ; la valeur peut être vide, sinon elle doit "
-"contenir une adresse IPv4 ou IPv6."
+msgstr "Le terminal local du tunnel ; la valeur peut être vide, sinon elle doit contenir une adresse IPv4 ou IPv6."
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
-msgstr ""
-"Le mode tunneling, par exemple NM_IP_TUNNEL_MODE_IPIP (1) ou "
-"NM_IP_TUNNEL_MODE_GRE (2)."
+msgstr "Le mode tunneling, par exemple NM_IP_TUNNEL_MODE_IPIP (1) ou NM_IP_TUNNEL_MODE_GRE (2)."
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
-msgstr ""
-"Si différent de zéro, ne transmet que des paquets de la taille spécifiée ou "
-"plus petits, divisant les paquets plus grands en plusieurs fragments."
+msgstr "Si différent de zéro, ne transmet que des paquets de la taille spécifiée ou plus petits, divisant les paquets plus grands en plusieurs fragments."
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:199
 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 ""
-"La clé utilisée pour les paquets d'entrée du tunnel ; la propriété n'est "
-"valide que pour certains modes de tunnel (GRE, IP6GRE). Si vide, aucune clé "
-"n'est utilisée."
+msgstr "La clé utilisée pour les paquets d'entrée du tunnel ; la propriété n'est valide que pour certains modes de tunnel (GRE, IP6GRE). Si vide, aucune clé n'est utilisée."
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:200
 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 "
 "that interface."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion "
-"parent auquel le nouveau périphérique sera lié de sorte que les paquets "
-"tunnelisés seront uniquement routés via cette interface."
+msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent auquel le nouveau périphérique sera lié de sorte que les paquets tunnelisés seront uniquement routés via cette interface."
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:201
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "S'il faut activer ou non le chemin MTU Discovery sur ce tunnel."
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
-msgstr ""
-"Le point de terminaison distant du tunnel ; la valeur doit contenir une "
-"adresse IPv4 ou IPv6."
+msgstr "Le point de terminaison distant du tunnel ; la valeur doit contenir une adresse IPv4 ou IPv6."
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
-msgstr ""
-"Le champ de type de service (IPv4) ou de classe de trafic (IPv6) à définir "
-"sur les paquets tunnelisés."
+msgstr "Le champ de type de service (IPv4) ou de classe de trafic (IPv6) à définir sur les paquets tunnelisés."
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
-msgstr ""
-"Le TTL à assigner aux paquets tunnelisés. 0 est une valeur spéciale qui "
-"signifie que les paquets héritent de la valeur TTL."
+msgstr "Le TTL à assigner aux paquets tunnelisés. 0 est une valeur spéciale qui signifie que les paquets héritent de la valeur TTL."
 
-#: ../clients/common/settings-docs.h.in:203
-#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:228
 msgid "Array of IP addresses."
 msgstr "Tableau d'adresses IP."
 
-#: ../clients/common/settings-docs.h.in:204
-#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:229
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
@@ -8408,16 +7373,9 @@ msgid ""
 "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."
-msgstr ""
-"Timeout en millisecondes utilisé pour vérifier la présence d'adresses IP "
-"dupliquées sur le réseau. Si un conflit d'adresse est détecté, l'activation "
-"échoue. Une valeur zéro signifie qu'aucune détection d'adresse dupliquée "
-"n'est effectuée ; -1 signifie la valeur par défaut (remplacé par la "
-"configuration ipvx.dad-timeout ou zéro). Une valeur supérieure à zéro est un "
-"timeout en millisecondes. La propriété est actuellement mise en œuvre "
-"uniquement pour IPv4."
+msgstr "Timeout en millisecondes utilisé pour vérifier la présence d'adresses IP dupliquées sur le réseau. Si un conflit d'adresse est détecté, l'activation échoue. Une valeur zéro signifie qu'aucune détection d'adresse dupliquée n'est effectuée ; -1 signifie la valeur par défaut (remplacé par la configuration ipvx.dad-timeout ou zéro). Une valeur supérieure à zéro est un timeout en millisecondes. La propriété est actuellement mise en œuvre uniquement pour IPv4."
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:207
 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 "
@@ -8431,96 +7389,96 @@ msgid ""
 "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 \"duid\" generates a RFC4361-compliant client "
-"identifier based on a hash of the interface name as IAID and /etc/machine-id."
-" The special value \"stable\" is supported to generate a type 0 client "
+"identifier based on a hash of the interface name as IAID and /etc/machine-"
+"id. 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 you set the stable-id, you may want to include the \"${DEVICE}\" or "
 "\"${MAC}\" specifier to get a per-device key. If unset, a globally "
 "configured default is used. If still unset, the default depends on the DHCP "
 "plugin."
-msgstr ""
-"Une chaîne de caractères envoyée au serveur DHCP pour identifier la machine "
-"locale que le serveur DHCP peut utiliser pour personnaliser la location et "
-"les options DHCP. Lorsque la propriété est une chaîne hexadécimale ('aa:bb:"
-"cc'), elle est interprétée comme un ID de client binaire, auquel cas le "
-"premier octet est supposé être le champ 'type' selon RFC 2132 section 9.14 "
-"et les octets restants peuvent correspondre à une adresse matérielle (par "
-"exemple '01:xx:xx:xx:xx:xx:xx:xx' où 1 est le type ARP Ethernet et le reste "
-"est une adresse MAC). Si la propriété n'est pas une chaîne hexadécimale, "
-"elle est considérée comme un identifiant client sans adresse matérielle et "
-"le champ 'type' est mis à 0. Les valeurs spéciales 'mac' et 'perm-mac' sont "
-"supportées; elles utilisent l'adresse MAC actuelle ou permanente du "
-"périphérique pour générer un identifiant client avec un type ethernet (01). "
-"Actuellement, ces options ne fonctionnent que pour les liens de type "
-"ethernet. La valeur spéciale \"stable\" est prise en charge pour générer un "
-"identificateur de client de type 0 basé sur l'identifiant stable-id (voir "
-"connexion.stable-id) et une clé par hôte. Si elle n'est pas activée, une "
-"valeur par défaut configurée globalement sera utilisée. S'il n'est pas "
-"encore paramétré, l’id du client de leasing sera réutilisé."
+msgstr "Une chaîne de caractères envoyée au serveur DHCP pour identifier la machine locale que le serveur DHCP peut utiliser pour personnaliser la location et les options DHCP. Lorsque la propriété est une chaîne hexadécimale ('aa:bb:cc'), elle est interprétée comme un ID de client binaire, auquel cas le premier octet est supposé être le champ 'type' selon RFC 2132 section 9.14 et les octets restants peuvent correspondre à une adresse matérielle (par exemple '01:xx:xx:xx:xx:xx:xx:xx' où 1 est le type ARP Ethernet et le reste est une adresse MAC). Si la propriété n'est pas une chaîne hexadécimale, elle est considérée comme un identifiant client sans adresse matérielle et le champ 'type' est mis à 0. Les valeurs spéciales 'mac' et 'perm-mac' sont supportées; elles utilisent l'adresse MAC actuelle ou permanente du périphérique pour générer un identifiant client avec un type ethernet (01). Actuellement, ces options ne fonctionnent que pour les liens de type ethernet. La valeur spéciale \"stable\" est prise en charge pour générer un identificateur de client de type 0 basé sur l'identifiant stable-id (voir connexion.stable-id) et une clé par hôte. Si elle n'est pas activée, une valeur par défaut configurée globalement sera utilisée. S'il n'est pas encore paramétré, l’id du client de leasing sera réutilisé."
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:208
 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-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
-msgstr ""
-"Si la propriété \"dhcp-send-hostname\" est sur TRUE, alors le FQDN spécifié "
-"sera envoyé au serveur DHCP lors de l'acquisition du leasing. Cette "
-"propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent "
-"être définis simultanément."
+msgstr "Si la propriété \"dhcp-send-hostname\" est sur TRUE, alors le FQDN spécifié sera envoyé au serveur DHCP lors de l'acquisition du leasing. Cette propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent être définis simultanément."
 
-#: ../clients/common/settings-docs.h.in:207
-#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:231
 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-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
-msgstr ""
-"Si la propriété \"dhcp-send-hostname\" est sur TRUE, alors le nom spécifié "
-"sera envoyé au serveur DHCP lors de l'acquisition du leasing. Cette "
-"propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent "
-"être définis simultanément."
+msgstr "Si la propriété \"dhcp-send-hostname\" est sur TRUE, alors le nom spécifié sera envoyé au serveur DHCP lors de l'acquisition du leasing. Cette propriété et \"dhcp-hostname\" sont mutuellement exclusifs et ne peuvent être définis simultanément."
 
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:232
+msgid ""
+"Flags for the DHCP hostname and FQDN. Currently this property only includes "
+"flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
+"flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option "
+"will contain no flag. Otherwise, if no FQDN flag is set and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN "
+"flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is "
+"set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default "
+"is looked up in NetworkManager configuration. If that value is unset or also "
+"NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described "
+"above are sent in the DHCP requests."
+msgstr "Drapeaux pour le nom d'hôte DHCP et le FQDN. Actuellement, cette propriété n'inclut que les drapeaux pour contrôler les drapeaux FQDN définis dans l'option DHCP FQDN. Les indicateurs FQDN pris en charge sont NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) et NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  Lorsqu'aucun drapeau FQDN n'est défini et que NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) est défini, l'option DHCP FQDN ne contient aucun drapeau. Sinon, si aucun code FQDN n'est activé et que NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) n'est pas activé, les codes FQDN standard sont activés dans la requête : NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) pour IPv4 et NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) pour IPv6. Lorsque cette propriété est définie sur la valeur par défaut NM_DHCP_HOSTNAME_FLAG_NONE (0x0), une valeur par défaut globale est recherché dans la configuration de NetworkManager. Si cette valeur est non définie ou également NM_DHCP_HOSTNAME_FLAG_NONE (0x0), alors les drapeaux FQDN standard décrits ci-dessus sont envoyés dans les requêtes DHCP."
+
+#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:233
+msgid ""
+"A string containing the \"Identity Association Identifier\" (IAID) used by "
+"the DHCP client. The property is a 32-bit decimal value or a special value "
+"among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac"
+"\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC "
+"address are used as IAID. When set to \"ifname\", the IAID is computed by "
+"hashing the interface name. The special value \"stable\" can be used to "
+"generate an IAID based on the stable-id (see connection.stable-id), a per-"
+"host key and the interface name. When the property is unset, the value from "
+"global configuration is used; if no global default is set then the IAID is "
+"assumed to be \"ifname\". Note that at the moment this property is ignored "
+"for IPv6 by dhclient, which always derives the IAID from the MAC address."
+msgstr "Une chaîne contenant \"Identity Association Identifier\" (IAID) utilisé par le client DHCP. La propriété est une valeur décimale de 32 bits ou une valeur spéciale parmi \"mac\", \"perm-mac\", \"ifname\" et \"stable\". Lorsqu'il est réglé sur \"mac\" (ou \"perm-mac\"), les 4 derniers octets de l'adresse MAC actuelle (ou permanente) sont utilisés comme IAID. Lorsqu'il est défini à \"ifname\", l'IAID est calculé en hachant le nom de l'interface. La valeur spéciale \"stable\" permet de générer un IAID basé sur le stable-id (voir connection.stable-id), une clé par hôte et le nom de l'interface. Lorsque la propriété n'est pas définie, la valeur de la configuration globale est utilisée ; si aucun défaut global n'est défini, alors l'IAID est supposé être \"ifname\". Notez qu'à l'heure actuelle cette propriété est ignorée pour IPv6 par dhclient, qui dérive toujours l'IAID de l'adresse MAC."
+
+#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:234
 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 "
 "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."
-msgstr ""
-"Si sur TRUE, un nom d’hôte est envoyé au serveur DHCP lors de l’acquisition "
-"d’un leasing. Certains serveurs DHCP utilisent ce nom d'hôte pour mettre à "
-"jour les bases de données DNS, fournissant essentiellement un nom d'hôte "
-"statique pour l'ordinateur. Si la propriété \"dhcp-hostname\" est NULL et "
-"que cette propriété est TRUE, le nom d'hôte permanent actuel de l'ordinateur "
-"est envoyé."
+msgstr "Si sur TRUE, un nom d’hôte est envoyé au serveur DHCP lors de l’acquisition d’un leasing. Certains serveurs DHCP utilisent ce nom d'hôte pour mettre à jour les bases de données DNS, fournissant essentiellement un nom d'hôte statique pour l'ordinateur. Si la propriété \"dhcp-hostname\" est NULL et que cette propriété est TRUE, le nom d'hôte permanent actuel de l'ordinateur est envoyé."
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:235
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "Un délai d'attente pour une transaction DHCP en secondes."
 
-#: ../clients/common/settings-docs.h.in:210
-#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:236
 msgid "Array of IP addresses of DNS servers."
 msgstr "Tableau d'adresses IP des serveurs DNS."
 
-#: ../clients/common/settings-docs.h.in:211
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:237
 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 "
 "use default options. This is distinct from an empty list of properties."
-msgstr ""
-"Tableau d'options DNS tel que décrit dans le fichier man 5 resolv.conf. NULL "
-"signifie que les options sont désactivées et laissées par défaut. Dans ce "
-"cas, NetworkManager utilisera les options par défaut, ce qui est différent "
-"d'une liste de propriétés vide."
+msgstr "Tableau d'options DNS tel que décrit dans le fichier man 5 resolv.conf. NULL signifie que les options sont désactivées et laissées par défaut. Dans ce cas, NetworkManager utilisera les options par défaut, ce qui est différent d'une liste de propriétés vide."
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:238
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
 "this setting.  A lower value is better (higher priority). Zero selects a "
@@ -8538,88 +7496,50 @@ msgid ""
 "lowest priority value will be used. When using a DNS resolver that supports "
 "Conditional Forwarding 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 ""
-"Priorité des serveurs DNS : la priorité relative des serveurs DNS spécifiée "
-"par ce paramètre. Une valeur inférieure est meilleure (priorité supérieure) "
-"Zéro sélectionne la valeur par défaut, qui est 50 pour les VPNs et 100 pour "
-"les autres connexions. Notez que la priorité est d’ordonnancer les "
-"paramètres DNS pour plusieurs connexions actives. Ne désambiguise pas "
-"plusieurs serveurs DNS dans le même profil de connexion. Avec dns = default, "
-"les serveurs avec priorité supérieure seront au dessus de resolv.conf. Pour "
-"donner la priorité à un autre serveur sur la même connexion, il suffit d’en "
-"spécifier l’ordre. Lorsque plusieurs périphériques ont des configuration "
-"avec la même priorité, on préférera celui qui a une route active par défaut. "
-"Le valeurs négatives ont pour effet spécial d’exclure les configurations "
-"ayant une valeur de priorité plus élevée; donc en présence d'au moins une "
-"priorité négative, seuls les serveurs DNS des connexions ayant la valeur de "
-"priorité la plus basse seront utilisés. Lors de l'utilisation d'un résolveur "
-"DNS qui prend en charge les DNS qui supportent les transmissions "
-"conditionnelles comme dns=dnsmasq ou dns=systemd-resolved, chaque connexion "
-"est utilisée pour interroger les domaines de recherche  dans sa liste de "
-"recherche.  Les requêtes pour les domaines qui ne figurent dans aucune liste "
-"de recherche sont acheminées par des connexions ayant le domaine générique "
-"spécial '~.', qui est ajouté automatiquement aux connexions ayant la route "
-"par défaut (ou peut être ajouté manuellement).  Lorsque plusieurs connexions "
-"spécifient le même domaine, celui qui a la priorité la plus élevée (valeur "
-"numérique la plus basse) gagne.  Si une connexion spécifie un domaine qui "
-"est un sous-domaine d'un autre domaine avec une valeur de priorité DNS "
-"négative, le sous-domaine est ignoré."
+"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 "Priorité des serveurs DNS : la priorité relative des serveurs DNS spécifiée par ce paramètre. Une valeur inférieure est meilleure (priorité supérieure) Zéro sélectionne la valeur par défaut, qui est 50 pour les VPNs et 100 pour les autres connexions. Notez que la priorité est d’ordonnancer les paramètres DNS pour plusieurs connexions actives. Ne désambiguise pas plusieurs serveurs DNS dans le même profil de connexion. Avec dns = default, les serveurs avec priorité supérieure seront au dessus de resolv.conf. Pour donner la priorité à un autre serveur sur la même connexion, il suffit d’en spécifier l’ordre. Lorsque plusieurs périphériques ont des configuration avec la même priorité, on préférera celui qui a une route active par défaut. Le valeurs négatives ont pour effet spécial d’exclure les configurations ayant une valeur de priorité plus élevée; donc en présence d'au moins une priorité négative, seuls les serveurs DNS des connexions ayant la valeur de priorité la plus basse seront utilisés. Lors de l'utilisation d'un résolveur DNS qui prend en charge les DNS qui supportent les transmissions conditionnelles comme dns=dnsmasq ou dns=systemd-resolved, chaque connexion est utilisée pour interroger les domaines de recherche  dans sa liste de recherche.  Les requêtes pour les domaines qui ne figurent dans aucune liste de recherche sont acheminées par des connexions ayant le domaine générique spécial '~.', qui est ajouté automatiquement aux connexions ayant la route par défaut (ou peut être ajouté manuellement).  Lorsque plusieurs connexions spécifient le même domaine, celui qui a la priorité la plus élevée (valeur numérique la plus basse) gagne.  Si une connexion spécifie un domaine qui est un sous-domaine d'un autre domaine avec une valeur de priorité DNS négative, le sous-domaine est ignoré."
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:239
 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 ""
-"Tableau de domaines de recherche DNS. Les domaines commençant par un tilde "
-"('~') sont considérés comme des domaines de 'routage' et ne sont utilisés "
-"que pour décider de l'interface sur laquelle une requête doit être transmise "
-"; ils ne sont pas utilisés pour compléter des noms d'hôtes non qualifiés."
+msgstr "Tableau de domaines de recherche DNS. Les domaines commençant par un tilde ('~') sont considérés comme des domaines de 'routage' et ne sont utilisés que pour décider de l'interface sur laquelle une requête doit être transmise ; ils ne sont pas utilisés pour compléter des noms d'hôtes non qualifiés."
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:240
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
-msgstr ""
-"La passerelle associée à cette configuration, qui n'a de sens que si l'on "
-"définit également des \"adresses\"."
+msgstr "La passerelle associée à cette configuration, qui n'a de sens que si l'on définit également des \"adresses\"."
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:241
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
 "and search domains specified in the \"dns\" and \"dns-search\" properties, "
 "if any, are used."
-msgstr ""
-"Lorsque \"method\" est définie sur \"auto\" et cette propriété sur TRUE, les "
-"serveurs de noms et les domaines de recherche configurés automatiquement "
-"sont ignorés et seuls les serveurs de noms et les domaines de recherche "
-"spécifiés dans les propriétés \"dns\" et \"dns-search\", le cas échéant, "
-"sont utilisés."
+msgstr "Lorsque \"method\" est définie sur \"auto\" et cette propriété sur TRUE, les serveurs de noms et les domaines de recherche configurés automatiquement sont ignorés et seuls les serveurs de noms et les domaines de recherche spécifiés dans les propriétés \"dns\" et \"dns-search\", le cas échéant, sont utilisés."
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
-msgstr ""
-"Lorsque \"method\" est défini sur \"auto\" et cette propriété sur TRUE, les "
-"routes configurées automatiquement sont ignorées et seules les routes "
-"spécifiées dans la propriété \"routes\", le cas échéant, sont utilisées."
+msgstr "Lorsque \"method\" est défini sur \"auto\" et cette propriété sur TRUE, les routes configurées automatiquement sont ignorées et seules les routes spécifiées dans la propriété \"routes\", le cas échéant, sont utilisées."
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:244
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -8627,57 +7547,34 @@ msgid ""
 "fail.  For example, in IPv6-only networks, setting this property to TRUE on "
 "the NMSettingIP4Config allows the overall network configuration to succeed "
 "if IPv4 configuration fails but IPv6 configuration completes successfully."
-msgstr ""
-"si défini sur TRUE, laissez la configuration réseau globale se poursuivre "
-"même si la configuration spécifiée par cette propriété est dépassée.  Notez "
-"qu'au moins une configuration IP doit réussir ou la configuration réseau "
-"globale échouera toujours.  Par exemple, dans les réseaux IPv6 uniquement, "
-"définir cette propriété à TRUE sur NMSettingIP4Config permet à la "
-"configuration réseau globale d’aboutir si la configuration IPv4 échoue mais "
-"que la configuration IPv6 s’achève correctement."
+msgstr "si défini sur TRUE, laissez la configuration réseau globale se poursuivre même si la configuration spécifiée par cette propriété est dépassée.  Notez qu'au moins une configuration IP doit réussir ou la configuration réseau globale échouera toujours.  Par exemple, dans les réseaux IPv6 uniquement, définir cette propriété à TRUE sur NMSettingIP4Config permet à la configuration réseau globale d’aboutir si la configuration IPv4 échoue mais que la configuration IPv6 s’achève correctement."
 
-#: ../clients/common/settings-docs.h.in:218
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
-"subclass-specific documentation for other values. In general, for the "
-"\"auto\" method, properties such as \"dns\" and \"routes\" specify "
-"information that is added on to the information returned from automatic "
-"configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" "
-"properties modify this behavior. For methods that imply no upstream network, "
-"such as \"shared\" or \"link-local\", these properties must be empty. For "
-"IPv4 method \"shared\", the IP subnet can be configured by adding one manual "
-"IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared "
-"method must be configured on the interface which shares the internet to a "
-"subnet, not on the uplink which is shared."
-msgstr ""
-"Méthode de configuration IP. NMSettingIP4Config et NMSettingIP6Config "
-"supportent tous les deux \"auto\", \"manual\" et \"link-local\". Reportez-"
-"vous à la documentation spécifique à la sous-classe pour obtenir d'autres "
-"valeurs. En général, pour la méthode \"auto\", les propriétés telles que "
-"\"dns\" et \"routes\" spécifient des informations qui s'ajoutent aux "
-"informations renvoyées par la configuration automatique.  Les propriétés "
-"\"ignore-auto-routes\" et \"ignore-auto-dns\" modifient ce comportement. "
-"Pour les méthodes qui n'impliquent aucun réseau amont, telles que \"shared\" "
-"ou \"link-local\", ces propriétés doivent être vides. Pour la méthode IPv4 "
-"\"partagée\", le sous-réseau IP peut être configuré en ajoutant une adresse "
-"IPv4 manuelle, sinon 10.42.x.0/24 est choisi. Notez que la méthode partagée "
-"doit être configurée sur l'interface qui partage Internet avec un sous-"
-"réseau, et non sur la liaison montante qui est partagée."
+"subclass-specific documentation for other values. In general, for the \"auto"
+"\" method, properties such as \"dns\" and \"routes\" specify information "
+"that is added on to the information returned from automatic configuration.  "
+"The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this "
+"behavior. For methods that imply no upstream network, such as \"shared\" or "
+"\"link-local\", these properties must be empty. For IPv4 method \"shared\", "
+"the IP subnet can be configured by adding one manual IPv4 address or "
+"otherwise 10.42.x.0/24 is chosen. Note that the shared method must be "
+"configured on the interface which shares the internet to a subnet, not on "
+"the uplink which is shared."
+msgstr "Méthode de configuration IP. NMSettingIP4Config et NMSettingIP6Config supportent tous les deux \"auto\", \"manual\" et \"link-local\". Reportez-vous à la documentation spécifique à la sous-classe pour obtenir d'autres valeurs. En général, pour la méthode \"auto\", les propriétés telles que \"dns\" et \"routes\" spécifient des informations qui s'ajoutent aux informations renvoyées par la configuration automatique.  Les propriétés \"ignore-auto-routes\" et \"ignore-auto-dns\" modifient ce comportement. Pour les méthodes qui n'impliquent aucun réseau amont, telles que \"shared\" ou \"link-local\", ces propriétés doivent être vides. Pour la méthode IPv4 \"partagée\", le sous-réseau IP peut être configuré en ajoutant une adresse IPv4 manuelle, sinon 10.42.x.0/24 est choisi. Notez que la méthode partagée doit être configurée sur l'interface qui partage Internet avec un sous-réseau, et non sur la liaison montante qui est partagée."
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:246
 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."
-msgstr ""
-"Si TRUE, cette connexion ne sera jamais la connexion par défaut pour ce type "
-"d'IP, ce qui signifie que NetworkManager ne lui assignera jamais la route "
-"par défaut."
+msgstr "Si TRUE, cette connexion ne sera jamais la connexion par défaut pour ce type d'IP, ce qui signifie que NetworkManager ne lui assignera jamais la route par défaut."
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:247
 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 "
@@ -8686,19 +7583,10 @@ msgid ""
 "default route. Note that for IPv6, the kernel accepts zero (0) but coerces "
 "it to 1024 (user default). Hence, setting this property to zero effectively "
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
-msgstr ""
-"La métrique par défaut pour les routes qui ne spécifient pas explicitement "
-"une métrique. La valeur par défaut -1 signifie que la métrique est choisie "
-"automatiquement en fonction du type de dispositif. La métrique s'applique "
-"aux routes dynamiques, aux routes manuelles (statiques) qui n'ont pas de "
-"paramètre métrique explicite, aux routes de préfixe d'adresse et à la route "
-"par défaut. Notez que pour IPv6, le noyau accepte zéro (0) mais le contraint "
-"à 1024 (utilisateur par défaut). Par conséquent, mettre cette propriété à "
-"zéro signifie qu'il faut la mettre à 1024. Pour IPv4, zéro est une valeur "
-"normale de métrique."
+msgstr "La métrique par défaut pour les routes qui ne spécifient pas explicitement une métrique. La valeur par défaut -1 signifie que la métrique est choisie automatiquement en fonction du type de dispositif. La métrique s'applique aux routes dynamiques, aux routes manuelles (statiques) qui n'ont pas de paramètre métrique explicite, aux routes de préfixe d'adresse et à la route par défaut. Notez que pour IPv6, le noyau accepte zéro (0) mais le contraint à 1024 (utilisateur par défaut). Par conséquent, mettre cette propriété à zéro signifie qu'il faut la mettre à 1024. Pour IPv4, zéro est une valeur normale de métrique."
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8713,29 +7601,14 @@ msgid ""
 "will not delete any extraneous routes from tables except the main table. "
 "This is to preserve backward compatibility for users who manage routing "
 "tables outside of NetworkManager."
-msgstr ""
-"Active le routage de stratégie (routage source) et définit la table de "
-"routage utilisée lors de l'ajout de routes. Ceci affecte toutes les routes, "
-"y compris les routes de périphériques, IPv4LL, DHCP, SLAAC, les routes par "
-"défaut et les routes statiques. Mais notez que les routes statiques peuvent "
-"écraser individuellement le paramètre en spécifiant explicitement une table "
-"de routage non nulle. Si le réglage de table est laissé à zéro, il peut être "
-"écrasé via la configuration globale. Si la propriété est nulle même après "
-"l'application de la valeur de configuration globale, le routage des "
-"stratégies est désactivé pour la famille d'adresses de cette connexion. Le "
-"routage de stratégie désactivé signifie que NetworkManager ajoutera toutes "
-"les routes à la table principale (sauf les routes statiques qui configurent "
-"explicitement une table différente). En outre, NetworkManager ne supprimera "
-"les routes extrinsèques aux tables, à l'exception de la table principale, "
-"ceci afin de préserver la rétrocompatibilité pour les utilisateurs qui "
-"gèrent les tables de routage en dehors de NetworkManager."
+msgstr "Active le routage de stratégie (routage source) et définit la table de routage utilisée lors de l'ajout de routes. Ceci affecte toutes les routes, y compris les routes de périphériques, IPv4LL, DHCP, SLAAC, les routes par défaut et les routes statiques. Mais notez que les routes statiques peuvent écraser individuellement le paramètre en spécifiant explicitement une table de routage non nulle. Si le réglage de table est laissé à zéro, il peut être écrasé via la configuration globale. Si la propriété est nulle même après l'application de la valeur de configuration globale, le routage des stratégies est désactivé pour la famille d'adresses de cette connexion. Le routage de stratégie désactivé signifie que NetworkManager ajoutera toutes les routes à la table principale (sauf les routes statiques qui configurent explicitement une table différente). En outre, NetworkManager ne supprimera les routes extrinsèques aux tables, à l'exception de la table principale, ceci afin de préserver la rétrocompatibilité pour les utilisateurs qui gèrent les tables de routage en dehors de NetworkManager."
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:249
 msgid "Array of IP routes."
 msgstr "Tale de routes IP."
 
-#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:227
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8755,29 +7628,9 @@ msgid ""
 "upgrade from older versions. Note that this setting is distinct from the "
 "Privacy Extensions as configured by \"ip6-privacy\" property and it does not "
 "affect the temporary addresses configured with this option."
-msgstr ""
-"Configurez la méthode de création de l'adresse à utiliser avec "
-"l'autoconfiguration d'adresse sans état RFC4862 IPv6. Les valeurs autorisées "
-"sont : NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) ou "
-"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). Si la propriété est "
-"définie sur EUI64, les adresses seront générées à l'aide des jetons "
-"d'interface dérivés de l'adresse matérielle. Cela permet à la partie hôte de "
-"l'adresse de rester constante, ce qui permet de suivre la présence de l'hôte "
-"lorsqu'il change de réseau. L'adresse change lorsque le matériel de "
-"l'interface est remplacé. La valeur stable-privacy permet d'utiliser le "
-"hachage cryptographique sécurisé d'une clé secrète spécifique à l'hôte avec "
-"l'identifiant stable de la connexion et l'adresse réseau comme spécifié par "
-"RFC7217. Cela rend impossible l'utilisation de la présence de l'hôte address "
-"track et rend l'adresse stable lorsque le matériel de l'interface réseau est "
-"remplacé. Sur le D-Bus, l'absence d'un réglage de mode addr-gen équivaut à "
-"permettre une protection stable de la vie privée. Pour le plugin keyfile, "
-"l'absence du paramètre sur le disque signifie EUI64 pour que la propriété ne "
-"change pas lors de la mise à jour par rapport aux anciennes versions. Notez "
-"que ce paramètre est distinct des extensions de confidentialité configurées "
-"par la propriété \"ip6-privacy\" et n'affecte pas les adresses temporaires "
-"configurées avec cette option."
+msgstr "Configurez la méthode de création de l'adresse à utiliser avec l'autoconfiguration d'adresse sans état RFC4862 IPv6. Les valeurs autorisées sont : NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) ou NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1). Si la propriété est définie sur EUI64, les adresses seront générées à l'aide des jetons d'interface dérivés de l'adresse matérielle. Cela permet à la partie hôte de l'adresse de rester constante, ce qui permet de suivre la présence de l'hôte lorsqu'il change de réseau. L'adresse change lorsque le matériel de l'interface est remplacé. La valeur stable-privacy permet d'utiliser le hachage cryptographique sécurisé d'une clé secrète spécifique à l'hôte avec l'identifiant stable de la connexion et l'adresse réseau comme spécifié par RFC7217. Cela rend impossible l'utilisation de la présence de l'hôte address track et rend l'adresse stable lorsque le matériel de l'interface réseau est remplacé. Sur le D-Bus, l'absence d'un réglage de mode addr-gen équivaut à permettre une protection stable de la vie privée. Pour le plugin keyfile, l'absence du paramètre sur le disque signifie EUI64 pour que la propriété ne change pas lors de la mise à jour par rapport aux anciennes versions. Notez que ce paramètre est distinct des extensions de confidentialité configurées par la propriété \"ip6-privacy\" et n'affecte pas les adresses temporaires configurées avec cette option."
 
-#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:230
 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 "
@@ -8804,34 +7657,9 @@ msgid ""
 "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 ""
-"Chaîne contenant l'identificateur unique DHCPv6 (DUID) utilisé par le client "
-"dhcp pour s'identifier aux serveurs DHCPv6 (RFC 3315). Le DUID est porté "
-"dans l'option Client Identifier. Si la propriété est une chaîne hexadécimale "
-"('aa:bbb:cc'), elle est interprétée comme un DUID binaire et remplie comme "
-"une valeur opaque dans l'option Client Identifier. La valeur spéciale "
-"\"lease\" permet de récupérer le DUID précédemment utilisé dans le fichier "
-"de location appartenant à la connexion. Si aucun DUID n'est trouvé et que "
-"\"dhclient\" est le client dhcp configuré, le DUID est recherché dans le "
-"fichier de location dhclient du système. Si aucun DUID n'est trouvé, ou si "
-"un autre client dhcp est utilisé, un DUID-UUID global et permanent (RFC "
-"6355) sera généré à partir du machine-id. Les valeurs spéciales \"llt\" et "
-"\"ll\" génèrent un DUID de type LLT ou LL (voir RFC 3315) basé sur l'adresse "
-"MAC actuelle de l'appareil. Afin d'essayer de fournir un DUID-LLT stable, le "
-"champ d'heure contiendra un horodatage constant qui sera utilisé globalement "
-"(pour tous les profils) et persisté sur le disque. Les valeurs spéciales "
-"\"stable-llt\", \"stable-llt\" et \"stable-uuid\" génèrent un DUID du type "
-"correspondant, dérivé de l'identifiant stable de la connexion et d'une clé "
-"unique par hôte. Ainsi, l'adresse de la couche de liens de \"stable-ll\" et "
-"\"stable-llt\" sera une adresse générée dérivée de l'identifiant stable. La "
-"valeur de temps DUID-LLT de l'option \"stable-llt\" sera choisie dans un "
-"intervalle de temps statique de trois ans (la limite supérieure de "
-"l'intervalle est la même horodatage constant utilisé dans \"llt\"). Lorsque "
-"la propriété n'est pas définie, la valeur globale fournie pour \"ipv6.dhcp-"
-"duid\" est utilisée. Si aucune valeur globale n'est fournie, la valeur par "
-"défaut de la \"location\" est présumée."
+msgstr "Chaîne contenant l'identificateur unique DHCPv6 (DUID) utilisé par le client dhcp pour s'identifier aux serveurs DHCPv6 (RFC 3315). Le DUID est porté dans l'option Client Identifier. Si la propriété est une chaîne hexadécimale ('aa:bbb:cc'), elle est interprétée comme un DUID binaire et remplie comme une valeur opaque dans l'option Client Identifier. La valeur spéciale \"lease\" permet de récupérer le DUID précédemment utilisé dans le fichier de location appartenant à la connexion. Si aucun DUID n'est trouvé et que \"dhclient\" est le client dhcp configuré, le DUID est recherché dans le fichier de location dhclient du système. Si aucun DUID n'est trouvé, ou si un autre client dhcp est utilisé, un DUID-UUID global et permanent (RFC 6355) sera généré à partir du machine-id. Les valeurs spéciales \"llt\" et \"ll\" génèrent un DUID de type LLT ou LL (voir RFC 3315) basé sur l'adresse MAC actuelle de l'appareil. Afin d'essayer de fournir un DUID-LLT stable, le champ d'heure contiendra un horodatage constant qui sera utilisé globalement (pour tous les profils) et persisté sur le disque. Les valeurs spéciales \"stable-llt\", \"stable-llt\" et \"stable-uuid\" génèrent un DUID du type correspondant, dérivé de l'identifiant stable de la connexion et d'une clé unique par hôte. Ainsi, l'adresse de la couche de liens de \"stable-ll\" et \"stable-llt\" sera une adresse générée dérivée de l'identifiant stable. La valeur de temps DUID-LLT de l'option \"stable-llt\" sera choisie dans un intervalle de temps statique de trois ans (la limite supérieure de l'intervalle est la même horodatage constant utilisé dans \"llt\"). Lorsque la propriété n'est pas définie, la valeur globale fournie pour \"ipv6.dhcp-duid\" est utilisée. Si aucune valeur globale n'est fournie, la valeur par défaut de la \"location\" est présumée."
 
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:243
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8846,428 +7674,326 @@ msgid ""
 "Privacy addresses that can be enabled with the \"addr-gen-mode\" property's "
 "\"stable-privacy\" setting as another way of avoiding host tracking with "
 "IPv6 addresses."
-msgstr ""
-"Configurez les extensions de confidentialité IPv6 pour SLAAC, décrites dans "
-"la RFC4941. Si cette option est activée, le noyau génère une adresse IPv6 "
-"temporaire en plus de l'adresse publique générée à partir de l'adresse MAC "
-"via EUI-64 modifiée.  Cela améliore la protection de la vie privée, mais "
-"pourrait causer des problèmes dans certaines applications.  Les valeurs "
-"autorisées sont : 1 : inconnu, 0 : désactivé, 1 : activé (préfère l'adresse "
-"publique), 2 : activé (préfère les adresses temporaires). Avoir un paramètre "
-"par connexion réglé sur \"-1\" (inconnu) signifie un retour à la "
-"configuration globale \"ipv6.ip6.ip6-privacy\". Si la configuration globale "
-"n'est pas spécifiée ou est définie sur \"-1\", lire \"/proc/sys/net/ipv6/"
-"conf/default/use_tempaddr\" à la place. Notez que ce paramètre est distinct "
-"des adresses Stable Privacy qui peuvent être activées avec le paramètre "
-"\"stable-privacy\" de la propriété \"addr-gen-mode\" comme un autre moyen "
-"d'éviter le suivi des hôtes avec des adresses IPv6."
+msgstr "Configurez les extensions de confidentialité IPv6 pour SLAAC, décrites dans la RFC4941. Si cette option est activée, le noyau génère une adresse IPv6 temporaire en plus de l'adresse publique générée à partir de l'adresse MAC via EUI-64 modifiée.  Cela améliore la protection de la vie privée, mais pourrait causer des problèmes dans certaines applications.  Les valeurs autorisées sont : 1 : inconnu, 0 : désactivé, 1 : activé (préfère l'adresse publique), 2 : activé (préfère les adresses temporaires). Avoir un paramètre par connexion réglé sur \"-1\" (inconnu) signifie un retour à la configuration globale \"ipv6.ip6.ip6-privacy\". Si la configuration globale n'est pas spécifiée ou est définie sur \"-1\", lire \"/proc/sys/net/ipv6/conf/default/use_tempaddr\" à la place. Notez que ce paramètre est distinct des adresses Stable Privacy qui peuvent être activées avec le paramètre \"stable-privacy\" de la propriété \"addr-gen-mode\" comme un autre moyen d'éviter le suivi des hôtes avec des adresses IPv6."
 
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
-msgstr ""
-"Configurez le jeton pour les identificateurs d'interface à jeton IPv6 IPv6 "
-"de draft-chown-6man-tokenised-ipv6-identifiers-02. Utile dans le mode eui64 "
-"addr-gen."
+msgstr "Configurez le jeton pour les identificateurs d'interface à jeton IPv6 IPv6 de draft-chown-6man-tokenised-ipv6-identifiers-02. Utile dans le mode eui64 addr-gen."
 
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:251
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "Indique si le trafic transmis doit être crypté."
 
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
-msgstr ""
-"Le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement."
+msgstr "Le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement."
 
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:253
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "Marqueurs indiquant comment gérer la propriété \"mka-cak\"."
 
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
-msgstr ""
-"Le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement."
+msgstr "Le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement."
 
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:255
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
-msgstr ""
-"Indique si le CAK (Connectivity Association Key) pré-partagé pour MACsec Key "
-"Agreement a été obtenu."
+msgstr "Indique si le CAK (Connectivity Association Key) pré-partagé pour MACsec Key Agreement a été obtenu."
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:256
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion "
-"parent à partir duquel cette interface MACSEC doit être créée.  Si cette "
-"propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-"
-"3-ethernet\" avec une propriété \"mac-address\"."
+msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface MACSEC doit être créée.  Si cette propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-3-ethernet\" avec une propriété \"mac-address\"."
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
-msgstr ""
-"La composante port du SCI (Secure Channel Identifier), entre 1 et 65534."
+msgstr "La composante port du SCI (Secure Channel Identifier), entre 1 et 65534."
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "Specifies whether the SCI (Secure Channel Identifier) is included in every "
 "packet."
-msgstr ""
-"Indique si le SCI (Secure Channel Identifier) est inclus dans chaque paquet."
+msgstr "Indique si le SCI (Secure Channel Identifier) est inclus dans chaque paquet."
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:259
 msgid "Specifies the validation mode for incoming frames."
 msgstr "Spécifie le mode de validation des trames entrantes."
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:260
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
-msgstr ""
-"Le mode macvlan, qui spécifie le mécanisme de communication entre plusieurs "
-"macvlans d'un périphérique inférieur identique."
+msgstr "Le mode macvlan, qui spécifie le mécanisme de communication entre plusieurs macvlans d'un périphérique inférieur identique."
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:261
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion "
-"parent à partir duquel cette interface MACSEC doit être créée.  Si cette "
-"propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-"
-"3-ethernet\" avec une propriété \"mac-address\"."
+msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface MACSEC doit être créée.  Si cette propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-3-ethernet\" avec une propriété \"mac-address\"."
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:262
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "Si l'interface doit être mise en mode « promiscuous »."
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:263
 msgid "Whether the interface should be a MACVTAP."
 msgstr "Indique si l'interface doit être une MACVTAP."
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
-"A list of interface names to match. Each element is a shell wildcard pattern."
-"  When an element is prefixed with exclamation mark (!) the condition is "
-"inverted. A candidate interface name is considered matching when both these "
-"conditions are satisfied: (a) any of the elements not prefixed with '!' "
-"matches or there aren't such elements; (b) none of the elements prefixed "
-"with '!' match."
-msgstr ""
-"Une liste de noms d'interface à faire correspondre. Chaque élément est un "
-"caractères génériques de ligne de commande. Lorsqu'un élément est précédé "
-"d'un point d'exclamation ( !), la condition est inversée ; un nom "
-"d'interface candidat est considéré comme correspondant lorsque ces deux "
-"conditions sont remplies : (a) les éléments non précédés de '!' "
-"correspondent ou il n'existe aucun élément ; (b) aucun des éléments précédés "
-"de '' correspondent."
+"A list of interface names to match. Each element is a shell wildcard "
+"pattern.  When an element is prefixed with exclamation mark (!) the "
+"condition is inverted. A candidate interface name is considered matching "
+"when both these conditions are satisfied: (a) any of the elements not "
+"prefixed with '!' matches or there aren't such elements; (b) none of the "
+"elements prefixed with '!' match."
+msgstr "Une liste de noms d'interface à faire correspondre. Chaque élément est un caractères génériques de ligne de commande. Lorsqu'un élément est précédé d'un point d'exclamation ( !), la condition est inversée ; un nom d'interface candidat est considéré comme correspondant lorsque ces deux conditions sont remplies : (a) les éléments non précédés de '!' correspondent ou il n'existe aucun élément ; (b) aucun des éléments précédés de '' correspondent."
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:265
 msgid "The data path type. One of \"system\", \"netdev\" or empty."
 msgstr "Le type de chemin des données. Soit \"système\", \"netdev\" ou vide."
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:266
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
-msgstr ""
-"Le mode de défaillance du pont, qu'il soit \"sécurisé\", \"autonome\" ou "
-"vide."
+msgstr "Le mode de défaillance du pont, qu'il soit \"sécurisé\", \"autonome\" ou vide."
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:267
 msgid "Enable or disable multicast snooping."
 msgstr "Activer ou désactiver le snooping multicast."
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:268
 msgid "Enable or disable RSTP."
 msgstr "Activer ou désactiver le RSTP."
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:269
 msgid "Enable or disable STP."
 msgstr "Activer ou désactiver STP."
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.h.in:270
 msgid "Open vSwitch DPDK device arguments."
 msgstr "Ouvrir les arguments de DPDK."
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:271
 msgid ""
 "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
 "empty."
-msgstr ""
-"Le type d'interface : soit \"interne\", \"système\", \"patch\", \"dpdk\", "
-"soit vide."
+msgstr "Le type d'interface : soit \"interne\", \"système\", \"patch\", \"dpdk\", soit vide."
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:272
 msgid ""
 "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
-msgstr ""
-"Spécifie l'adresse IP de destination unicast d'un port de pont vSwitch Open "
-"distant auquel se connecter."
+msgstr "Spécifie l'adresse IP de destination unicast d'un port de pont vSwitch Open distant auquel se connecter."
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:273
 msgid "The time port must be inactive in order to be considered down."
 msgstr "Le port horaire doit être inactif pour être considéré comme down."
 
-#: ../clients/common/settings-docs.h.in:268
-msgid "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
+#: ../clients/common/settings-docs.h.in:274
+msgid ""
+"Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr "Mode de liaison : \"active-backup\", \"balance-slb\" ou \"balance-tcp\"."
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:275
 msgid "The time port must be active before it starts forwarding traffic."
-msgstr ""
-"Le port temporel doit être actif avant qu'il ne commence à acheminer le "
-"trafic."
+msgstr "Le port temporel doit être actif avant qu'il ne commence à acheminer le trafic."
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.h.in:276
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "Mode LACP : \"actif\", \"éteint\" ou \"passif\"."
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:277
 msgid "The VLAN tag in the range 0-4095."
 msgstr "L'étiquette VLAN dans la plage 0-4095."
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:278
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
-msgstr ""
-"Le mode VLAN, l'un des modes \"accès\", \"native-tagged\", \"native-"
-"untagged\", \"trunk\" ou unset."
+msgstr "Le mode VLAN, l'un des modes \"accès\", \"native-tagged\", \"native-untagged\", \"trunk\" ou unset."
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:279
 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 the speed."
-msgstr ""
-"Si différent de zéro, instruire pppd pour qu’il régle le port série à la "
-"vitesse de transmission spécifiée.  Cette valeur doit normalement être "
-"laissée à 0 pour choisir automatiquement la vitesse."
+"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 "
+"the speed."
+msgstr "Si différent de zéro, instruire pppd pour qu’il régle le port série à la vitesse de transmission spécifiée.  Cette valeur doit normalement être laissée à 0 pour choisir automatiquement la vitesse."
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:280
 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 "
 "FALSE."
-msgstr ""
-"Si défini sur TRUE, instruire pppd pour qu’il régle le port série pour "
-"utiliser le contrôle de flux matériel avec les signaux RTS et CTS.  Cette "
-"valeur doit normalement être réglée sur FALSE."
+msgstr "Si défini sur TRUE, instruire pppd pour qu’il régle le port série pour utiliser le contrôle de flux matériel avec les signaux RTS et CTS.  Cette valeur doit normalement être réglée sur FALSE."
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:281
 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 "
 "\"lcp-echo-interval\" property must also be set to a non-zero value if this "
 "property is used."
-msgstr ""
-"Si différent de zéro, instruire pppd à présumer que la connexion avec le "
-"pair a échoué si le nombre spécifié d'échos-demandes LCP ne reçoit pas de "
-"réponse de la part du pair. la propriété \"lcp-echo-interval\" doit "
-"également être définie à une valeur non nulle si cette propriété est "
-"utilisée."
+msgstr "Si différent de zéro, instruire pppd à présumer que la connexion avec le pair a échoué si le nombre spécifié d'échos-demandes LCP ne reçoit pas de réponse de la part du pair. la propriété \"lcp-echo-interval\" doit également être définie à une valeur non nulle si cette propriété est utilisée."
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:282
 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 "
 "will respond to echo requests and some will not, and it is not possible to "
 "autodetect this."
-msgstr ""
-"Si différent de zéro, instruire pppd d'envoyer une trame d'écho-demande LCP "
-"au pair toutes les n secondes (où n est la valeur spécifiée).  Notez que "
-"certains pairs PPP répondront aux demandes d'écho et d'autres non, et il "
-"n'est pas possible de l'autodétecter."
+msgstr "Si différent de zéro, instruire pppd d'envoyer une trame d'écho-demande LCP au pair toutes les n secondes (où n est la valeur spécifiée).  Notez que certains pairs PPP répondront aux demandes d'écho et d'autres non, et il n'est pas possible de l'autodétecter."
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:283
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
-msgstr ""
-"Si défini sur TRUE, le MPPE stateful sera utilisé. Voir la documentation "
-"pppd pour plus d'informations sur le MPPE stateful."
+msgstr "Si défini sur TRUE, le MPPE stateful sera utilisé. Voir la documentation pppd pour plus d'informations sur le MPPE stateful."
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:284
 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 "
 "16384."
-msgstr ""
-"Si différent de zéro, instruire pppd à demander que le pair n'envoie pas de "
-"paquets plus grands que la taille spécifiée.  Si différent de zéro, la MRU "
-"doit être entre 128 et 16384."
+msgstr "Si différent de zéro, instruire pppd à demander que le pair n'envoie pas de paquets plus grands que la taille spécifiée.  Si différent de zéro, la MRU doit être entre 128 et 16384."
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:285
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
-""
-msgstr ""
-"Si différent de zéro, demandez à pppd d'envoyer des paquets dont la taille "
-"ne dépasse pas la taille spécifiée."
+msgstr "Si différent de zéro, demandez à pppd d'envoyer des paquets dont la taille ne dépasse pas la taille spécifiée."
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:286
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
-msgstr ""
-"Si TRUE, la compression de l'en-tête TCP de Van Jacobsen ne sera pas "
-"demandée."
+msgstr "Si TRUE, la compression de l'en-tête TCP de Van Jacobsen ne sera pas demandée."
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
-msgstr ""
-"Si TRUE, n'exigez pas que l'autre partie (généralement le serveur PPP) "
-"s'authentifie auprès du client. Si FAUX, exigez une authentification du côté "
-"distant. Dans presque tous les cas, cela doit être sur TRUE."
+msgstr "Si TRUE, n'exigez pas que l'autre partie (généralement le serveur PPP) s'authentifie auprès du client. Si FAUX, exigez une authentification du côté distant. Dans presque tous les cas, cela doit être sur TRUE."
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:288
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "Si TRUE, la compression BSD ne sera pas demandée."
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:289
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "Si TRUE, la compression « deflate » ne sera pas demandée."
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:290
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "Si TRUE, la méthode d'authentification CHAP ne sera pas utilisée."
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:291
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "Si TRUE, la méthode d'authentification EAP ne sera pas utilisée."
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:292
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "Si TRUE, la méthode d'authentification MSCHAPv2 ne sera pas utilisée."
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:293
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "Si TRUE, la méthode d'authentification MSCHAPv2 ne sera pas utilisée."
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:294
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "Si TRUE, la méthode d'authentification PAP ne sera pas utilisée."
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:295
 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 "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
-msgstr ""
-"Si TRUE, MPPE (Microsoft Point-to-Point Encryption) sera exigé pour la "
-"session PPP.  Si MPPE 64 bits ou 128 bits n'est pas disponible, la session "
-"échouera.  Notez que MPPE n'est pas utilisé sur les connexions haut débit "
-"mobiles."
+msgstr "Si TRUE, MPPE (Microsoft Point-to-Point Encryption) sera exigé pour la session PPP.  Si MPPE 64 bits ou 128 bits n'est pas disponible, la session échouera.  Notez que MPPE n'est pas utilisé sur les connexions haut débit mobiles."
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:296
 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 "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
-msgstr ""
-"Si TRUE, 128 bits MPPE (Microsoft Point-to-Point Encryption) sera exigé pour "
-"la session PPP, et la propriété \"require-mppe\" doit également être réglée "
-"sur TRUE. 128 bits MPPE n'est pas disponible, la session échoue."
+msgstr "Si TRUE, 128 bits MPPE (Microsoft Point-to-Point Encryption) sera exigé pour la session PPP, et la propriété \"require-mppe\" doit également être réglée sur TRUE. 128 bits MPPE n'est pas disponible, la session échoue."
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:297
 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 "
 "activated on the interface specified in \"interface-name\" of "
 "NMSettingConnection."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent sur laquelle cette "
-"connexion PPPoE doit être créée.  Si cette propriété n'est pas spécifiée, la "
-"connexion sera activée sur l'interface spécifiée dans \"interface-name\" de "
-"NMSettingConnection."
+msgstr "S'il est donné, spécifie le nom de l'interface parent sur laquelle cette connexion PPPoE doit être créée.  Si cette propriété n'est pas spécifiée, la connexion sera activée sur l'interface spécifiée dans \"interface-name\" de NMSettingConnection."
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:298
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Mot de passe utilisé pour s'authentifier avec le service PPP0E."
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:300
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
 "should be left blank.  It is only required if there are multiple access "
 "concentrators or a specific service is known to be required."
-msgstr ""
-"Si spécifié, demandez au PPPoE de n'initier des sessions qu'avec des "
-"concentrateurs d'accès qui fournissent le service spécifié.  Pour la plupart "
-"des fournisseurs, ce champ doit être laissé en blanc.  Elle n'est requise "
-"que s'il y a plusieurs concentrateurs d'accès ou si un service spécifique "
-"est requis."
+msgstr "Si spécifié, demandez au PPPoE de n'initier des sessions qu'avec des concentrateurs d'accès qui fournissent le service spécifié.  Pour la plupart des fournisseurs, ce champ doit être laissé en blanc.  Elle n'est requise que s'il y a plusieurs concentrateurs d'accès ou si un service spécifique est requis."
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:301
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Mot de passe utilisé pour s'authentifier avec le service PPP0E."
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:302
 msgid "Whether the proxy configuration is for browser only."
-msgstr ""
-"Indique si la configuration du proxy est uniquement pour le navigateur."
+msgstr "Indique si la configuration du proxy est uniquement pour le navigateur."
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:303
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
-msgstr ""
-"Méthode de configuration du proxy, la valeur par défaut est "
-"NM_SETTING_PROXY_METHOD_NONE (0)"
+msgstr "Méthode de configuration du proxy, la valeur par défaut est NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:304
 msgid "PAC script for the connection."
 msgstr "Script PAC pour la connexion."
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:305
 msgid "PAC URL for obtaining PAC file."
 msgstr "URL PAC pour obtenir le fichier PAC."
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:306
 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 "
 "speed settings and use the highest available speed."
-msgstr ""
-"Vitesse à utiliser pour la communication sur le port en série  Notez que "
-"cette valeur n'a généralement aucun effet pour les modems mobiles à large "
-"bande car ils ignorent généralement les paramètres de vitesse et utilisent "
-"la vitesse la plus élevée disponible."
+msgstr "Vitesse à utiliser pour la communication sur le port en série  Notez que cette valeur n'a généralement aucun effet pour les modems mobiles à large bande car ils ignorent généralement les paramètres de vitesse et utilisent la vitesse la plus élevée disponible."
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:307
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
-msgstr ""
-"Largeur de l'octet de la communication série, par exemple le 8 en \"8n1\"."
+msgstr "Largeur de l'octet de la communication série, par exemple le 8 en \"8n1\"."
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:308
 msgid "Parity setting of the serial port."
 msgstr "Réglage de la parité du port série."
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:309
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr "Temps de retard entre chaque octet envoyé au modem, en microsecondes."
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:310
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
-msgstr ""
-"Nombre de bits d'arrêt pour la communication sur le port série : 1 ou 2, par "
-"exemple le 1 dans \"8n1\"."
+msgstr "Nombre de bits d'arrêt pour la communication sur le port série : 1 ou 2, par exemple le 1 dans \"8n1\"."
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:311
 msgid ""
 "Whether to autoprobe virtual functions by a compatible driver. If set to "
 "NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
@@ -9276,76 +8002,48 @@ msgid ""
 "interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
 "the global default is used; in case the global default is unspecified it is "
 "assumed to be NM_TERNARY_TRUE (1)."
-msgstr ""
-"Indique s'il faut autosonder les fonctions virtuelles à l'aide d'un pilote "
-"compatible. S'il est défini sur NM_TERNARY_TRUE (1), le noyau essaiera de "
-"lier les VFs à un pilote compatible et si cela réussit, une nouvelle "
-"interface réseau sera instanciée pour chaque VF. Si la valeur "
-"NM_TERNARY_FALSE (0) est définie, les VF ne seront pas réclamés et aucune "
-"interface réseau ne sera créée pour eux. Lorsqu'il est défini sur "
-"NM_TERNARY_DEFAULT (-1), la valeur par défaut globale est utilisée ; si la "
-"valeur par défaut globale n'est pas spécifiée, elle est supposée être "
-"NM_TERNARY_TRUE (1)."
+msgstr "Indique s'il faut autosonder les fonctions virtuelles à l'aide d'un pilote compatible. S'il est défini sur NM_TERNARY_TRUE (1), le noyau essaiera de lier les VFs à un pilote compatible et si cela réussit, une nouvelle interface réseau sera instanciée pour chaque VF. Si la valeur NM_TERNARY_FALSE (0) est définie, les VF ne seront pas réclamés et aucune interface réseau ne sera créée pour eux. Lorsqu'il est défini sur NM_TERNARY_DEFAULT (-1), la valeur par défaut globale est utilisée ; si la valeur par défaut globale n'est pas spécifiée, elle est supposée être NM_TERNARY_TRUE (1)."
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:312
 msgid ""
 "The total number of virtual functions to create. Note that when the sriov "
 "setting is present NetworkManager enforces the number of virtual functions "
 "on the interface also when it is zero. To prevent any changes to SR-IOV "
 "parameters don't add a sriov setting to the connection."
-msgstr ""
-"Le nombre total de fonctions virtuelles à créer. Notez que lorsque le "
-"paramètre sriov est présent, NetworkManager applique le nombre de fonctions "
-"virtuelles sur l'interface même lorsque celui-ci est nul. Pour éviter toute "
-"modification des paramètres SR-IOV, n'ajoutez pas de paramètre sriov à la "
-"connexion."
+msgstr "Le nombre total de fonctions virtuelles à créer. Notez que lorsque le paramètre sriov est présent, NetworkManager applique le nombre de fonctions virtuelles sur l'interface même lorsque celui-ci est nul. Pour éviter toute modification des paramètres SR-IOV, n'ajoutez pas de paramètre sriov à la connexion."
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:313
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-"for each VF. When represented as string a VF is in the form: \"INDEX [ATTR="
-"VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check="
-"true\". Multiple VFs can be specified using a comma as separator. Currently "
-"the following attributes are supported: mac, spoof-check, trust, min-tx-"
-"rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
+"for each VF. When represented as string a VF is in the form: \"INDEX "
+"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
+"check=true\". Multiple VFs can be specified using a comma as separator. "
+"Currently the following attributes are supported: mac, spoof-check, trust, "
+"min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
 "semicolon-separated list of VLAN descriptors, where each descriptor has the "
 "form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the "
 "default) or 'ad' for 802.1ad."
-msgstr ""
-"Tableau de descripteurs de fonctions virtuelles. Chaque descripteur VF est "
-"un dictionnaire mappant les noms d'attributs aux valeurs de GVariant. "
-"L'entrée 'index' est obligatoire pour chaque VF. Lorsqu'elle est représentée "
-"sous forme de chaîne, une VF se présente sous la forme : \"INDEX[ATTR=VALUE[ "
-"ATTR=VALUE]...]\". par exemple : \"2 mac=00:11:22:33:44:44:55 spoof-check="
-"true\". L'attribut \"vlans\" est représenté sous la forme d'une liste "
-"semicolore de descripteurs VLAN, où chaque descripteur a la forme \"ID[."
-"PRIORITY[.PROTO]]\". PROTO peut être 'q' pour 802.1Q (par défaut) ou 'ad' "
-"pour 802.1ad."
+msgstr "Tableau de descripteurs de fonctions virtuelles. Chaque descripteur VF est un dictionnaire mappant les noms d'attributs aux valeurs de GVariant. L'entrée 'index' est obligatoire pour chaque VF. Lorsqu'elle est représentée sous forme de chaîne, une VF se présente sous la forme : \"INDEX[ATTR=VALUE[ ATTR=VALUE]...]\". par exemple : \"2 mac=00:11:22:33:44:44:55 spoof-check=true\". L'attribut \"vlans\" est représenté sous la forme d'une liste semicolore de descripteurs VLAN, où chaque descripteur a la forme \"ID[.PRIORITY[.PROTO]]\". PROTO peut être 'q' pour 802.1Q (par défaut) ou 'ad' pour 802.1ad."
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:314
 msgid "Array of TC queueing disciplines."
 msgstr "Table de disciplines de mise en file d'attente TC"
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:315
 msgid "Array of TC traffic filters."
 msgstr "Table de filtres de trafic TC."
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:316
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
 "passed directly to teamd. If not specified, the default configuration is "
 "used.  See man teamd.conf for the format details."
-msgstr ""
-"La configuration JSON pour l'interface réseau de l'équipe.  La propriété "
-"doit contenir des données brutes de configuration JSON appropriées pour "
-"teamd, car la valeur est passée directement à teamd. Si non spécifiée, la "
-"configuration par défaut sera utilisée.  Voir man teamd.conf pour les "
-"détails du format."
+msgstr "La configuration JSON pour l'interface réseau de l'équipe.  La propriété doit contenir des données brutes de configuration JSON appropriées pour teamd, car la valeur est passée directement à teamd. Si non spécifiée, la configuration par défaut sera utilisée.  Voir man teamd.conf pour les détails du format."
 
-#: ../clients/common/settings-docs.h.in:311
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:335
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -9355,191 +8053,150 @@ msgid ""
 "max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', "
 "'validate-active', 'validate-inactive', 'send-always'. See teamd.conf man "
 "for more details."
-msgstr ""
-"Configuration des « link watchers » pour la connexion : chaque link watcher "
-"est défini par un dictionnaire, dont les clés dépendent du link watcher "
-"sélectionné ; les link watchers disponibles sont 'ethtool', 'nsna_ping' et' "
-"arp_ping' et est spécifié dans le dictionnaire avec la clé 'name'.  Les clés "
-"disponibles sont : ethtool:'delay-up','delay-down','init-wait' ; nsna_ping:"
-"'init-wait','interval','missed-max','target-host' ; arp_ping : tous ceux de "
-"nsna_ping et'source-host','validate-active','validate-incative','sentalways'."
-" Voir teamd.conf man pour plus de détails."
+msgstr "Configuration des « link watchers » pour la connexion : chaque link watcher est défini par un dictionnaire, dont les clés dépendent du link watcher sélectionné ; les link watchers disponibles sont 'ethtool', 'nsna_ping' et' arp_ping' et est spécifié dans le dictionnaire avec la clé 'name'.  Les clés disponibles sont : ethtool:'delay-up','delay-down','init-wait' ; nsna_ping:'init-wait','interval','missed-max','target-host' ; arp_ping : tous ceux de nsna_ping et'source-host','validate-active','validate-incative','sentalways'. Voir teamd.conf man pour plus de détails."
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.h.in:318
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "Correspond au teamd mcast_rejoin.count."
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:319
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "Correspond au teamd mcast_rejoin.count."
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:320
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "Correspond au teamd notify_peers.count."
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:321
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "Correspond au teamd notify_peers.count."
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:322
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
 "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
-msgstr ""
-"Correspond au teamd runner.name. Les valeurs autorisées sont : "
-"\"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", "
-"\"random\"."
+msgstr "Correspond au teamd runner.name. Les valeurs autorisées sont : \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:323
 msgid "Corresponds to the teamd runner.active."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:324
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:325
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:326
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.h.in:328
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:331
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "Correspond au teamd runner.active."
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:332
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
 "directly to teamd. If not specified, the default configuration is used. See "
 "man teamd.conf for the format details."
-msgstr ""
-"La configuration JSON pour l'interface réseau de l'équipe.  La propriété "
-"doit contenir des données brutes de configuration JSON appropriées pour "
-"teamd, car la valeur est passée directement à teamd. Si non spécifiée, la "
-"configuration par défaut sera utilisée.  Voir man teamd.conf pour les "
-"détails du format."
+msgstr "La configuration JSON pour l'interface réseau de l'équipe.  La propriété doit contenir des données brutes de configuration JSON appropriées pour teamd, car la valeur est passée directement à teamd. Si non spécifiée, la configuration par défaut sera utilisée.  Voir man teamd.conf pour les détails du format."
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "Correspond au teamd ports.PORTIFNAME.lacp_prio."
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:337
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
-msgstr ""
-"Correspond au teamd ports.PORTIFNAME.queue_id. Quand il est défini à -1, "
-"cela signifie que le paramètre est ignoré de la configuration json."
+msgstr "Correspond au teamd ports.PORTIFNAME.queue_id. Quand il est défini à -1, cela signifie que le paramètre est ignoré de la configuration json."
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "Correspond au teamd ports.PORTIFNAME.lacp_key."
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:339
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
-msgstr ""
-"L'ID de groupe qui sera propriétaire du périphérique. Si ce paramètre est "
-"réglé sur NULL, tout le monde pourra l’utiliser."
+msgstr "L'ID de groupe qui sera propriétaire du périphérique. Si ce paramètre est réglé sur NULL, tout le monde pourra l’utiliser."
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:340
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
-msgstr ""
-"Les valeurs autorisées sont NM_SETTING_TUN_TUN_MODE_TUN (1) pour créer un "
-"périphérique de niveau 3 et NM_SETTING_TUN_MODE_TAP (2) pour créer un "
-"périphérique de niveau 2 Ethernet."
+msgstr "Les valeurs autorisées sont NM_SETTING_TUN_TUN_MODE_TUN (1) pour créer un périphérique de niveau 3 et NM_SETTING_TUN_MODE_TAP (2) pour créer un périphérique de niveau 2 Ethernet."
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
-msgstr ""
-"Si la propriété est définie sur TRUE, l'interface prendra en charge "
-"plusieurs descripteurs de fichiers (files d'attente) pour paralléliser "
-"l'envoi ou la réception de paquets, sinon, l'interface ne prendra en charge "
-"qu'une seule file d'attente."
+msgstr "Si la propriété est définie sur TRUE, l'interface prendra en charge plusieurs descripteurs de fichiers (files d'attente) pour paralléliser l'envoi ou la réception de paquets, sinon, l'interface ne prendra en charge qu'une seule file d'attente."
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:342
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
-msgstr ""
-"L'ID de groupe qui sera propriétaire du périphérique. Si ce paramètre est "
-"réglé sur NULL, tout le monde pourra l’utiliser."
+msgstr "L'ID de groupe qui sera propriétaire du périphérique. Si ce paramètre est réglé sur NULL, tout le monde pourra l’utiliser."
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:343
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
-msgstr ""
-"Si défini sur TRUE, l'interface sera précédée d'un en-tête de 4 octets "
-"décrivant l'interface physique vers les paquets."
+msgstr "Si défini sur TRUE, l'interface sera précédée d'un en-tête de 4 octets décrivant l'interface physique vers les paquets."
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:344
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
-msgstr ""
-"Si l'IFF_VNET_HDR est VRAI, les paquets de tunnel comprendront un en-tête de "
-"réseau virtio."
+msgstr "Si l'IFF_VNET_HDR est VRAI, les paquets de tunnel comprendront un en-tête de réseau virtio."
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:345
 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 "
 "support a strict ascii format, but the values can be arbitrary UTF8 strings "
 "up to a certain length."
-msgstr ""
-"Un dictionnaire de paires clé/valeur avec les données de l'utilisateur. Ces "
-"données sont ignorées par NetworkManager et peuvent être utilisées à la "
-"discrétion de l'utilisateur. Les clés ne supportent qu'un format ascii "
-"strict, mais les valeurs peuvent être des chaînes UTF8 arbitraires jusqu'à "
-"une certaine longueur."
+msgstr "Un dictionnaire de paires clé/valeur avec les données de l'utilisateur. Ces données sont ignorées par NetworkManager et peuvent être utilisées à la discrétion de l'utilisateur. Les clés ne supportent qu'un format ascii strict, mais les valeurs peuvent être des chaînes UTF8 arbitraires jusqu'à une certaine longueur."
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:346
 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\" and \"to\" are unsigned integers, ie \"7:3\"."
-msgstr ""
-"Pour les paquets sortants, une liste des mappages des priorités Linux SKB "
-"vers les priorités 802.1p. Le mappage est donné dans le format \"from:to\" "
-"où \"from\" et \"to\" sont des entiers non signés, soit \"7:3\"."
+"priorities.  The mapping is given in the format \"from:to\" where both \"from"
+"\" and \"to\" are unsigned integers, ie \"7:3\"."
+msgstr "Pour les paquets sortants, une liste des mappages des priorités Linux SKB vers les priorités 802.1p. Le mappage est donné dans le format \"from:to\" où \"from\" et \"to\" sont des entiers non signés, soit \"7:3\"."
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:347
 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 "
@@ -9550,98 +8207,63 @@ msgid ""
 "NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward "
 "compatibility, the default-value in the D-Bus API continues to be 0 and a "
 "missing property on D-Bus is still considered as 0."
-msgstr ""
-"Un ou plusieurs indicateurs qui contrôlent le comportement et les "
-"caractéristiques de l'interface VLAN.  Les indicateurs comprennent "
-"NM_VLAN_FLAG_FLAG_REORDER_HEADERS (0x1) (réorganisation des en-têtes des "
-"paquets de sortie), NM_VLAN_FLAG_GVRP (0x2) (utilisation du protocole GVRP) "
-"et NM_VLAN_FLAG_LOOSE_BINDING (0x4) (liaison de l'interface à son état de "
-"fonctionnement du périphérique maître). NM_VLAN_FLAG_FLAG_MVRP (0x8) "
-"(utilisation du protocole MVRP). La valeur par défaut de cette propriété est "
-"NM_VLAN_FLAG_REORDER_HEADERS, mais elle était 0 auparavant. Pour préserver "
-"la rétrocompatibilité, la valeur par défaut de l'API D-Bus est toujours 0 et "
-"une propriété manquante sur D-Bus est toujours considérée comme 0."
+msgstr "Un ou plusieurs indicateurs qui contrôlent le comportement et les caractéristiques de l'interface VLAN.  Les indicateurs comprennent NM_VLAN_FLAG_FLAG_REORDER_HEADERS (0x1) (réorganisation des en-têtes des paquets de sortie), NM_VLAN_FLAG_GVRP (0x2) (utilisation du protocole GVRP) et NM_VLAN_FLAG_LOOSE_BINDING (0x4) (liaison de l'interface à son état de fonctionnement du périphérique maître). NM_VLAN_FLAG_FLAG_MVRP (0x8) (utilisation du protocole MVRP). La valeur par défaut de cette propriété est NM_VLAN_FLAG_REORDER_HEADERS, mais elle était 0 auparavant. Pour préserver la rétrocompatibilité, la valeur par défaut de l'API D-Bus est toujours 0 et une propriété manquante sur D-Bus est toujours considérée comme 0."
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:348
 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."
-msgstr ""
-"L'identificateur du VLAN que l'interface créée par cette connexion doit être "
-"affecté. La plage valide est de 0 à 4094, sans l'identifiant réservé 4095."
+msgstr "L'identificateur du VLAN que l'interface créée par cette connexion doit être affecté. La plage valide est de 0 à 4094, sans l'identifiant réservé 4095."
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:349
 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\" and \"to\" are unsigned integers, ie \"7:3\"."
-msgstr ""
-"Pour les paquets sortants, une liste des mappages des priorités 802.1p vers "
-"les priorités Linux SKB. Le mappage est donné dans le format \"from:to\" où "
-"\"from\" et \"to\" sont des entiers non signés, soit \"7:3\"."
+"priorities.  The mapping is given in the format \"from:to\" where both \"from"
+"\" and \"to\" are unsigned integers, ie \"7:3\"."
+msgstr "Pour les paquets sortants, une liste des mappages des priorités 802.1p vers les priorités Linux SKB. Le mappage est donné dans le format \"from:to\" où \"from\" et \"to\" sont des entiers non signés, soit \"7:3\"."
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:350
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion "
-"parent à partir duquel cette interface VLAN doit être créée.  Si cette "
-"propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-"
-"3-ethernet\" avec une propriété \"mac-address\"."
+msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent à partir duquel cette interface VLAN doit être créée.  Si cette propriété n'est pas spécifiée, la connexion doit contenir un paramètre \"802-3-ethernet\" avec une propriété \"mac-address\"."
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
-msgstr ""
-"Dictionnaire des paires clé/valeur de données spécifiques aux plugins VPN. "
-"Les clés et les valeurs doivent être des chaînes de caractères."
+msgstr "Dictionnaire des paires clé/valeur de données spécifiques aux plugins VPN. Les clés et les valeurs doivent être des chaînes de caractères."
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:352
 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 "
 "explicitly disconnected."
-msgstr ""
-"Si le service VPN prend en charge la persistance et que cette propriété est "
-"sur TRUE, le VPN tentera de rester connecté à travers les changements et les "
-"interruptions de liaison, jusqu'à ce qu'il soit explicitement déconnecté."
+msgstr "Si le service VPN prend en charge la persistance et que cette propriété est sur TRUE, le VPN tentera de rester connecté à travers les changements et les interruptions de liaison, jusqu'à ce qu'il soit explicitement déconnecté."
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
-msgstr ""
-"Dictionnaire des paires clé/valeur des secrets spécifiques des plugins VPN, "
-"comme les mots de passe ou les clés privées. Les clés et les valeurs doivent "
-"correpondre à  des chaînes de caractères."
+msgstr "Dictionnaire des paires clé/valeur des secrets spécifiques des plugins VPN, comme les mots de passe ou les clés privées. Les clés et les valeurs doivent correpondre à  des chaînes de caractères."
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:354
 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."
-msgstr ""
-"Nom de service D-Bus du plugin VPN que ce paramètre utilise pour se "
-"connecter à son réseau. i.e. org.freedesktop.NetworkManager.vpnc pour le "
-"plugin vpnc."
+msgstr "Nom de service D-Bus du plugin VPN que ce paramètre utilise pour se connecter à son réseau. i.e. org.freedesktop.NetworkManager.vpnc pour le plugin vpnc."
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:355
 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 "
 "is 60 seconds (unless overridden by vpn.timeout in configuration file). "
 "Values greater than zero mean timeout in seconds."
-msgstr ""
-"Timeout pour le service VPN pour établir la connexion. Certains services "
-"peuvent prendre beaucoup de temps à se connecter. Une valeur de 0 signifie "
-"un délai d'attente par défaut, qui est de 60 secondes (à moins qu'il ne soit "
-"remplacé par vpn.timeout dans le fichier de configuration). Le valeurs "
-"supérieures à zéro indiquent un timeout en secondes."
+msgstr "Timeout pour le service VPN pour établir la connexion. Certains services peuvent prendre beaucoup de temps à se connecter. Une valeur de 0 signifie un délai d'attente par défaut, qui est de 60 secondes (à moins qu'il ne soit remplacé par vpn.timeout dans le fichier de configuration). Le valeurs supérieures à zéro indiquent un timeout en secondes."
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:356
 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 "
@@ -9649,178 +8271,131 @@ msgid ""
 "this property empty.  If this property is empty, NetworkManager will "
 "automatically supply the username of the user which requested the VPN "
 "connection."
-msgstr ""
-"Si la connexion VPN nécessite un nom d'utilisateur pour l'authentification, "
-"ce nom doit être fourni ici. Si la connexion est disponible pour plus d'un "
-"utilisateur, et que le VPN exige que chaque utilisateur fournisse un nom "
-"différent, alors laissez cette propriété vide. Si cette propriété reste "
-"vide, le NetworkManager fournira automatiquement le nom d’utilisateur de "
-"l’utilisateur qui a demandé la connexion VPN."
+msgstr "Si la connexion VPN nécessite un nom d'utilisateur pour l'authentification, ce nom doit être fourni ici. Si la connexion est disponible pour plus d'un utilisateur, et que le VPN exige que chaque utilisateur fournisse un nom différent, alors laissez cette propriété vide. Si cette propriété reste vide, le NetworkManager fournira automatiquement le nom d’utilisateur de l’utilisateur qui a demandé la connexion VPN."
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:357
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
-msgstr ""
-"Spécifie la durée de vie en secondes des entrées FDB apprises par le noyau."
+msgstr "Spécifie la durée de vie en secondes des entrées FDB apprises par le noyau."
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
-msgstr ""
-"Spécifie le port de destination UDP à communiquer avec le point de "
-"terminaison du tunnel VXLAN distant."
+msgstr "Spécifie le port de destination UDP à communiquer avec le point de terminaison du tunnel VXLAN distant."
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
-msgstr ""
-"Indique l'identificateur de réseau VXLAN (ou identificateur de segment "
-"VXLAN) à utiliser."
+msgstr "Indique l'identificateur de réseau VXLAN (ou identificateur de segment VXLAN) à utiliser."
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:360
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "Indique si les notifications d'erreur LL ADDR netlink sont générées."
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:361
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "Indique si les notifications d'erreur IP ADDR netlink sont générées."
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
-msgstr ""
-"Indique si des adresses de couche de lien source et des adresses IP "
-"inconnues sont entrées dans la base de données de transfert de périphérique "
-"VXLAN."
+msgstr "Indique si des adresses de couche de lien source et des adresses IP inconnues sont entrées dans la base de données de transfert de périphérique VXLAN."
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
-msgstr ""
-"Spécifie le nombre maximum d'entrées FDB : une valeur de zéro signifie que "
-"le noyau stocke un nombre illimité d'entrées."
+msgstr "Spécifie le nombre maximum d'entrées FDB : une valeur de zéro signifie que le noyau stocke un nombre illimité d'entrées."
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:364
 msgid "If given, specifies the source IP address to use in outgoing packets."
-msgstr ""
-"Si donné, spécifie l'adresse IP source à utiliser dans les paquets sortants."
+msgstr "Si donné, spécifie l'adresse IP source à utiliser dans les paquets sortants."
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
-msgstr ""
-"S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion "
-"parent."
+msgstr "S'il est donné, spécifie le nom de l'interface parent ou l'UUID de connexion parent."
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:366
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "Indique si le proxy ARP est activé."
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:367
 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 "
 "forwarding database, or the multicast IP address to join."
-msgstr ""
-"Spécifie l'adresse IP de destination unicast à utiliser dans les paquets "
-"sortants lorsque l'adresse de la couche de liaison de destination n'est pas "
-"connue dans la base de données de transfert de périphérique VXLAN, ou "
-"l'adresse IP multicast à joindre."
+msgstr "Spécifie l'adresse IP de destination unicast à utiliser dans les paquets sortants lorsque l'adresse de la couche de liaison de destination n'est pas connue dans la base de données de transfert de périphérique VXLAN, ou l'adresse IP multicast à joindre."
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:368
 msgid "Specifies whether route short circuit is turned on."
 msgstr "Indique si le court circuit de routage est activé."
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
-msgstr ""
-"Spécifie le port de destination UDP maximum à communiquer au point de "
-"terminaison du tunnel VXLAN distant."
+msgstr "Spécifie le port de destination UDP maximum à communiquer au point de terminaison du tunnel VXLAN distant."
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
-msgstr ""
-"Spécifie le port de destination UDP minimum à communiquer au point de "
-"terminaison du tunnel VXLAN distant."
+msgstr "Spécifie le port de destination UDP minimum à communiquer au point de terminaison du tunnel VXLAN distant."
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "Spécifie la valeur TOS à utiliser dans les paquets sortants."
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:372
 msgid "Specifies the time-to-live value to use in outgoing packets."
-msgstr ""
-"Spécifie la valeur « time-to-live » à utiliser dans les paquets sortants."
+msgstr "Spécifie la valeur « time-to-live » à utiliser dans les paquets sortants."
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "The P2P device that should be connected to. Currently this is the only way "
 "to create or join a group."
-msgstr ""
-"Le périphérique P2P auquel il faut se connecter. Actuellement, c'est la "
-"seule façon de créer ou de rejoindre un groupe."
+msgstr "Le périphérique P2P auquel il faut se connecter. Actuellement, c'est la seule façon de créer ou de rejoindre un groupe."
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:374
 msgid ""
 "The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display "
 "requires a protocol specific information element to be set in certain Wi-Fi "
 "frames. These can be specified here for the purpose of establishing a "
 "connection. This setting is only useful when implementing a Wi-Fi Display "
 "client."
-msgstr ""
-"Les éléments d'information (IE) de l'écran Wi-Fi (WFD) à régler. L'affichage "
-"Wi-Fi nécessite qu'un élément d'information spécifique au protocole soit "
-"défini dans certaines trames Wi-Fi. Celles-ci peuvent être spécifiées ici "
-"afin d'établir une connexion. Ce paramètre n'est utile que lors de "
-"l'implémentation d'un client d'affichage Wi-Fi."
+msgstr "Les éléments d'information (IE) de l'écran Wi-Fi (WFD) à régler. L'affichage Wi-Fi nécessite qu'un élément d'information spécifique au protocole soit défini dans certaines trames Wi-Fi. Celles-ci peuvent être spécifiées ici afin d'établir une connexion. Ce paramètre n'est utile que lors de l'implémentation d'un client d'affichage Wi-Fi."
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "Flags indicating which mode of WPS is to be used. There's little point in "
 "changing the default setting as NetworkManager will automatically determine "
 "the best method to use."
-msgstr ""
-"Marqueurs indiquant quel mode de WPS doit être utilisé. Il y a peu d’intérêt "
-" à modifier les paramètres par défaut car NetworkManager déterminera "
-"automatiquement la meilleure méthode à utiliser."
+msgstr "Marqueurs indiquant quel mode de WPS doit être utilisé. Il y a peu d’intérêt  à modifier les paramètres par défaut car NetworkManager déterminera automatiquement la meilleure méthode à utiliser."
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:376
 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 "
 "(known as MAC spoofing). Deprecated: 1"
-msgstr ""
-"Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique "
-"WiMAX dont l'adresse MAC correspond. Cette propriété ne change pas l'adresse "
-"MAC du périphérique (connue sous le nom de MAC spoofing). Si dépréciée:1"
+msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique WiMAX dont l'adresse MAC correspond. Cette propriété ne change pas l'adresse MAC du périphérique (connue sous le nom de MAC spoofing). Si dépréciée:1"
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:377
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
-msgstr ""
-"Nom du fournisseur de service réseau (NSP) du réseau WiMAX que cette "
-"connexion doit utiliser. Si déprécié : 1"
+msgstr "Nom du fournisseur de service réseau (NSP) du réseau WiMAX que cette connexion doit utiliser. Si déprécié : 1"
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:378
 msgid ""
 "The use of fwmark is optional and is by default off. Setting it to 0 "
 "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
 "\"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to "
 "automatically choose a fwmark."
-msgstr ""
-"L'utilisation de fwmark est facultative et par défaut désactivée. Le réglage "
-"à 0 le désactive. Sinon, il s'agit d'un fwmark 32 bits pour les paquets "
-"sortants. Veuillez noter que lorsque \"ip4-auto-default-route\" ou \"ip6-"
-"auto-default-route\" activé implique de choisir automatiquement une fwmark."
+msgstr "L'utilisation de fwmark est facultative et par défaut désactivée. Le réglage à 0 le désactive. Sinon, il s'agit d'un fwmark 32 bits pour les paquets sortants. Veuillez noter que lorsque \"ip4-auto-default-route\" ou \"ip6-auto-default-route\" activé implique de choisir automatiquement une fwmark."
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Whether to enable special handling of the IPv4 default route. If enabled, "
 "the IPv4 default route will be placed to a dedicated routing-table and two "
@@ -9830,3760 +8405,3657 @@ msgid ""
 "Table=auto. Leaving this at the default will enable this option "
 "automatically if ipv4.never-default is not set and there are any peers that "
 "use a default-route as allowed-ips."
-msgstr ""
-"Indique s'il faut activer la gestion spéciale de la route par défaut IPv4. "
-"Si cette option est activée, la route par défaut IPv4 sera placée dans une "
-"table de routage dédiée et deux règles de routage de stratégie seront "
-"ajoutées. Le numéro fwmark est également utilisé pour la table de routage "
-"pour la route par défaut, et si fwmark est zéro, une table fwmark inutilisée "
-"est automatiquement choisie. Cela correspond à ce que wg-quick fait avec "
-"Table=auto. Laisser cette option comme l'option par défaut activera "
-"automatiquement cette option si ipv4.never-default n'est pas défini et s'il "
-"y a des pairs qui utilisent une route par défaut comme IPS autorisées."
+msgstr "Indique s'il faut activer la gestion spéciale de la route par défaut IPv4. Si cette option est activée, la route par défaut IPv4 sera placée dans une table de routage dédiée et deux règles de routage de stratégie seront ajoutées. Le numéro fwmark est également utilisé pour la table de routage pour la route par défaut, et si fwmark est zéro, une table fwmark inutilisée est automatiquement choisie. Cela correspond à ce que wg-quick fait avec Table=auto. Laisser cette option comme l'option par défaut activera automatiquement cette option si ipv4.never-default n'est pas défini et s'il y a des pairs qui utilisent une route par défaut comme IPS autorisées."
 
-#: ../clients/common/settings-docs.h.in:374
+#: ../clients/common/settings-docs.h.in:380
 msgid "Like ip4-auto-default-route, but for the IPv6 default route."
-msgstr ""
-"Similaire à ip4-auto-default-route, mais pourla route par défaut d'IPv6."
+msgstr "Similaire à ip4-auto-default-route, mais pourla route par défaut d'IPv6."
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.h.in:381
 msgid ""
 "The listen-port. If listen-port is not specified, the port will be chosen "
 "randomly when the interface comes up."
-msgstr ""
-"Le port d'écoute. Si listen-port n'est pas spécifié, le port sera choisi "
-"aléatoirement lorsque l'interface apparaîtra."
+msgstr "Le port d'écoute. Si listen-port n'est pas spécifié, le port sera choisi aléatoirement lorsque l'interface apparaîtra."
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:382
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments. If zero a default MTU is "
 "used. Note that contrary to wg-quick's MTU setting, this does not take into "
 "account the current routes at the time of activation."
-msgstr ""
-"Si différent de zéro, ne transmettez que des paquets de la taille spécifiée "
-"ou plus petits, divisant les paquets plus grands en plusieurs trames. Si "
-"zéro, un MTU par défaut est utilisé. Notez que contrairement au réglage MTU "
-"de wg-quick, ceci ne prend pas en compte les routes actuelles au moment de "
-"l'activation."
+msgstr "Si différent de zéro, ne transmettez que des paquets de la taille spécifiée ou plus petits, divisant les paquets plus grands en plusieurs trames. Si zéro, un MTU par défaut est utilisé. Notez que contrairement au réglage MTU de wg-quick, ceci ne prend pas en compte les routes actuelles au moment de l'activation."
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:383
 msgid ""
 "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
 "If TRUE (the default), NetworkManager will automatically add routes in the "
 "routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
 "no such routes are added automatically. In this case, the user may want to "
 "configure static routes in ipv4.routes and ipv6.routes, respectively."
-msgstr ""
-"Indique s'il faut ajouter automatiquement des routes pour les plages d'ips "
-"autorisées «AllowedIPs» des pairs. Si VRAI (par défaut), NetworkManager "
-"ajoutera automatiquement des routes dans les tables de routage selon ipv4."
-"route-table et ipv6.route-table. Si FAUX, aucun itinéraire de ce type n'est "
-"ajouté automatiquement. Dans ce cas, l'utilisateur peut vouloir configurer "
-"des routes statiques dans ipv4.routes et ipv6.routes, respectivement."
+msgstr "Indique s'il faut ajouter automatiquement des routes pour les plages d'ips autorisées «AllowedIPs» des pairs. Si VRAI (par défaut), NetworkManager ajoutera automatiquement des routes dans les tables de routage selon ipv4.route-table et ipv6.route-table. Si FAUX, aucun itinéraire de ce type n'est ajouté automatiquement. Dans ce cas, l'utilisateur peut vouloir configurer des routes statiques dans ipv4.routes et ipv6.routes, respectivement."
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.h.in:384
 msgid "The 256 bit private-key in base64 encoding."
 msgstr "La clé privée 256 bits en encodage base64."
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:385
 msgid "Flags indicating how to handle the \"private-key\" property."
 msgstr "Marqueurs indiquant comment gérer la propriété \"private-key\"."
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.h.in:386
 msgid ""
 "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
 "whatever the device is already set to\"."
-msgstr ""
-"Canal IEEE 802.15.4. Un nombre entier relatif ou -1, signifie « ne rien "
-"indiquer, utiliser le périphérique déjà configuré »."
+msgstr "Canal IEEE 802.15.4. Un nombre entier relatif ou -1, signifie « ne rien indiquer, utiliser le périphérique déjà configuré »."
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
-msgstr ""
-"Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique de "
-"couche MAC IEEE 802.15.4 (WPAN) dont l'adresse MAC permanente correspond."
+msgstr "Si elle est spécifiée, cette connexion ne s'appliquera qu'au périphérique de couche MAC IEEE 802.15.4 (WPAN) dont l'adresse MAC permanente correspond."
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:388
 msgid ""
 "IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, "
 "use whatever the device is already set to\"."
-msgstr ""
-"Page Canal IEEE 802.15.4. Un nombre entier relatif ou -1, signifie « ne rien "
-"indiquer, utiliser le périphérique déjà configuré »."
+msgstr "Page Canal IEEE 802.15.4. Un nombre entier relatif ou -1, signifie « ne rien indiquer, utiliser le périphérique déjà configuré »."
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.h.in:389
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "IEEE 802.15.4 Identifiant PAN (Personal Area Network)."
 
-#: ../clients/common/settings-docs.h.in:384
-msgid ""
-"Short IEEE 802.15.4 address to be used within a restricted environment."
-msgstr ""
-"Adresse IEEE 802.15.4 courte à utiliser dans un environnement restreint."
+#: ../clients/common/settings-docs.h.in:390
+msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
+msgstr "Adresse IEEE 802.15.4 courte à utiliser dans un environnement restreint."
 
-#: ../clients/nm-online.c:89
+#: ../clients/nm-online.c:75
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../clients/nm-online.c:205
+#: ../clients/nm-online.c:191
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
-msgstr ""
-"Erreur : délai d'attente dépassé lors de la création de l'objet NMClient\n"
+msgstr "Erreur : délai d'attente dépassé lors de la création de l'objet NMClient\n"
 
-#: ../clients/nm-online.c:225
+#: ../clients/nm-online.c:211
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "Erreur : impossible de créer l'objet NMClient : %s\n"
 
-#: ../clients/nm-online.c:251
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
 msgstr "Ne rien imprimer"
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "Attend que NetworkManager démarre au  lieu d'une connexion"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:239
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
-msgstr ""
-"Temps d'attente de connexion en secondes (sans l'option, la valeur par "
-"défaut est 30)"
+msgstr "Temps d'attente de connexion en secondes (sans l'option, la valeur par défaut est 30)"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:240
 msgid "Exit immediately if NetworkManager is not running or connecting"
-msgstr ""
-"Quitter immédiatement si NetworkManager n'exécute pas ou n'est pas en cours "
-"d'exécution"
+msgstr "Quitter immédiatement si NetworkManager n'exécute pas ou n'est pas en cours d'exécution"
 
-#: ../clients/nm-online.c:274
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
-msgstr ""
-"Attend que NetworkManager finisse d'activer les connexion réseau de "
-"démarrage."
+msgstr "Attend que NetworkManager finisse d'activer les connexion réseau de démarrage."
 
-#: ../clients/nm-online.c:281 ../clients/nm-online.c:287
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
-msgstr ""
-"Option invalide. Veuillez utiliser --help pour afficher une liste d'options "
-"valides."
+msgstr "Option invalide. Veuillez utiliser --help pour afficher une liste d'options valides."
 
-#: ../clients/tui/newt/nmt-newt-utils.c:175 ../clients/tui/nmt-editor.c:432
-#: ../clients/tui/nmt-password-dialog.c:173
-#: ../clients/tui/nmt-route-editor.c:121 ../clients/tui/nmtui-hostname.c:68
-#: ../clients/tui/nmtui.c:133
+#: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
+#: ../clients/tui/nmt-password-dialog.c:161
+#: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
+#: ../clients/tui/nmtui.c:121
 msgid "OK"
 msgstr "Valider"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:323
-#: ../clients/tui/newt/nmt-newt-utils.c:355
+#: ../clients/tui/newt/nmt-newt-utils.c:311
+#: ../clients/tui/newt/nmt-newt-utils.c:343
 #, c-format
 msgid "Could not create temporary file: %s"
 msgstr "Impossible de créer le fichier temporaire : %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:361
+#: ../clients/tui/newt/nmt-newt-utils.c:349
 #, c-format
 msgid "Editor failed: %s"
 msgstr "L'éditeur a échoué : %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:367
+#: ../clients/tui/newt/nmt-newt-utils.c:355
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "Impossible de relire le fichier : %s"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm/nm-device.c:1379
+#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/tui/nm-editor-utils.c:156
+#: ../clients/tui/nm-editor-utils.c:144
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexion Ethernet %d"
 
-#: ../clients/tui/nm-editor-utils.c:160 ../libnm/nm-device.c:1381
+#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/tui/nm-editor-utils.c:164
+#: ../clients/tui/nm-editor-utils.c:152
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../clients/tui/nm-editor-utils.c:169 ../libnm-core/nm-connection.c:2742
-#: ../libnm/nm-device.c:1397
+#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
+#: ../libnm/nm-device.c:1473
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:173
+#: ../clients/tui/nm-editor-utils.c:161
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexion InfiniBand %d"
 
-#: ../clients/tui/nm-editor-utils.c:178 ../libnm/nm-device.c:1395
+#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
 msgid "Mobile Broadband"
 msgstr "Haut débit mobile"
 
-#: ../clients/tui/nm-editor-utils.c:181
+#: ../clients/tui/nm-editor-utils.c:169
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "Connexion haut débit mobile %d"
 
-#: ../clients/tui/nm-editor-utils.c:187 ../clients/tui/nmt-page-dsl.c:61
+#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:191
+#: ../clients/tui/nm-editor-utils.c:179
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexion DSL %d"
 
-#: ../clients/tui/nm-editor-utils.c:196 ../libnm-core/nm-connection.c:2734
-#: ../libnm/nm-device.c:1399
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4935
+#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
+#: ../libnm/nm-device.c:1475
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
 msgid "Bond"
 msgstr "Liaison"
 
-#: ../clients/tui/nm-editor-utils.c:200
+#: ../clients/tui/nm-editor-utils.c:188
 #, c-format
 msgid "Bond connection %d"
 msgstr "Connexion de liaison %d"
 
-#: ../clients/tui/nm-editor-utils.c:205 ../libnm-core/nm-connection.c:2738
-#: ../libnm/nm-device.c:1403
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5290
+#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
+#: ../libnm/nm-device.c:1479
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../clients/tui/nm-editor-utils.c:210
+#: ../clients/tui/nm-editor-utils.c:198
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexion de pont %d"
 
-#: ../clients/tui/nm-editor-utils.c:214 ../libnm-core/nm-connection.c:2736
-#: ../libnm/nm-device.c:1401
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5008
+#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
+#: ../libnm/nm-device.c:1477
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
 msgid "Team"
 msgstr "Équipe"
 
-#: ../clients/tui/nm-editor-utils.c:219
+#: ../clients/tui/nm-editor-utils.c:207
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexion de l'équipe %d"
 
-#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-vlan.c:81
-#: ../libnm-core/nm-connection.c:2740 ../libnm/nm-device.c:1405
+#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
+#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:227
+#: ../clients/tui/nm-editor-utils.c:215
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexion VLAN %d"
 
-#: ../clients/tui/nm-editor-utils.c:231 ../clients/tui/nmt-page-ip-tunnel.c:135
+#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
 msgid "IP tunnel"
 msgstr "Tunnel IP"
 
-#: ../clients/tui/nm-editor-utils.c:235
+#: ../clients/tui/nm-editor-utils.c:223
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Connexion de tunnel IP %d"
 
-#: ../clients/tui/nm-editor-utils.c:250
+#: ../clients/tui/nm-editor-utils.c:238
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexion VPN %d"
 
-#: ../clients/tui/nmt-device-entry.c:367
+#: ../clients/tui/nmt-device-entry.c:355
 msgid "Select..."
 msgstr "Sélectionner..."
 
-#: ../clients/tui/nmt-edit-connection-list.c:109
+#: ../clients/tui/nmt-edit-connection-list.c:97
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../clients/tui/nmt-edit-connection-list.c:112
-#: ../clients/tui/nmt-page-ip4.c:168 ../clients/tui/nmt-page-ip6.c:167
-#: ../clients/tui/nmt-page-team-port.c:108 ../clients/tui/nmt-page-team.c:172
+#: ../clients/tui/nmt-edit-connection-list.c:100
+#: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:155
+#: ../clients/tui/nmt-page-team-port.c:96 ../clients/tui/nmt-page-team.c:160
 msgid "Edit..."
 msgstr "Modifier..."
 
-#: ../clients/tui/nmt-edit-connection-list.c:115
-#: ../clients/tui/nmtui-edit.c:528
+#: ../clients/tui/nmt-edit-connection-list.c:103
+#: ../clients/tui/nmtui-edit.c:516
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../clients/tui/nmt-editor-section.c:102
+#: ../clients/tui/nmt-editor-section.c:90
 msgid "Hide"
 msgstr "Masquer"
 
-#: ../clients/tui/nmt-editor-section.c:102
+#: ../clients/tui/nmt-editor-section.c:90
 msgid "Show"
 msgstr "Afficher"
 
-#: ../clients/tui/nmt-editor.c:99
+#: ../clients/tui/nmt-editor.c:87
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr ""
-"Impossible de créer un éditeur pour la connexion « %s » de type « %s »."
+msgstr "Impossible de créer un éditeur pour la connexion « %s » de type « %s »."
 
-#: ../clients/tui/nmt-editor.c:103
+#: ../clients/tui/nmt-editor.c:91
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
 msgstr "Impossible de créer un éditeur pour la connexion invalide « %s »."
 
-#: ../clients/tui/nmt-editor.c:113
+#: ../clients/tui/nmt-editor.c:101
 msgid "Edit Connection"
 msgstr "Modifier la connexion"
 
-#: ../clients/tui/nmt-editor.c:174
+#: ../clients/tui/nmt-editor.c:162
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "Impossible d'enregistrer la connexion : %s"
 
-#: ../clients/tui/nmt-editor.c:188
+#: ../clients/tui/nmt-editor.c:176
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "Impossible d'ajouter une nouvelle connexion : %s"
 
-#: ../clients/tui/nmt-editor.c:335
+#: ../clients/tui/nmt-editor.c:323
 msgid "Profile name"
 msgstr "Nom du profil"
 
-#: ../clients/tui/nmt-editor.c:346
+#: ../clients/tui/nmt-editor.c:334
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../clients/tui/nmt-editor.c:348
+#: ../clients/tui/nmt-editor.c:336
 msgid "Device"
 msgstr "Périphérique"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:408
+#: ../clients/tui/nmt-editor.c:396
 msgid "Automatically connect"
 msgstr "Connecter automatiquement"
 
-#: ../clients/tui/nmt-editor.c:414
+#: ../clients/tui/nmt-editor.c:402
 msgid "Available to all users"
 msgstr "Disponible à tous les utilisateurs"
 
-#: ../clients/tui/nmt-editor.c:429 ../clients/tui/nmt-password-dialog.c:170
-#: ../clients/tui/nmt-route-editor.c:114 ../clients/tui/nmtui-edit.c:219
-#: ../clients/tui/nmtui-edit.c:527 ../clients/tui/nmtui-hostname.c:66
+#: ../clients/tui/nmt-editor.c:417 ../clients/tui/nmt-password-dialog.c:158
+#: ../clients/tui/nmt-route-editor.c:102 ../clients/tui/nmtui-edit.c:207
+#: ../clients/tui/nmtui-edit.c:515 ../clients/tui/nmtui-hostname.c:54
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../clients/tui/nmt-mtu-entry.c:83
+#: ../clients/tui/nmt-mtu-entry.c:71
 msgid "(default)"
 msgstr "(par défaut)"
 
-#: ../clients/tui/nmt-mtu-entry.c:85 ../clients/tui/nmt-mtu-entry.c:116
+#: ../clients/tui/nmt-mtu-entry.c:73 ../clients/tui/nmt-mtu-entry.c:104
 msgid "bytes"
 msgstr "octets"
 
-#: ../clients/tui/nmt-page-bond.c:87
+#: ../clients/tui/nmt-page-bond.c:75
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../clients/tui/nmt-page-bond.c:88
+#: ../clients/tui/nmt-page-bond.c:76
 msgid "Active Backup"
 msgstr "Active Backup"
 
-#: ../clients/tui/nmt-page-bond.c:89
+#: ../clients/tui/nmt-page-bond.c:77
 msgid "XOR"
 msgstr "XOR"
 
-#: ../clients/tui/nmt-page-bond.c:90
+#: ../clients/tui/nmt-page-bond.c:78
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../clients/tui/nmt-page-bond.c:91
+#: ../clients/tui/nmt-page-bond.c:79
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../clients/tui/nmt-page-bond.c:92
+#: ../clients/tui/nmt-page-bond.c:80
 msgid "Adaptive Transmit Load Balancing (tlb)"
 msgstr "Adaptive Transmit Load Balancing (tlb)"
 
-#: ../clients/tui/nmt-page-bond.c:93
+#: ../clients/tui/nmt-page-bond.c:81
 msgid "Adaptive Load Balancing (alb)"
 msgstr "Adaptive Load Balancing (alb)"
 
-#: ../clients/tui/nmt-page-bond.c:99
+#: ../clients/tui/nmt-page-bond.c:87
 msgid "MII (recommended)"
 msgstr "MII (recommandé)"
 
-#: ../clients/tui/nmt-page-bond.c:100
+#: ../clients/tui/nmt-page-bond.c:88
 msgid "ARP"
 msgstr "ARP"
 
-#: ../clients/tui/nmt-page-bond.c:361
+#: ../clients/tui/nmt-page-bond.c:349
 msgid "BOND"
 msgstr "LIEN"
 
-#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-bridge.c:84
-#: ../clients/tui/nmt-page-team.c:151
+#: ../clients/tui/nmt-page-bond.c:353 ../clients/tui/nmt-page-bridge.c:72
+#: ../clients/tui/nmt-page-team.c:139
 msgid "Slaves"
 msgstr "Esclaves"
 
-#: ../clients/tui/nmt-page-bond.c:377 ../clients/tui/nmt-page-ip-tunnel.c:147
-#: ../clients/tui/nmt-page-wifi.c:229
+#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
+#: ../clients/tui/nmt-page-wifi.c:218
 msgid "Mode"
 msgstr "Mode"
 
-#: ../clients/tui/nmt-page-bond.c:383
+#: ../clients/tui/nmt-page-bond.c:371
 msgid "Primary"
 msgstr "Principal"
 
-#: ../clients/tui/nmt-page-bond.c:389
+#: ../clients/tui/nmt-page-bond.c:377
 msgid "Link monitoring"
 msgstr "Surveillance du lien"
 
-#: ../clients/tui/nmt-page-bond.c:395 ../clients/tui/nmt-page-bond.c:402
-#: ../clients/tui/nmt-page-bond.c:409 ../clients/tui/nmt-page-bond.c:416
+#: ../clients/tui/nmt-page-bond.c:383 ../clients/tui/nmt-page-bond.c:390
+#: ../clients/tui/nmt-page-bond.c:397 ../clients/tui/nmt-page-bond.c:404
 msgctxt "milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: ../clients/tui/nmt-page-bond.c:396 ../clients/tui/nmt-page-bond.c:417
+#: ../clients/tui/nmt-page-bond.c:384 ../clients/tui/nmt-page-bond.c:405
 msgid "Monitoring frequency"
 msgstr "Fréquence de la surveillance"
 
-#: ../clients/tui/nmt-page-bond.c:403
+#: ../clients/tui/nmt-page-bond.c:391
 msgid "Link up delay"
 msgstr "Lier le délai"
 
-#: ../clients/tui/nmt-page-bond.c:410
+#: ../clients/tui/nmt-page-bond.c:398
 msgid "Link down delay"
 msgstr "Défaire la liaison du délai"
 
-#: ../clients/tui/nmt-page-bond.c:423
+#: ../clients/tui/nmt-page-bond.c:411
 msgid "ARP targets"
 msgstr "Cibles ARP"
 
-#: ../clients/tui/nmt-page-bond.c:430 ../clients/tui/nmt-page-ethernet.c:76
-#: ../clients/tui/nmt-page-vlan.c:109 ../clients/tui/nmt-page-wifi.c:363
+#: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
 msgid "Cloned MAC address"
 msgstr "Adresse MAC clonée"
 
-#: ../clients/tui/nmt-page-bridge-port.c:59
+#: ../clients/tui/nmt-page-bridge-port.c:47
 msgid "BRIDGE PORT"
 msgstr "BRIDGE PORT"
 
-#: ../clients/tui/nmt-page-bridge-port.c:66
-#: ../clients/tui/nmt-page-bridge.c:117
+#: ../clients/tui/nmt-page-bridge-port.c:54
+#: ../clients/tui/nmt-page-bridge.c:105
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../clients/tui/nmt-page-bridge-port.c:72
+#: ../clients/tui/nmt-page-bridge-port.c:60
 msgid "Path cost"
 msgstr "Coût du chemin"
 
-#: ../clients/tui/nmt-page-bridge-port.c:74
+#: ../clients/tui/nmt-page-bridge-port.c:62
 msgid "Hairpin mode"
 msgstr "Mode Hairpin"
 
-#: ../clients/tui/nmt-page-bridge.c:80
+#: ../clients/tui/nmt-page-bridge.c:68
 msgid "BRIDGE"
 msgstr "BRIDGE"
 
-#: ../clients/tui/nmt-page-bridge.c:95 ../clients/tui/nmt-page-bridge.c:126
-#: ../clients/tui/nmt-page-bridge.c:136 ../clients/tui/nmt-page-bridge.c:146
+#: ../clients/tui/nmt-page-bridge.c:83 ../clients/tui/nmt-page-bridge.c:114
+#: ../clients/tui/nmt-page-bridge.c:124 ../clients/tui/nmt-page-bridge.c:134
 msgid "seconds"
 msgstr "secondes"
 
-#: ../clients/tui/nmt-page-bridge.c:96
+#: ../clients/tui/nmt-page-bridge.c:84
 msgid "Aging time"
 msgstr "Durée de vieillissement"
 
-#: ../clients/tui/nmt-page-bridge.c:98
+#: ../clients/tui/nmt-page-bridge.c:86
 msgid "Enable IGMP snooping"
 msgstr "Activer le snoopingIGMP"
 
-#: ../clients/tui/nmt-page-bridge.c:104
+#: ../clients/tui/nmt-page-bridge.c:92
 msgid "Enable STP (Spanning Tree Protocol)"
 msgstr "Activer le protocole STP (Spanning Tree Protocol)"
 
-#: ../clients/tui/nmt-page-bridge.c:127
+#: ../clients/tui/nmt-page-bridge.c:115
 msgid "Forward delay"
 msgstr "Délai de réacheminement"
 
-#: ../clients/tui/nmt-page-bridge.c:137
+#: ../clients/tui/nmt-page-bridge.c:125
 msgid "Hello time"
 msgstr "Durée Hello"
 
-#: ../clients/tui/nmt-page-bridge.c:147
+#: ../clients/tui/nmt-page-bridge.c:135
 msgid "Max age"
 msgstr "Age maximum"
 
-#: ../clients/tui/nmt-page-bridge.c:153
+#: ../clients/tui/nmt-page-bridge.c:141
 msgid "Group forward mask"
 msgstr "Group forward mask [0]"
 
-#: ../clients/tui/nmt-page-ethernet.c:69
+#: ../clients/tui/nmt-page-ethernet.c:57
 msgid "ETHERNET"
 msgstr "ETHERNET"
 
-#: ../clients/tui/nmt-page-ethernet.c:82
-#: ../clients/tui/nmt-page-infiniband.c:93
-#: ../clients/tui/nmt-page-ip-tunnel.c:185 ../clients/tui/nmt-page-vlan.c:115
-#: ../clients/tui/nmt-page-wifi.c:369
+#: ../clients/tui/nmt-page-ethernet.c:70
+#: ../clients/tui/nmt-page-infiniband.c:81
+#: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
+#: ../clients/tui/nmt-page-wifi.c:359
 msgid "MTU"
 msgstr "MTU"
 
-#: ../clients/tui/nmt-page-infiniband.c:46
+#: ../clients/tui/nmt-page-infiniband.c:34
 msgid "Datagram"
 msgstr "Datagramme"
 
-#: ../clients/tui/nmt-page-infiniband.c:47
+#: ../clients/tui/nmt-page-infiniband.c:35
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../clients/tui/nmt-page-infiniband.c:80
+#: ../clients/tui/nmt-page-infiniband.c:68
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
-#: ../clients/tui/nmt-page-infiniband.c:87
+#: ../clients/tui/nmt-page-infiniband.c:75
 msgid "Transport mode"
 msgstr "Mode de transport"
 
-#: ../clients/tui/nmt-page-ip4.c:37 ../clients/tui/nmt-page-ip6.c:42
+#: ../clients/tui/nmt-page-ip4.c:25 ../clients/tui/nmt-page-ip6.c:30
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../clients/tui/nmt-page-ip4.c:38 ../clients/tui/nmt-page-ip6.c:38
+#: ../clients/tui/nmt-page-ip4.c:26 ../clients/tui/nmt-page-ip6.c:26
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:40
+#: ../clients/tui/nmt-page-ip4.c:27 ../clients/tui/nmt-page-ip6.c:28
 msgid "Link-Local"
 msgstr "Lien-Local"
 
-#: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
+#: ../clients/tui/nmt-page-ip4.c:28 ../clients/tui/nmt-page-ip6.c:29
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../clients/tui/nmt-page-ip4.c:41
+#: ../clients/tui/nmt-page-ip4.c:29
 msgid "Shared"
 msgstr "Partagé"
 
-#: ../clients/tui/nmt-page-ip4.c:81 ../clients/tui/nmt-page-ip6.c:82
+#: ../clients/tui/nmt-page-ip4.c:69 ../clients/tui/nmt-page-ip6.c:70
 msgid "(No custom routes)"
 msgstr "(aucune route personnalisée)"
 
-#: ../clients/tui/nmt-page-ip4.c:84 ../clients/tui/nmt-page-ip6.c:85
+#: ../clients/tui/nmt-page-ip4.c:72 ../clients/tui/nmt-page-ip6.c:73
 #, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
 msgstr[0] "Une route personnalisée"
 msgstr[1] "%d routes personnalisées"
 
-#: ../clients/tui/nmt-page-ip4.c:127
+#: ../clients/tui/nmt-page-ip4.c:115
 msgid "IPv4 CONFIGURATION"
 msgstr "CONFIGURATION IPv4"
 
-#: ../clients/tui/nmt-page-ip4.c:135 ../clients/tui/nmt-page-ip6.c:136
+#: ../clients/tui/nmt-page-ip4.c:123 ../clients/tui/nmt-page-ip6.c:124
 msgid "Addresses"
 msgstr "Adresses"
 
-#: ../clients/tui/nmt-page-ip4.c:149 ../clients/tui/nmt-page-ip6.c:150
+#: ../clients/tui/nmt-page-ip4.c:137 ../clients/tui/nmt-page-ip6.c:138
 msgid "DNS servers"
 msgstr "Serveurs DNS"
 
-#: ../clients/tui/nmt-page-ip4.c:155 ../clients/tui/nmt-page-ip6.c:156
+#: ../clients/tui/nmt-page-ip4.c:143 ../clients/tui/nmt-page-ip6.c:144
 msgid "Search domains"
 msgstr "Domaines de recherche"
 
-#: ../clients/tui/nmt-page-ip4.c:170 ../clients/tui/nmt-page-ip6.c:169
+#: ../clients/tui/nmt-page-ip4.c:158 ../clients/tui/nmt-page-ip6.c:157
 msgid "Routing"
 msgstr "Routage"
 
-#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
+#: ../clients/tui/nmt-page-ip4.c:160 ../clients/tui/nmt-page-ip6.c:159
 msgid "Never use this network for default route"
 msgstr "Ne jamais utiliser ce réseau comme route par défaut"
 
-#: ../clients/tui/nmt-page-ip4.c:178 ../clients/tui/nmt-page-ip6.c:177
+#: ../clients/tui/nmt-page-ip4.c:166 ../clients/tui/nmt-page-ip6.c:165
 msgid "Ignore automatically obtained routes"
 msgstr "Ignorer les routes obtenues automatiquement"
 
-#: ../clients/tui/nmt-page-ip4.c:184 ../clients/tui/nmt-page-ip6.c:183
+#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
 msgid "Ignore automatically obtained DNS parameters"
 msgstr "Ignorer les paramètres DNS obtenus automatiquement"
 
-#: ../clients/tui/nmt-page-ip4.c:192
+#: ../clients/tui/nmt-page-ip4.c:180
 msgid "Require IPv4 addressing for this connection"
 msgstr "Requiert l'adressage IPv4 pour cette connexion"
 
-#: ../clients/tui/nmt-page-ip6.c:37
+#: ../clients/tui/nmt-page-ip6.c:25
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../clients/tui/nmt-page-ip6.c:39
+#: ../clients/tui/nmt-page-ip6.c:27
 msgid "Automatic (DHCP-only)"
 msgstr "Automatique (DHCP uniquement)"
 
-#: ../clients/tui/nmt-page-ip6.c:128
+#: ../clients/tui/nmt-page-ip6.c:116
 msgid "IPv6 CONFIGURATION"
 msgstr "CONFIGURATION IPv6"
 
-#: ../clients/tui/nmt-page-ip6.c:191
+#: ../clients/tui/nmt-page-ip6.c:179
 msgid "Require IPv6 addressing for this connection"
 msgstr "Requiert l'adressage IPv6 pour cette connexion"
 
 #. The order must match the NM_IP_TUNNEL_MODE_* enum
-#: ../clients/tui/nmt-page-ip-tunnel.c:77
+#: ../clients/tui/nmt-page-ip-tunnel.c:65
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:78
+#: ../clients/tui/nmt-page-ip-tunnel.c:66
 msgid "GRE"
 msgstr "GRE"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:79
+#: ../clients/tui/nmt-page-ip-tunnel.c:67
 msgid "SIT"
 msgstr "SIT"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:80
+#: ../clients/tui/nmt-page-ip-tunnel.c:68
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:81
+#: ../clients/tui/nmt-page-ip-tunnel.c:69
 msgid "VTI"
 msgstr "VTI"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:82
+#: ../clients/tui/nmt-page-ip-tunnel.c:70
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:83
+#: ../clients/tui/nmt-page-ip-tunnel.c:71
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:84
+#: ../clients/tui/nmt-page-ip-tunnel.c:72
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:85
+#: ../clients/tui/nmt-page-ip-tunnel.c:73
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:149 ../clients/tui/nmt-page-vlan.c:86
+#: ../clients/tui/nmt-page-ip-tunnel.c:137 ../clients/tui/nmt-page-vlan.c:74
 msgid "Parent"
 msgstr "Parent"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:156
+#: ../clients/tui/nmt-page-ip-tunnel.c:144
 msgid "Local IP"
 msgstr "IP locale"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:162
+#: ../clients/tui/nmt-page-ip-tunnel.c:150
 msgid "Remote IP"
 msgstr "IP Distante"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:168
+#: ../clients/tui/nmt-page-ip-tunnel.c:156
 msgid "Input key"
 msgstr "Clé d'entrée"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:175
+#: ../clients/tui/nmt-page-ip-tunnel.c:163
 msgid "Output key"
 msgstr "Clé de sortie"
 
-#: ../clients/tui/nmt-page-ppp.c:130
+#: ../clients/tui/nmt-page-ppp.c:118
 msgid "PPP CONFIGURATION"
 msgstr "CONFIGURATION PPP"
 
-#: ../clients/tui/nmt-page-ppp.c:139
+#: ../clients/tui/nmt-page-ppp.c:127
 msgid "Allowed authentication methods:"
 msgstr "Méthodes d'authentification autorisées :"
 
-#: ../clients/tui/nmt-page-ppp.c:146
+#: ../clients/tui/nmt-page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
 
-#: ../clients/tui/nmt-page-ppp.c:154
+#: ../clients/tui/nmt-page-ppp.c:142
 msgid "PAP"
 msgstr "PAP"
 
-#: ../clients/tui/nmt-page-ppp.c:162
+#: ../clients/tui/nmt-page-ppp.c:150
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../clients/tui/nmt-page-ppp.c:170
+#: ../clients/tui/nmt-page-ppp.c:158
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../clients/tui/nmt-page-ppp.c:178
+#: ../clients/tui/nmt-page-ppp.c:166
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../clients/tui/nmt-page-ppp.c:194
+#: ../clients/tui/nmt-page-ppp.c:182
 msgid "Use point-to-point encryption (MPPE)"
 msgstr "Codification d'un point à un autre (MPPE)"
 
-#: ../clients/tui/nmt-page-ppp.c:206
+#: ../clients/tui/nmt-page-ppp.c:194
 msgid "Require 128-bit encryption"
 msgstr "Codification 128-bit exigée"
 
-#: ../clients/tui/nmt-page-ppp.c:216
+#: ../clients/tui/nmt-page-ppp.c:204
 msgid "Use stateful MPPE"
 msgstr "Utiliser MPPE stateful"
 
-#: ../clients/tui/nmt-page-ppp.c:228
+#: ../clients/tui/nmt-page-ppp.c:216
 msgid "Allow BSD data compression"
 msgstr "Autoriser la décompression de données BSD"
 
-#: ../clients/tui/nmt-page-ppp.c:236
+#: ../clients/tui/nmt-page-ppp.c:224
 msgid "Allow Deflate data compression"
 msgstr "Autoriser la déflation de compression de données"
 
-#: ../clients/tui/nmt-page-ppp.c:244
+#: ../clients/tui/nmt-page-ppp.c:232
 msgid "Use TCP header compression"
 msgstr "Utiliser la compression de l'en-tête TCP"
 
-#: ../clients/tui/nmt-page-ppp.c:254
+#: ../clients/tui/nmt-page-ppp.c:242
 msgid "Send PPP echo packets"
 msgstr "Envoyer les paquets d'échos PPP"
 
-#: ../clients/tui/nmt-page-team-port.c:91
+#: ../clients/tui/nmt-page-team-port.c:79
 msgid "TEAM PORT"
 msgstr "TEAM PORT"
 
-#: ../clients/tui/nmt-page-team-port.c:98 ../clients/tui/nmt-page-team.c:162
+#: ../clients/tui/nmt-page-team-port.c:86 ../clients/tui/nmt-page-team.c:150
 msgid "JSON configuration"
 msgstr "Configuration JSON"
 
-#: ../clients/tui/nmt-page-team.c:144
+#: ../clients/tui/nmt-page-team.c:132
 msgid "TEAM"
 msgstr "TEAM"
 
-#: ../clients/tui/nmt-page-vlan.c:101
+#: ../clients/tui/nmt-page-vlan.c:89
 msgid "VLAN id"
 msgstr "ID VLAN"
 
-#: ../clients/tui/nmt-page-wifi.c:63
+#: ../clients/tui/nmt-page-wifi.c:51
 msgctxt "Wi-Fi"
 msgid "Client"
 msgstr "Client"
 
-#: ../clients/tui/nmt-page-wifi.c:64
+#: ../clients/tui/nmt-page-wifi.c:52
 msgid "Access Point"
 msgstr "Point d'accès"
 
-#: ../clients/tui/nmt-page-wifi.c:65
+#: ../clients/tui/nmt-page-wifi.c:53
 msgid "Ad-Hoc Network"
 msgstr "Réseau Ad-Hoc"
 
-#: ../clients/tui/nmt-page-wifi.c:70
+#: ../clients/tui/nmt-page-wifi.c:58
 msgctxt "Wi-Fi"
 msgid "Automatic"
 msgstr "Automatique"
 
 #. 802.11a Wi-Fi network
-#: ../clients/tui/nmt-page-wifi.c:72
+#: ../clients/tui/nmt-page-wifi.c:60
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
 #. 802.11b / 802.11g Wi-Fi network
-#: ../clients/tui/nmt-page-wifi.c:74
+#: ../clients/tui/nmt-page-wifi.c:62
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../clients/tui/nmt-page-wifi.c:79
+#: ../clients/tui/nmt-page-wifi.c:67
 msgctxt "Wi-Fi security"
 msgid "None"
 msgstr "Aucun"
 
-#: ../clients/tui/nmt-page-wifi.c:80
+#: ../clients/tui/nmt-page-wifi.c:68
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../clients/tui/nmt-page-wifi.c:81
+#: ../clients/tui/nmt-page-wifi.c:69
+msgid "WPA3 Personal"
+msgstr "WPA3 Personal"
+
+#: ../clients/tui/nmt-page-wifi.c:70
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../clients/tui/nmt-page-wifi.c:82
+#: ../clients/tui/nmt-page-wifi.c:71
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clé WEP 40/128-bit (Hex ou ASCII)"
 
-#: ../clients/tui/nmt-page-wifi.c:83
+#: ../clients/tui/nmt-page-wifi.c:72
 msgid "WEP 128-bit Passphrase"
-msgstr "Phrase de passe WEP 128-bit "
+msgstr "Phrase de passe WEP 128-bit"
 
-#: ../clients/tui/nmt-page-wifi.c:84
+#: ../clients/tui/nmt-page-wifi.c:73
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dynamique (802.1x)"
 
-#: ../clients/tui/nmt-page-wifi.c:85
+#: ../clients/tui/nmt-page-wifi.c:74
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../clients/tui/nmt-page-wifi.c:90
+#: ../clients/tui/nmt-page-wifi.c:79
 msgctxt "WEP key index"
 msgid "1 (Default)"
 msgstr "1 (par défaut)"
 
-#: ../clients/tui/nmt-page-wifi.c:91
+#: ../clients/tui/nmt-page-wifi.c:80
 msgctxt "WEP key index"
 msgid "2"
 msgstr "2"
 
-#: ../clients/tui/nmt-page-wifi.c:92
+#: ../clients/tui/nmt-page-wifi.c:81
 msgctxt "WEP key index"
 msgid "3"
 msgstr "3"
 
-#: ../clients/tui/nmt-page-wifi.c:93
+#: ../clients/tui/nmt-page-wifi.c:82
 msgctxt "WEP key index"
 msgid "4"
 msgstr "4"
 
-#: ../clients/tui/nmt-page-wifi.c:98
+#: ../clients/tui/nmt-page-wifi.c:87
 msgid "Open System"
 msgstr "Système ouvert"
 
-#: ../clients/tui/nmt-page-wifi.c:99
+#: ../clients/tui/nmt-page-wifi.c:88
 msgid "Shared Key"
 msgstr "Clé partagée"
 
-#: ../clients/tui/nmt-page-wifi.c:213
+#: ../clients/tui/nmt-page-wifi.c:202
 msgid "WI-FI"
 msgstr "WI-FI"
 
-#: ../clients/tui/nmt-page-wifi.c:255
+#: ../clients/tui/nmt-page-wifi.c:244
 msgid "Channel"
 msgstr "Canal"
 
-#: ../clients/tui/nmt-page-wifi.c:260
-msgid "Security"
-msgstr "Sécurité"
-
 #. "wpa-enterprise"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:281
+#: ../clients/tui/nmt-page-wifi.c:271
 msgid "(No support for wpa-enterprise yet...)"
 msgstr "(Aucune prise en charge de wpa-enterprise pour le moment...)"
 
-#: ../clients/tui/nmt-page-wifi.c:291 ../clients/tui/nmt-page-wifi.c:310
+#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
 msgid "WEP index"
-msgstr "Index WEP "
+msgstr "Index WEP"
 
-#: ../clients/tui/nmt-page-wifi.c:299 ../clients/tui/nmt-page-wifi.c:318
+#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
 msgid "Authentication"
 msgstr "Authentification"
 
 #. "dynamic-wep"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:324
+#: ../clients/tui/nmt-page-wifi.c:314
 msgid "(No support for dynamic-wep yet...)"
 msgstr "(Aucune prise en charge de dynamic-wep pour le moment...)"
 
-#: ../clients/tui/nmt-page-wifi.c:357
+#: ../clients/tui/nmt-page-wifi.c:347
 msgid "BSSID"
 msgstr "BSSID"
 
-#: ../clients/tui/nmt-password-fields.c:127
+#: ../clients/tui/nmt-password-fields.c:115
 msgid "Ask for this password every time"
 msgstr "Demander ce mot de passe à chaque fois"
 
-#: ../clients/tui/nmt-password-fields.c:128
+#: ../clients/tui/nmt-password-fields.c:116
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: ../clients/tui/nmt-route-table.c:186
+#: ../clients/tui/nmt-route-table.c:174
 msgid "Destination"
 msgstr "Destination"
 
-#: ../clients/tui/nmt-route-table.c:186
+#: ../clients/tui/nmt-route-table.c:174
 msgid "Prefix"
 msgstr "Préfixe"
 
-#: ../clients/tui/nmt-route-table.c:195
+#: ../clients/tui/nmt-route-table.c:183
 msgid "Next Hop"
 msgstr "Hop suivant"
 
-#: ../clients/tui/nmt-route-table.c:203
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Metric"
 msgstr "Métrique"
 
-#: ../clients/tui/nmt-route-table.c:223
+#: ../clients/tui/nmt-route-table.c:211
 msgid "No custom routes are defined."
 msgstr "Aucune route personnalisée n'est définie."
 
-#: ../clients/tui/nmt-slave-list.c:133
+#: ../clients/tui/nmt-slave-list.c:121
 msgid "Select the type of slave connection you wish to add."
 msgstr "Sélectionnez le type de connexion esclave que vous souhaitez ajouter."
 
-#: ../clients/tui/nmt-widget-list.c:138
+#: ../clients/tui/nmt-widget-list.c:126
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: ../clients/tui/nmt-widget-list.c:201
+#: ../clients/tui/nmt-widget-list.c:189
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../clients/tui/nmtui-connect.c:54
+#: ../clients/tui/nmtui-connect.c:42
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
-msgstr ""
-"openconnect sera exécuté pour authentifier.\n"
+msgstr "openconnect sera exécuté pour authentifier.\n"
 "Retournera à nmtui une fois terminé."
 
-#: ../clients/tui/nmtui-connect.c:68
+#: ../clients/tui/nmtui-connect.c:56
 #, c-format
 msgid "Error: openconnect failed: %s"
 msgstr "Erreur : openconnect a échoué : %s"
 
-#: ../clients/tui/nmtui-connect.c:75
+#: ../clients/tui/nmtui-connect.c:63
 #, c-format
 msgid "openconnect failed with status %d"
 msgstr "openconnect a échoué avec pour statut %d"
 
-#: ../clients/tui/nmtui-connect.c:79
+#: ../clients/tui/nmtui-connect.c:67
 #, c-format
 msgid "openconnect failed with signal %d"
 msgstr "openconnect a échoué avec un signal %d"
 
-#: ../clients/tui/nmtui-connect.c:182
+#: ../clients/tui/nmtui-connect.c:170
 #, c-format
 msgid "Activation failed: %s"
 msgstr "Échec de l'activation %s"
 
-#: ../clients/tui/nmtui-connect.c:253
+#: ../clients/tui/nmtui-connect.c:241
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: ../clients/tui/nmtui-connect.c:291 ../clients/tui/nmtui-connect.c:328
+#: ../clients/tui/nmtui-connect.c:279 ../clients/tui/nmtui-connect.c:316
 #, c-format
 msgid "Could not activate connection: %s"
 msgstr "Impossible d'activer la connexion : « %s »"
 
-#: ../clients/tui/nmtui-connect.c:390 ../clients/tui/nmtui-connect.c:439
+#: ../clients/tui/nmtui-connect.c:378 ../clients/tui/nmtui-connect.c:427
 msgid "Activate"
 msgstr "Activer"
 
-#: ../clients/tui/nmtui-connect.c:392
+#: ../clients/tui/nmtui-connect.c:380
 msgid "Deactivate"
 msgstr "Désactiver"
 
-#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
-#: ../clients/tui/nmtui.c:127
+#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
+#: ../clients/tui/nmtui.c:115
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
+#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
 msgid "Back"
 msgstr "Retour"
 
-#: ../clients/tui/nmtui-connect.c:467
+#: ../clients/tui/nmtui-connect.c:455
 #, c-format
 msgid "No such connection '%s'"
 msgstr "Aucune connexion « %s »"
 
-#: ../clients/tui/nmtui-connect.c:469
+#: ../clients/tui/nmtui-connect.c:457
 msgid "Connection is already active"
 msgstr "La connexion est déjà active"
 
-#: ../clients/tui/nmtui-edit.c:227
+#: ../clients/tui/nmtui-edit.c:215
 msgid "Create"
 msgstr "Créer"
 
-#: ../clients/tui/nmtui-edit.c:369
+#: ../clients/tui/nmtui-edit.c:357
 msgid "Select the type of connection you wish to create."
 msgstr "Sélectionnez le type de connexion que vous souhaitez créer."
 
-#: ../clients/tui/nmtui-edit.c:377
+#: ../clients/tui/nmtui-edit.c:365
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"Si vous êtes en train de créer un VPN et que la connexion VPN que vous "
-"souhaitez créer n'apparaît pas dans la liste, il se peut que le greffon VPN "
-"installé ne soit pas le bon. "
+msgstr "Si vous êtes en train de créer un VPN et que la connexion VPN que vous souhaitez créer n'apparaît pas dans la liste, il se peut que le greffon VPN installé ne soit pas le bon."
 
-#: ../clients/tui/nmtui-edit.c:413 ../clients/tui/nmtui-edit.c:429
+#: ../clients/tui/nmtui-edit.c:401 ../clients/tui/nmtui-edit.c:417
 msgid "New Connection"
 msgstr "Nouvelle connexion"
 
-#: ../clients/tui/nmtui-edit.c:468
+#: ../clients/tui/nmtui-edit.c:456
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "Impossible de supprimer la connexion : %s"
 
-#: ../clients/tui/nmtui-edit.c:507
+#: ../clients/tui/nmtui-edit.c:495
 #, c-format
 msgid "Could not delete connection '%s': %s"
 msgstr "Impossible de supprimer la connexion : « %s » : %s"
 
-#: ../clients/tui/nmtui-edit.c:529
+#: ../clients/tui/nmtui-edit.c:517
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
 msgstr "Êtes-vous sûr de vouloir supprimer la connexion « %s » ?"
 
-#: ../clients/tui/nmtui-hostname.c:44
+#: ../clients/tui/nmtui-hostname.c:32
 msgid "Set Hostname"
 msgstr "Définir le nom d'hôte"
 
-#: ../clients/tui/nmtui-hostname.c:52
+#: ../clients/tui/nmtui-hostname.c:40
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
 #. TRANSLATORS: this indicates the result. ie, "I have set the hostname to ..."
-#: ../clients/tui/nmtui-hostname.c:115
+#: ../clients/tui/nmtui-hostname.c:103
 #, c-format
 msgid "Set hostname to '%s'"
 msgstr "Définir le nom d'hôte sur « %s »"
 
-#: ../clients/tui/nmtui-hostname.c:117
+#: ../clients/tui/nmtui-hostname.c:105
 #, c-format
 msgid "Unable to set hostname: %s"
 msgstr "Impossible de définir le nom d'hôte : %s"
 
-#: ../clients/tui/nmtui.c:50 ../clients/tui/nmtui.c:53
+#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
 msgid "connection"
 msgstr "connexion"
 
-#: ../clients/tui/nmtui.c:51
+#: ../clients/tui/nmtui.c:39
 msgid "Edit a connection"
 msgstr "Modifier une connexion"
 
-#: ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:42
 msgid "Activate a connection"
 msgstr "Activer une connexion"
 
-#: ../clients/tui/nmtui.c:56
+#: ../clients/tui/nmtui.c:44
 msgid "new hostname"
 msgstr "nouveau nom d'hôte"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:45
 msgid "Set system hostname"
 msgstr "Définir le nom d'hôte du système"
 
-#: ../clients/tui/nmtui.c:101
+#: ../clients/tui/nmtui.c:89
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:109
+#: ../clients/tui/nmtui.c:97
 msgid "Please select an option"
 msgstr "Veuillez sélectionner une option"
 
-#: ../clients/tui/nmtui.c:157
+#: ../clients/tui/nmtui.c:145
 msgid "Usage"
 msgstr "Syntaxe"
 
-#: ../clients/tui/nmtui.c:238
+#: ../clients/tui/nmtui.c:226
 msgid "Could not parse arguments"
 msgstr "Impossible d'analyser les arguments"
 
-#: ../clients/tui/nmtui.c:248
+#: ../clients/tui/nmtui.c:236
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "Impossible de contacter le NetworkManager : « %s »\n"
 
-#: ../clients/tui/nmtui.c:253
+#: ../clients/tui/nmtui.c:241
 msgid "NetworkManager is not running."
 msgstr "NetworkManager n'est pas en cours d'exécution."
 
-#: ../libnm-core/nm-crypto.c:219
+#: ../libnm-core/nm-crypto.c:204
 #, c-format
 msgid "PEM key file had no start tag"
 msgstr "Le fichier de clé PEM n'a pas de balise de fin «  »."
 
-#: ../libnm-core/nm-crypto.c:227
+#: ../libnm-core/nm-crypto.c:212
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "Le fichier de clé PEM n'a pas de balise de fin « %s »."
 
-#: ../libnm-core/nm-crypto.c:254
+#: ../libnm-core/nm-crypto.c:239
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Fichier PEM incorrect : Proc-Type n'est pas la première balise."
 
-#: ../libnm-core/nm-crypto.c:262
+#: ../libnm-core/nm-crypto.c:247
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Fichier PEM incorrect : étiquette Proc-Type « %s » inconnue."
 
-#: ../libnm-core/nm-crypto.c:274
+#: ../libnm-core/nm-crypto.c:259
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Fichier PEM incorrect : DEK-Info n'est pas la deuxième balise."
 
-#: ../libnm-core/nm-crypto.c:285
+#: ../libnm-core/nm-crypto.c:270
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Fichier PEM incorrect : aucun IV trouvé dans la balise DEK-Info."
 
-#: ../libnm-core/nm-crypto.c:293
+#: ../libnm-core/nm-crypto.c:278
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "Fichier PEM incorrect : format IV non valide dans la balise DEK-Info."
 
-#: ../libnm-core/nm-crypto.c:304
+#: ../libnm-core/nm-crypto.c:289
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Fichier PEM incorrect : chiffre de clé privée « %s » inconnu."
 
-#: ../libnm-core/nm-crypto.c:325
+#: ../libnm-core/nm-crypto.c:310
 #, c-format
 msgid "Could not decode private key."
 msgstr "Impossible de décoder la clé privée."
 
-#: ../libnm-core/nm-crypto.c:366
+#: ../libnm-core/nm-crypto.c:351
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "Impossible de trouver la balise initiale PKCS#8 attendue."
 
-#: ../libnm-core/nm-crypto.c:374
+#: ../libnm-core/nm-crypto.c:359
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "Impossible de trouver la balise terminale PKCS#8 attendue (« %s »)."
 
-#: ../libnm-core/nm-crypto.c:386
+#: ../libnm-core/nm-crypto.c:371
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Le décodage de la clé privée PKCS#8 a échoué."
 
-#: ../libnm-core/nm-crypto.c:415
+#: ../libnm-core/nm-crypto.c:400
 msgid "Failed to find expected TSS start tag."
 msgstr "Impossible de trouver la balise initiale TSS attendue."
 
-#: ../libnm-core/nm-crypto.c:423
+#: ../libnm-core/nm-crypto.c:408
 #, c-format
 msgid "Failed to find expected TSS end tag '%s'."
 msgstr "Impossible de trouver la balise terminale TSS attendue « %s »."
 
-#: ../libnm-core/nm-crypto.c:482
+#: ../libnm-core/nm-crypto.c:468
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "La longueur en octets de IV doit être paire."
 
-#: ../libnm-core/nm-crypto.c:498
+#: ../libnm-core/nm-crypto.c:484
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "Le IV contient des chiffres non hexadécimaux."
 
-#: ../libnm-core/nm-crypto.c:574
+#: ../libnm-core/nm-crypto.c:560
 #, c-format
 msgid "IV must contain at least 8 characters"
 msgstr "Le IV doit contenir au moins 8 caractères"
 
-#: ../libnm-core/nm-crypto.c:622
+#: ../libnm-core/nm-crypto.c:608
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "Impossible de déterminer le type de la clé privée."
 
-#: ../libnm-core/nm-crypto.c:634
+#: ../libnm-core/nm-crypto.c:620
 #, c-format
 msgid "Password provided, but key was not encrypted."
 msgstr "Mot de passe donné, mais la clé n'était pas encryptée."
 
-#: ../libnm-core/nm-crypto.c:695
+#: ../libnm-core/nm-crypto.c:681
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "Le certificat PEM n'a pas de balise initiale « %s »."
 
-#: ../libnm-core/nm-crypto.c:704
+#: ../libnm-core/nm-crypto.c:690
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "Le certificat PEM n'a pas de balise terminale « %s »."
 
-#: ../libnm-core/nm-crypto.c:716
+#: ../libnm-core/nm-crypto.c:702
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "Impossible de décoder le certificat."
 
-#: ../libnm-core/nm-crypto.c:745 ../libnm-core/nm-crypto.c:798
+#: ../libnm-core/nm-crypto.c:731 ../libnm-core/nm-crypto.c:784
 #, c-format
 msgid "Certificate file is empty"
 msgstr "Le fichier de certificat est vide"
 
-#: ../libnm-core/nm-crypto.c:778
+#: ../libnm-core/nm-crypto.c:764
 #, c-format
 msgid "Failed to recognize certificate"
 msgstr "Impossible de reconnaître le certificat."
 
-#: ../libnm-core/nm-crypto.c:890
+#: ../libnm-core/nm-crypto.c:876
 #, c-format
 msgid "not a valid private key"
 msgstr "clé privée non valide"
 
-#: ../libnm-core/nm-crypto-gnutls.c:74
+#: ../libnm-core/nm-crypto-gnutls.c:58
 msgid "Failed to initialize the crypto engine."
 msgstr "L'initialisation du moteur de chiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-gnutls.c:106 ../libnm-core/nm-crypto-nss.c:127
+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:112
 #, c-format
 msgid "Unsupported key cipher for decryption"
 msgstr "attribut «  » de type «  » non supporté"
 
-#: ../libnm-core/nm-crypto-gnutls.c:116 ../libnm-core/nm-crypto-nss.c:134
+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:119
 #, c-format
 msgid "Invalid IV length (must be at least %u)."
 msgstr "Longueur IV non valide (minimum %u)."
 
-#: ../libnm-core/nm-crypto-gnutls.c:133
+#: ../libnm-core/nm-crypto-gnutls.c:117
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
-msgstr ""
-"L'initialisation du contexte du chiffre de déchiffrement a échoué : %s (%s)"
+msgstr "L'initialisation du contexte du chiffre de déchiffrement a échoué : %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:145
+#: ../libnm-core/nm-crypto-gnutls.c:129
 #, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
 msgstr "Le déchiffrement de la clé privée a échoué : %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:159 ../libnm-core/nm-crypto-nss.c:221
+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:206
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr ""
-"Le déchiffrement de la clé privée a échoué : longueur de remplissage "
-"inattendue."
+msgstr "Le déchiffrement de la clé privée a échoué : longueur de remplissage inattendue."
 
-#: ../libnm-core/nm-crypto-gnutls.c:170 ../libnm-core/nm-crypto-nss.c:232
+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:217
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Le déchiffrement de la clé privée a échoué."
 
-#: ../libnm-core/nm-crypto-gnutls.c:204 ../libnm-core/nm-crypto-nss.c:287
+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:272
 #, c-format
 msgid "Unsupported key cipher for encryption"
 msgstr "attribut «  » de type «  » non supporté"
 
-#: ../libnm-core/nm-crypto-gnutls.c:220
+#: ../libnm-core/nm-crypto-gnutls.c:204
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
-msgstr ""
-"L'initialisation du contexte du cryptage de chiffrement a échoué : %s (%s)"
+msgstr "L'initialisation du contexte du cryptage de chiffrement a échoué : %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:246
+#: ../libnm-core/nm-crypto-gnutls.c:230
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "Le chiffrement des données a échoué : %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:271
+#: ../libnm-core/nm-crypto-gnutls.c:255
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Erreur lors de l'initialisation des données du certificat : %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:293
+#: ../libnm-core/nm-crypto-gnutls.c:277
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "Impossible de décoder le certificat : %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:320
+#: ../libnm-core/nm-crypto-gnutls.c:304
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "L'initialisation du décodeur PKCS#12 a échoué : %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:333
+#: ../libnm-core/nm-crypto-gnutls.c:317
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "Impossible de décoder le fichier PKCS#12 : %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:347
+#: ../libnm-core/nm-crypto-gnutls.c:331
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "Impossible de vérifier le fichier PKCS#12 : %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:375
+#: ../libnm-core/nm-crypto-gnutls.c:359
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "L'initialisation du décodeur PKCS#8 a échoué : %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:402
+#: ../libnm-core/nm-crypto-gnutls.c:386
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "Impossible de décoder le fichier PKCS#8 : %s"
 
-#: ../libnm-core/nm-crypto-nss.c:80
+#: ../libnm-core/nm-crypto-nss.c:65
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "L'initialisation du moteur de chiffrement a échoué : %d."
 
-#: ../libnm-core/nm-crypto-nss.c:146
+#: ../libnm-core/nm-crypto-nss.c:131
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
-msgstr ""
-"L'initialisation de l'emplacement du chiffre de déchiffrement a échoué."
+msgstr "L'initialisation de l'emplacement du chiffre de déchiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:156
+#: ../libnm-core/nm-crypto-nss.c:141
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "La définition de la clé symétrique pour le déchiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:166
+#: ../libnm-core/nm-crypto-nss.c:151
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "La définition de IV pour le déchiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:174
+#: ../libnm-core/nm-crypto-nss.c:159
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "L'initialisation du contexte de déchiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:190
+#: ../libnm-core/nm-crypto-nss.c:175
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "Le déchiffrement de la clé privée a échoué : %d."
 
-#: ../libnm-core/nm-crypto-nss.c:198
+#: ../libnm-core/nm-crypto-nss.c:183
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr ""
-"Le déchiffrement de la clé privée a échoué : les données déchiffrées sont "
-"trop longues."
+msgstr "Le déchiffrement de la clé privée a échoué : les données déchiffrées sont trop longues."
 
-#: ../libnm-core/nm-crypto-nss.c:209
+#: ../libnm-core/nm-crypto-nss.c:194
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "La finalisation du déchiffrement de la clé privée a échoué : %d."
 
-#: ../libnm-core/nm-crypto-nss.c:298
+#: ../libnm-core/nm-crypto-nss.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
-msgstr ""
-"L'initialisation de l'emplacement du cryptage de chiffrement a échoué."
+msgstr "L'initialisation de l'emplacement du cryptage de chiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:306
+#: ../libnm-core/nm-crypto-nss.c:291
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "La définition de la clé symétrique pour le chiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:314
+#: ../libnm-core/nm-crypto-nss.c:299
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "La définition de IV pour le chiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:322
+#: ../libnm-core/nm-crypto-nss.c:307
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "L'initialisation du contexte de chiffrement a échoué."
 
-#: ../libnm-core/nm-crypto-nss.c:345
+#: ../libnm-core/nm-crypto-nss.c:330
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "Le chiffrement a échoué : %d."
 
-#: ../libnm-core/nm-crypto-nss.c:353
+#: ../libnm-core/nm-crypto-nss.c:338
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "Quantité de données inattendue après chiffrement."
 
-#: ../libnm-core/nm-crypto-nss.c:391
+#: ../libnm-core/nm-crypto-nss.c:376
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "Impossible de décoder le certificat : %d"
 
-#: ../libnm-core/nm-crypto-nss.c:437
+#: ../libnm-core/nm-crypto-nss.c:422
 #, c-format
 msgid "Password must be UTF-8"
 msgstr "Le mot de passe doit être UTF-8"
 
-#: ../libnm-core/nm-crypto-nss.c:460
+#: ../libnm-core/nm-crypto-nss.c:445
 #, c-format
 msgid "Couldn't initialize slot"
-msgstr "L'initialisation du décodeur PKCS#8 a échoué : "
+msgstr "L'initialisation du décodeur PKCS#8 a échoué"
 
-#: ../libnm-core/nm-crypto-nss.c:468
+#: ../libnm-core/nm-crypto-nss.c:453
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "Impossible d'initialiser le décodeur PKCS#12 : %d"
 
-#: ../libnm-core/nm-crypto-nss.c:477
+#: ../libnm-core/nm-crypto-nss.c:462
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "Impossible de décoder le fichier PKCS#12 : %d"
 
-#: ../libnm-core/nm-crypto-nss.c:486
+#: ../libnm-core/nm-crypto-nss.c:471
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "Impossible de vérifier le fichier PKCS#12 : %d"
 
-#: ../libnm-core/nm-crypto-nss.c:536
+#: ../libnm-core/nm-crypto-nss.c:521
 msgid "Could not generate random data."
 msgstr "Impossible de générer des données aléatoires."
 
-#: ../libnm-core/nm-connection.c:320
+#: ../libnm-core/nm-connection.c:306
 msgid "wrong type; should be a list of strings."
 msgstr "Type erroné ; doit correspondre à une liste de chaînes."
 
-#: ../libnm-core/nm-connection.c:390
+#: ../libnm-core/nm-connection.c:376
 msgid "unknown setting name"
 msgstr "Nom de paramètre inconnu"
 
-#: ../libnm-core/nm-connection.c:402
+#: ../libnm-core/nm-connection.c:388
 msgid "duplicate setting name"
 msgstr "reproduire le nom du paramètre"
 
-#: ../libnm-core/nm-connection.c:1414
+#: ../libnm-core/nm-connection.c:1423
 msgid "setting not found"
 msgstr "paramètre non trouvé"
 
-#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
-#: ../libnm-core/nm-connection.c:1530
+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
+#: ../libnm-core/nm-connection.c:1539
 msgid "setting is required for non-slave connections"
 msgstr "paramètre requis pour les connexions non esclaves"
 
-#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
-#: ../libnm-core/nm-connection.c:1543
+#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
+#: ../libnm-core/nm-connection.c:1552
 msgid "setting not allowed in slave connection"
 msgstr "le paramètre n'est pas accepté dans la connexion esclave"
 
-#: ../libnm-core/nm-connection.c:1647
+#: ../libnm-core/nm-connection.c:1657
 msgid "Unexpected failure to normalize the connection"
 msgstr "Erreur inattendue lors de la normalisation de la connexion"
 
-#: ../libnm-core/nm-connection.c:1710
+#: ../libnm-core/nm-connection.c:1720
 msgid "Unexpected failure to verify the connection"
 msgstr "Erreur inattendue lors de la vérification de la connexion"
 
-#: ../libnm-core/nm-connection.c:1746
+#: ../libnm-core/nm-connection.c:1756
 #, c-format
 msgid "unexpected uuid %s instead of %s"
 msgstr "uuid inattendu %s au lieu de %s"
 
-#: ../libnm-core/nm-connection.c:2599 ../libnm-core/nm-setting-8021x.c:2567
-#: ../libnm-core/nm-setting-8021x.c:2584 ../libnm-core/nm-setting-8021x.c:2615
-#: ../libnm-core/nm-setting-8021x.c:2632 ../libnm-core/nm-setting-8021x.c:2674
-#: ../libnm-core/nm-setting-8021x.c:2686 ../libnm-core/nm-setting-8021x.c:2704
-#: ../libnm-core/nm-setting-8021x.c:2716 ../libnm-core/nm-setting-8021x.c:2740
-#: ../libnm-core/nm-setting-8021x.c:2822 ../libnm-core/nm-setting-adsl.c:172
-#: ../libnm-core/nm-setting-bluetooth.c:123
-#: ../libnm-core/nm-setting-bluetooth.c:181
-#: ../libnm-core/nm-setting-bluetooth.c:195 ../libnm-core/nm-setting-cdma.c:142
-#: ../libnm-core/nm-setting-connection.c:968
-#: ../libnm-core/nm-setting-connection.c:1011
-#: ../libnm-core/nm-setting-connection.c:1191
-#: ../libnm-core/nm-setting-ip-config.c:4905
-#: ../libnm-core/nm-setting-ip-tunnel.c:373
-#: ../libnm-core/nm-setting-olpc-mesh.c:98
-#: ../libnm-core/nm-setting-ovs-patch.c:91 ../libnm-core/nm-setting-pppoe.c:144
-#: ../libnm-core/nm-setting-vpn.c:530 ../libnm-core/nm-setting-vxlan.c:337
-#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:108
-#: ../libnm-core/nm-setting-wireless-security.c:917
-#: ../libnm-core/nm-setting-wireless.c:776
+#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
+#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
+#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
+#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
+#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
+#: ../libnm-core/nm-setting-bluetooth.c:109
+#: ../libnm-core/nm-setting-bluetooth.c:167
+#: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
+#: ../libnm-core/nm-setting-connection.c:954
+#: ../libnm-core/nm-setting-connection.c:997
+#: ../libnm-core/nm-setting-connection.c:1177
+#: ../libnm-core/nm-setting-ip-config.c:4946
+#: ../libnm-core/nm-setting-ip-tunnel.c:359
+#: ../libnm-core/nm-setting-olpc-mesh.c:84
+#: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
+#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
+#: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
+#: ../libnm-core/nm-setting-wireless-security.c:902
+#: ../libnm-core/nm-setting-wireless.c:759
 msgid "property is missing"
 msgstr "la propriété est manquante"
 
-#: ../libnm-core/nm-connection.c:2745
+#: ../libnm-core/nm-connection.c:2755
 msgid "IP Tunnel"
 msgstr "Tunnel IP"
 
-#: ../libnm-core/nm-dbus-utils.c:199
+#: ../libnm-core/nm-dbus-utils.c:185
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "La méthode a renvoyé le type « %s », mais « %s » était attendu"
 
-#: ../libnm-core/nm-keyfile-utils.c:246
+#: ../libnm-core/nm-keyfile-utils.c:242
 #, c-format
 msgid "value is not an integer in range [%lld, %lld]"
-msgstr ""
-"valur ne correspondant pas à un nombre entier relatif entre [%lld, %lld]"
+msgstr "valur ne correspondant pas à un nombre entier relatif entre [%lld, %lld]"
 
-#: ../libnm-core/nm-keyfile.c:210
+#: ../libnm-core/nm-keyfile.c:196
 msgid "ignoring missing number"
 msgstr "numéro manquant ignoré"
 
-#: ../libnm-core/nm-keyfile.c:218
+#: ../libnm-core/nm-keyfile.c:204
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "numéro « %s » ignoré"
 
-#: ../libnm-core/nm-keyfile.c:239
+#: ../libnm-core/nm-keyfile.c:225
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "adresse non valide « %s » ignorée : %s"
 
-#: ../libnm-core/nm-keyfile.c:281
+#: ../libnm-core/nm-keyfile.c:268
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "passerelle non valide « %s » ignorée pour la route %s"
 
-#: ../libnm-core/nm-keyfile.c:302
+#: ../libnm-core/nm-keyfile.c:292
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "route %s non valide ignorée : %s"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../libnm-core/nm-keyfile.c:464
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "le caractère inattendu « %c » de l'adresse %s : « %s » (position %td)"
 
-#: ../libnm-core/nm-keyfile.c:484
+#: ../libnm-core/nm-keyfile.c:474
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "caractère inattendu « %c » pour « %s » : « %s » (position %td)"
 
-#: ../libnm-core/nm-keyfile.c:493
+#: ../libnm-core/nm-keyfile.c:483
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
-msgstr ""
-"caractère inattendu « %c » en longueur de préfixe pour %s : « %s » (position "
-"%td)"
+msgstr "caractère inattendu « %c » en longueur de préfixe pour %s : « %s » (position %td)"
 
-#: ../libnm-core/nm-keyfile.c:504
+#: ../libnm-core/nm-keyfile.c:494
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "informations unutiles à la fin de %s : « %s »"
 
-#: ../libnm-core/nm-keyfile.c:510
+#: ../libnm-core/nm-keyfile.c:500
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "point virgule obsolète à la fin de %s : « %s »"
 
-#: ../libnm-core/nm-keyfile.c:525
+#: ../libnm-core/nm-keyfile.c:514
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "longueur de préfixe non valide pour %s : « %s », valeur par défaut %d"
 
-#: ../libnm-core/nm-keyfile.c:532
+#: ../libnm-core/nm-keyfile.c:521
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "longueur de préfixe manquante pour %s : « %s », valeur par défaut %d"
 
-#: ../libnm-core/nm-keyfile.c:860 ../libnm-core/nm-setting-user.c:372
+#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "valeur non valide pour \"%s\": %s"
 
-#: ../libnm-core/nm-keyfile.c:898
+#: ../libnm-core/nm-keyfile.c:894
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "ignore IPv%c address '%s' du serveur DNS non valide"
 
-#: ../libnm-core/nm-keyfile.c:994 ../libnm-core/nm-keyfile.c:3122
+#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
-msgstr ""
-"élément octet non valide « %d » ignoré (ne doit pas être compris entre 0 et "
-"255 inclus)"
+msgstr "élément octet non valide « %d » ignoré (ne doit pas être compris entre 0 et 255 inclus)"
 
-#: ../libnm-core/nm-keyfile.c:1005
+#: ../libnm-core/nm-keyfile.c:1001
 msgid "ignoring invalid MAC address"
 msgstr "adresse MAC non valide ignorée"
 
-#: ../libnm-core/nm-keyfile.c:1264
+#: ../libnm-core/nm-keyfile.c:1260
 msgid "ignoring invalid SSID"
 msgstr "SSID non valide ignoré"
 
-#: ../libnm-core/nm-keyfile.c:1280
+#: ../libnm-core/nm-keyfile.c:1276
 msgid "ignoring invalid raw password"
 msgstr "mot de passe brut non valid ignoré"
 
-#: ../libnm-core/nm-keyfile.c:1417
+#: ../libnm-core/nm-keyfile.c:1416
 msgid "invalid key/cert value"
 msgstr "valeur clé/cert non valide"
 
-#: ../libnm-core/nm-keyfile.c:1428
+#: ../libnm-core/nm-keyfile.c:1427
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "chemin de valeur de cert / clé non valide « %s »"
 
-#: ../libnm-core/nm-keyfile.c:1444 ../libnm-core/nm-keyfile.c:1527
+#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "certificat ou fichier clé « %s » n'existe pas"
 
-#: ../libnm-core/nm-keyfile.c:1453
+#: ../libnm-core/nm-keyfile.c:1456
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "URI « %s » PKCS#11 invalide"
 
-#: ../libnm-core/nm-keyfile.c:1497
+#: ../libnm-core/nm-keyfile.c:1500
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "clé non valide / cert data:;base64, n'est pas base64"
 
-#: ../libnm-core/nm-keyfile.c:1506
+#: ../libnm-core/nm-keyfile.c:1509
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "valeur de clé / cert data non valide :;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1539
+#: ../libnm-core/nm-keyfile.c:1542
 msgid "invalid key/cert value is not a valid blob"
 msgstr "valeur de cert / clé non valide n'est pas un blob valide"
 
-#: ../libnm-core/nm-keyfile.c:1641
+#: ../libnm-core/nm-keyfile.c:1644
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "valeur de parité « %s » non valide"
 
-#: ../libnm-core/nm-keyfile.c:1658 ../libnm-core/nm-keyfile.c:3177
+#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
 #, c-format
 msgid "invalid setting: %s"
 msgstr "configuration non valide « %s »"
 
-#: ../libnm-core/nm-keyfile.c:1675
+#: ../libnm-core/nm-keyfile.c:1678
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "configuration de équipe non valide ignorée : %s"
 
-#: ../libnm-core/nm-keyfile.c:1753
+#: ../libnm-core/nm-keyfile.c:1756
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "qdisc non valide : %s"
 
-#: ../libnm-core/nm-keyfile.c:1799
+#: ../libnm-core/nm-keyfile.c:1802
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "tfilter non valide : %s"
 
-#: ../libnm-core/nm-keyfile.c:3021
+#: ../libnm-core/nm-keyfile.c:3042
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "erreur de chargement de la valeur du paramètre : %s"
 
-#: ../libnm-core/nm-keyfile.c:3049 ../libnm-core/nm-keyfile.c:3060
-#: ../libnm-core/nm-keyfile.c:3078 ../libnm-core/nm-keyfile.c:3089
-#: ../libnm-core/nm-keyfile.c:3100 ../libnm-core/nm-keyfile.c:3152
-#: ../libnm-core/nm-keyfile.c:3163
+#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
+#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
+#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
+#: ../libnm-core/nm-keyfile.c:3184
 msgid "value cannot be interpreted as integer"
 msgstr "la valeur ne doit pas être interprétée en tant que nombre entier"
 
-#: ../libnm-core/nm-keyfile.c:3198
+#: ../libnm-core/nm-keyfile.c:3219
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "nom de configuration non valide « %s »"
 
-#: ../libnm-core/nm-keyfile.c:3243
+#: ../libnm-core/nm-keyfile.c:3264
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "clé non valide '%s.%s'"
 
-#: ../libnm-core/nm-keyfile.c:3258
+#: ../libnm-core/nm-keyfile.c:3279
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "clé '%s.%s' n’est pas un booléen"
 
-#: ../libnm-core/nm-keyfile.c:3315
+#: ../libnm-core/nm-keyfile.c:3336
 #, c-format
 msgid "invalid peer public key in section '%s'"
 msgstr "Clé publique homologue non valide dans la section «%s»"
 
-#: ../libnm-core/nm-keyfile.c:3327
+#: ../libnm-core/nm-keyfile.c:3348
 #, c-format
 msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
 msgstr "clé « %s.%s » est une clé de 256 non valide en chiffrage base64"
 
-#: ../libnm-core/nm-keyfile.c:3340
+#: ../libnm-core/nm-keyfile.c:3361
 #, c-format
 msgid "key '%s.%s' is not a valid secret flag"
 msgstr "« %s.%s » n'est pas un marqueur de secret valide"
 
-#: ../libnm-core/nm-keyfile.c:3352
+#: ../libnm-core/nm-keyfile.c:3373
 #, c-format
 msgid "key '%s.%s' is not a integer in range 0 to 2^32"
-msgstr ""
-"clé « %s.%s » ne correspond pas à un nombre entier relatif entre 0 et 2^32"
+msgstr "clé « %s.%s » ne correspond pas à un nombre entier relatif entre 0 et 2^32"
 
-#: ../libnm-core/nm-keyfile.c:3364
+#: ../libnm-core/nm-keyfile.c:3385
 #, c-format
 msgid "key '%s.%s' is not a valid endpoint"
 msgstr "clé « %s.%s » n'est pas un point de terminaison valide"
 
-#: ../libnm-core/nm-keyfile.c:3386
+#: ../libnm-core/nm-keyfile.c:3407
 #, c-format
 msgid "key '%s.%s' has invalid allowed-ips"
 msgstr "clé « %s.%s » comprend des adresses ip «allowed-ips» non valides"
 
-#: ../libnm-core/nm-keyfile.c:3398
+#: ../libnm-core/nm-keyfile.c:3419
 #, c-format
 msgid "peer '%s' is invalid: %s"
 msgstr "l'homologue « %s » est non valide : %s"
 
-#: ../libnm-core/nm-setting-6lowpan.c:93
+#: ../libnm-core/nm-setting-6lowpan.c:79
 #, c-format
 msgid "property is not specified"
 msgstr "propriété non spécifiée"
 
-#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:301
-#: ../libnm-core/nm-setting-vlan.c:613
+#: ../libnm-core/nm-setting-6lowpan.c:101 ../libnm-core/nm-setting-macsec.c:287
+#: ../libnm-core/nm-setting-vlan.c:600
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
 msgstr "la valeur « %s » ne correspond pas à « %s=%s »"
 
-#: ../libnm-core/nm-setting-6lowpan.c:126
-#: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
-#: ../libnm-core/nm-setting-vlan.c:624 ../libnm-core/nm-setting-vxlan.c:380
+#: ../libnm-core/nm-setting-6lowpan.c:112
+#: ../libnm-core/nm-setting-ip-tunnel.c:337
+#: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
+#: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "« %s » n'est pas un UUID, ni un nom d'interface"
 
-#: ../libnm-core/nm-setting-8021x.c:225
+#: ../libnm-core/nm-setting-8021x.c:213
 msgid "binary data missing"
 msgstr "donnée binaire manquante"
 
-#: ../libnm-core/nm-setting-8021x.c:253
+#: ../libnm-core/nm-setting-8021x.c:241
 msgid "URI not NUL terminated"
 msgstr "URI non NUL terminé"
 
-#: ../libnm-core/nm-setting-8021x.c:262
+#: ../libnm-core/nm-setting-8021x.c:250
 msgid "URI is empty"
 msgstr "URI vide"
 
-#: ../libnm-core/nm-setting-8021x.c:270
+#: ../libnm-core/nm-setting-8021x.c:258
 msgid "URI is not valid UTF-8"
 msgstr "URI n'est pas un UTF-8 valide"
 
-#: ../libnm-core/nm-setting-8021x.c:288
+#: ../libnm-core/nm-setting-8021x.c:276
 msgid "data missing"
 msgstr "données manquantes"
 
-#: ../libnm-core/nm-setting-8021x.c:311 ../libnm-core/nm-setting-8021x.c:678
+#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "certificat non valide : %s"
 
-#: ../libnm-core/nm-setting-8021x.c:319
+#: ../libnm-core/nm-setting-8021x.c:307
 #, c-format
 msgid "certificate detected as invalid scheme"
-msgstr "certificat non valide : "
+msgstr "certificat non valide"
 
-#: ../libnm-core/nm-setting-8021x.c:533
+#: ../libnm-core/nm-setting-8021x.c:521
 msgid "CA certificate must be in X.509 format"
 msgstr "certificat CA doit être sous le format X.509"
 
-#: ../libnm-core/nm-setting-8021x.c:549
+#: ../libnm-core/nm-setting-8021x.c:537
 msgid "invalid certificate format"
 msgstr "format de certificat non valide"
 
-#: ../libnm-core/nm-setting-8021x.c:688
+#: ../libnm-core/nm-setting-8021x.c:676
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
-msgstr ""
-"mot de passe non supporté lorsque le certificat n'est pas sur un jeton "
-"PKCS#11"
-
-#: ../libnm-core/nm-setting-8021x.c:2574 ../libnm-core/nm-setting-8021x.c:2591
-#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-core/nm-setting-8021x.c:2639
-#: ../libnm-core/nm-setting-8021x.c:2680 ../libnm-core/nm-setting-8021x.c:2692
-#: ../libnm-core/nm-setting-8021x.c:2710 ../libnm-core/nm-setting-8021x.c:2722
-#: ../libnm-core/nm-setting-8021x.c:2747 ../libnm-core/nm-setting-adsl.c:179
-#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-core/nm-setting-cdma.c:158
-#: ../libnm-core/nm-setting-connection.c:975
-#: ../libnm-core/nm-setting-connection.c:1023
-#: ../libnm-core/nm-setting-gsm.c:284 ../libnm-core/nm-setting-gsm.c:341
-#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
-#: ../libnm-core/nm-setting-ip-config.c:4912
-#: ../libnm-core/nm-setting-ip4-config.c:181
-#: ../libnm-core/nm-setting-ip4-config.c:188
-#: ../libnm-core/nm-setting-pppoe.c:151 ../libnm-core/nm-setting-pppoe.c:160
-#: ../libnm-core/nm-setting-vpn.c:539 ../libnm-core/nm-setting-vpn.c:549
-#: ../libnm-core/nm-setting-wimax.c:117
-#: ../libnm-core/nm-setting-wireless-security.c:960
-#: ../libnm-core/nm-setting-wireless-security.c:984
-#: ../libnm-core/nm-setting.c:1355
+msgstr "mot de passe non supporté lorsque le certificat n'est pas sur un jeton PKCS#11"
+
+#: ../libnm-core/nm-setting-8021x.c:2581 ../libnm-core/nm-setting-8021x.c:2598
+#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
+#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
+#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
+#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
+#: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
+#: ../libnm-core/nm-setting-connection.c:961
+#: ../libnm-core/nm-setting-connection.c:1009
+#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip4-config.c:167
+#: ../libnm-core/nm-setting-ip4-config.c:174
+#: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
+#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
+#: ../libnm-core/nm-setting-wimax.c:103
+#: ../libnm-core/nm-setting-wireless-security.c:945
+#: ../libnm-core/nm-setting-wireless-security.c:969
+#: ../libnm-core/nm-setting.c:1243
 msgid "property is empty"
 msgstr "la propriété est vide"
 
-#: ../libnm-core/nm-setting-8021x.c:2604 ../libnm-core/nm-setting-8021x.c:2652
+#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "doit correspondre à la propriété « %s » pour PKCS#12"
 
 #: ../libnm-core/nm-setting-8021x.c:2831
-#: ../libnm-core/nm-setting-bluetooth.c:108
-#: ../libnm-core/nm-setting-infiniband.c:176
-#: ../libnm-core/nm-setting-infiniband.c:186
-#: ../libnm-core/nm-setting-ip4-config.c:172
-#: ../libnm-core/nm-setting-ip6-config.c:221
-#: ../libnm-core/nm-setting-ip6-config.c:232
-#: ../libnm-core/nm-setting-olpc-mesh.c:127
-#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:126
-#: ../libnm-core/nm-setting-wired.c:799 ../libnm-core/nm-setting-wired.c:809
-#: ../libnm-core/nm-setting-wireless-security.c:1003
-#: ../libnm-core/nm-setting-wireless-security.c:1012
-#: ../libnm-core/nm-setting-wireless-security.c:1021
-#: ../libnm-core/nm-setting-wireless-security.c:1057
-#: ../libnm-core/nm-setting-wireless-security.c:1067
-#: ../libnm-core/nm-setting-wireless-security.c:1090
+msgid "can be enabled only on Ethernet connections"
+msgstr "ne peut être activé que sur les connexions Ethernet"
+
+#: ../libnm-core/nm-setting-8021x.c:2849
+#: ../libnm-core/nm-setting-bluetooth.c:94
+#: ../libnm-core/nm-setting-infiniband.c:162
+#: ../libnm-core/nm-setting-infiniband.c:172
+#: ../libnm-core/nm-setting-ip4-config.c:158
+#: ../libnm-core/nm-setting-ip6-config.c:207
+#: ../libnm-core/nm-setting-ip6-config.c:218
+#: ../libnm-core/nm-setting-olpc-mesh.c:113
+#: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
+#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
+#: ../libnm-core/nm-setting-wireless-security.c:988
+#: ../libnm-core/nm-setting-wireless-security.c:997
+#: ../libnm-core/nm-setting-wireless-security.c:1006
+#: ../libnm-core/nm-setting-wireless-security.c:1016
+#: ../libnm-core/nm-setting-wireless-security.c:1026
+#: ../libnm-core/nm-setting-wireless-security.c:1049
+#: ../libnm-core/nm-setting-wireless-security.c:1087
 #: ../libnm-core/nm-setting-wireless-security.c:1128
-#: ../libnm-core/nm-setting-wireless-security.c:1169
-#: ../libnm-core/nm-setting-wireless.c:847
-#: ../libnm-core/nm-setting-wireless.c:856
-#: ../libnm-core/nm-setting-wireless.c:867 ../libnm-core/nm-setting-wpan.c:176
-#: ../libnm-core/nm-utils.c:4543
+#: ../libnm-core/nm-setting-wireless.c:830
+#: ../libnm-core/nm-setting-wireless.c:839
+#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
+#: ../libnm-core/nm-utils.c:4566
 msgid "property is invalid"
 msgstr "propriété non valide"
 
-#: ../libnm-core/nm-setting-8021x.c:2858 ../libnm-core/nm-setting-8021x.c:2870
-#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2911
-#: ../libnm-core/nm-setting-8021x.c:2926 ../libnm-core/nm-setting-adsl.c:191
-#: ../libnm-core/nm-setting-adsl.c:203 ../libnm-core/nm-setting-bluetooth.c:136
-#: ../libnm-core/nm-setting-wireless-security.c:938
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
+#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
+#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
+#: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
+#: ../libnm-core/nm-setting-wireless-security.c:923
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "« %s » n'est pas une valeur valide pour la propriété"
 
-#: ../libnm-core/nm-setting-8021x.c:2894
+#: ../libnm-core/nm-setting-8021x.c:2912
 msgid "invalid auth flags"
 msgstr "marqueurs d'auth non valides"
 
-#: ../libnm-core/nm-setting-bluetooth.c:158
+#: ../libnm-core/nm-setting-bluetooth.c:144
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "la connexion « %s » requiert une configuration « %s » ou « %s »"
 
-#: ../libnm-core/nm-setting-bluetooth.c:204
+#: ../libnm-core/nm-setting-bluetooth.c:190
 #, c-format
 msgid "'%s' connection requires '%s' setting"
 msgstr "la connexion « %s » requiert une configuration « %s »"
 
-#: ../libnm-core/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:541
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "option « %s » ou sa valeur « %s » non valide"
 
-#: ../libnm-core/nm-setting-bond.c:580
+#: ../libnm-core/nm-setting-bond.c:566
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "seul l'un de « %s » et « %s » peut être défini"
 
-#: ../libnm-core/nm-setting-bond.c:593
+#: ../libnm-core/nm-setting-bond.c:579
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "l'option obligatoire « %s » est manquante"
 
-#: ../libnm-core/nm-setting-bond.c:603
+#: ../libnm-core/nm-setting-bond.c:589
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "« %s » n'est pas une valeur valide pour « %s »"
 
-#: ../libnm-core/nm-setting-bond.c:617
+#: ../libnm-core/nm-setting-bond.c:603
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "« %s=%s » est incompatible avec « %s > 0 »"
 
-#: ../libnm-core/nm-setting-bond.c:632
+#: ../libnm-core/nm-setting-bond.c:618
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "« %s » n'est pas valide pour l'option « %s » : %s"
 
-#: ../libnm-core/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:629
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "l'option « %s » est uniquement valide pour « %s=%s »"
 
-#: ../libnm-core/nm-setting-bond.c:656
+#: ../libnm-core/nm-setting-bond.c:642
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "« %s=%s » n'est pas une configuration valide pour « %s »"
 
-#: ../libnm-core/nm-setting-bond.c:669 ../libnm-core/nm-setting-bond.c:678
-#: ../libnm-core/nm-setting-bond.c:698 ../libnm-core/nm-setting-bond.c:734
+#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
+#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "l'option « %s » nécessite que l'option « %s » soit définie"
 
-#: ../libnm-core/nm-setting-bond.c:709
+#: ../libnm-core/nm-setting-bond.c:695
 #, c-format
 msgid "'%s' option is empty"
 msgstr "l'option « %s » est vide"
 
-#: ../libnm-core/nm-setting-bond.c:721
+#: ../libnm-core/nm-setting-bond.c:707
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "« %s » n'est pas une adresse IPv4 valide pour l'option « %s »"
 
-#: ../libnm-core/nm-setting-bond.c:749
+#: ../libnm-core/nm-setting-bond.c:735
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "l'option « %s » est uniquement valide en mode « %s »"
 
-#: ../libnm-core/nm-setting-bond.c:760
+#: ../libnm-core/nm-setting-bond.c:746
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "« %s » et « %s » ne peuvent pas avoir des valeur divergentes"
 
-#: ../libnm-core/nm-setting-bond.c:776
+#: ../libnm-core/nm-setting-bond.c:762
 #, c-format
 msgid "'%s' option should be string"
 msgstr "l'option « %s » doit correspondre à une chaîne"
 
-#: ../libnm-core/nm-setting-bond.c:792
+#: ../libnm-core/nm-setting-bond.c:778
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "l'option « %s » n’est pas valide en mode « %s »"
 
-#: ../libnm-core/nm-setting-bridge-port.c:315
-#: ../libnm-core/nm-setting-ovs-bridge.c:167
-#: ../libnm-core/nm-setting-ovs-interface.c:273
-#: ../libnm-core/nm-setting-ovs-port.c:186
-#: ../libnm-core/nm-setting-team-port.c:313
+#: ../libnm-core/nm-setting-bridge-port.c:301
+#: ../libnm-core/nm-setting-ovs-bridge.c:153
+#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-port.c:172
+#: ../libnm-core/nm-setting-team-port.c:299
 #, c-format
 msgid "missing setting"
 msgstr "configuration manquante"
 
-#: ../libnm-core/nm-setting-bridge-port.c:326
-#: ../libnm-core/nm-setting-ovs-interface.c:294
-#: ../libnm-core/nm-setting-ovs-port.c:207
-#: ../libnm-core/nm-setting-team-port.c:324
+#: ../libnm-core/nm-setting-bridge-port.c:312
+#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-port.c:193
+#: ../libnm-core/nm-setting-team-port.c:310
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
-msgstr ""
-"Une connexion qui aurait pour configuration « %s » doit avoir le type "
-"d'esclave (slave-type) défini sur « %s » au lieu de « %s »"
+msgstr "Une connexion qui aurait pour configuration « %s » doit avoir le type d'esclave (slave-type) défini sur « %s » au lieu de « %s »"
 
-#: ../libnm-core/nm-setting-bridge.c:910
+#: ../libnm-core/nm-setting-bridge.c:896
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "La valeur « %d » est hors de la portée <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:927
+#: ../libnm-core/nm-setting-bridge.c:913
 msgid "is not a valid MAC address"
 msgstr "n'est pas une adresse MAC valide"
 
-#: ../libnm-core/nm-setting-bridge.c:968
+#: ../libnm-core/nm-setting-bridge.c:954
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "le masque ne peut pas contenir les bits 0 (STP), 1 (MAC) ou 2 (LACP)"
 
-#: ../libnm-core/nm-setting-connection.c:945
+#: ../libnm-core/nm-setting-connection.c:931
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "configuration requise pour les connexions de type « %s »."
 
-#: ../libnm-core/nm-setting-connection.c:984
+#: ../libnm-core/nm-setting-connection.c:970
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "« %s » n'est pas un UUID valide"
 
-#: ../libnm-core/nm-setting-connection.c:1034
+#: ../libnm-core/nm-setting-connection.c:1020
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "type de connexion « %s » non valide"
 
-#: ../libnm-core/nm-setting-connection.c:1070
+#: ../libnm-core/nm-setting-connection.c:1056
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "type d'esclave « %s » inconnu"
 
-#: ../libnm-core/nm-setting-connection.c:1081
+#: ../libnm-core/nm-setting-connection.c:1067
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "les connexions esclaves requièrent une prorpiété « %s » valide"
 
-#: ../libnm-core/nm-setting-connection.c:1102
+#: ../libnm-core/nm-setting-connection.c:1088
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "Ne peut pas définir « %s » sans « %s »"
 
-#: ../libnm-core/nm-setting-connection.c:1116
+#: ../libnm-core/nm-setting-connection.c:1102
 #, c-format
 msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "Les connexions '%s' doivent être asservies à '%s', et non à '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1130
+#: ../libnm-core/nm-setting-connection.c:1116
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "valeur contrôlée %d non valide"
 
-#: ../libnm-core/nm-setting-connection.c:1141
-#: ../libnm-core/nm-setting-connection.c:1152
-#: ../libnm-core/nm-setting-connection.c:1165
+#: ../libnm-core/nm-setting-connection.c:1127
+#: ../libnm-core/nm-setting-connection.c:1138
+#: ../libnm-core/nm-setting-connection.c:1151
 #, c-format
 msgid "value %d is not valid"
 msgstr "la valeur %d n’est pas valide"
 
-#: ../libnm-core/nm-setting-connection.c:1178
+#: ../libnm-core/nm-setting-connection.c:1164
 #, c-format
 msgid "wait-device-timeout requires %s"
 msgstr "wait-device-timeout requiert %s"
 
-#: ../libnm-core/nm-setting-connection.c:1200
+#: ../libnm-core/nm-setting-connection.c:1186
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "le type de propriété doit être défini sur « %s »"
 
-#: ../libnm-core/nm-setting-connection.c:1215
+#: ../libnm-core/nm-setting-connection.c:1201
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
-msgstr ""
-"le type d'esclave « %s » requiert la présence du paramètre « %s » dans la "
-"connexion"
+msgstr "le type d'esclave « %s » requiert la présence du paramètre « %s » dans la connexion"
 
-#: ../libnm-core/nm-setting-connection.c:1225
+#: ../libnm-core/nm-setting-connection.c:1211
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
-msgstr ""
-"Détecte une connexion esclave avec « %s » défini et un type de port « %s ». "
-"« %s » doit être défini sur « %s »"
+msgstr "Détecte une connexion esclave avec « %s » défini et un type de port « %s ». « %s » doit être défini sur « %s »"
 
-#: ../libnm-core/nm-setting-connection.c:1242
+#: ../libnm-core/nm-setting-connection.c:1228
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
-msgstr ""
-"Une connexion esclave avec « %s » définie à « %s » ne peut pas avoir un "
-"paramètre « %s »"
+msgstr "Une connexion esclave avec « %s » définie à « %s » ne peut pas avoir un paramètre « %s »"
 
-#: ../libnm-core/nm-setting-dcb.c:506
+#: ../libnm-core/nm-setting-dcb.c:492
 msgid "flags invalid"
 msgstr "marqueurs non valides"
 
-#: ../libnm-core/nm-setting-dcb.c:515
+#: ../libnm-core/nm-setting-dcb.c:501
 msgid "flags invalid - disabled"
 msgstr "marqueurs non valides - désactivé"
 
-#: ../libnm-core/nm-setting-dcb.c:541 ../libnm-core/nm-setting-dcb.c:590
+#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
 msgid "property invalid (not enabled)"
 msgstr "la propriété n'est pas valide (non activée)"
 
-#: ../libnm-core/nm-setting-dcb.c:550
+#: ../libnm-core/nm-setting-dcb.c:536
 msgid "element invalid"
 msgstr "élément non valide"
 
-#: ../libnm-core/nm-setting-dcb.c:565
+#: ../libnm-core/nm-setting-dcb.c:551
 msgid "sum not 100%"
 msgstr "la somme n'est pas à 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:599 ../libnm-core/nm-setting-dcb.c:631
+#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
 msgid "property invalid"
 msgstr "propriété non valide"
 
-#: ../libnm-core/nm-setting-dcb.c:621
+#: ../libnm-core/nm-setting-dcb.c:607
 msgid "property missing"
 msgstr "propriété manquante"
 
-#: ../libnm-core/nm-setting-ethtool.c:305
+#: ../libnm-core/nm-setting-ethtool.c:291
 msgid "unsupported offload feature"
 msgstr "fonctionnalité de déchargement non prise en charge"
 
-#: ../libnm-core/nm-setting-ethtool.c:313
+#: ../libnm-core/nm-setting-ethtool.c:299
 msgid "offload feature has invalid variant type"
 msgstr "la fonctionnalité de déchargement a un type de variante non valide"
 
-#: ../libnm-core/nm-setting-ethtool.c:336
+#: ../libnm-core/nm-setting-ethtool.c:322
 #, c-format
 msgid "unknown ethtool option '%s'"
 msgstr "option ethtool '%s' inconnue"
 
-#: ../libnm-core/nm-setting-gsm.c:297
+#: ../libnm-core/nm-setting-gsm.c:302
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "la valeur de la propriété « %s » est vide ou trop longue (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:329
+#: ../libnm-core/nm-setting-gsm.c:334
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
-msgstr ""
-"« %s » contient un(des) caractère(s) non valide(s) (utilisez [A-Za-z._-])"
+msgstr "« %s » contient un(des) caractère(s) non valide(s) (utilisez [A-Za-z._-])"
 
-#: ../libnm-core/nm-setting-gsm.c:355
+#: ../libnm-core/nm-setting-gsm.c:361
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
-msgstr ""
-"la longueur de « %s » n'est pas valide (devrait faire 5 ou 6 chiffres)"
+msgstr "la longueur de « %s » n'est pas valide (devrait faire 5 ou 6 chiffres)"
 
-#: ../libnm-core/nm-setting-gsm.c:366
+#: ../libnm-core/nm-setting-gsm.c:372
 #, c-format
 msgid "'%s' is not a number"
 msgstr "« %s » n'est pas un numéro"
 
-#: ../libnm-core/nm-setting-gsm.c:400
+#: ../libnm-core/nm-setting-gsm.c:406
 msgid "property is empty or wrong size"
 msgstr "la propriété est vide ou de la mauvaise taille"
 
-#: ../libnm-core/nm-setting-gsm.c:410
+#: ../libnm-core/nm-setting-gsm.c:416
 msgid "property must contain only digits"
 msgstr "la propriété doit comprendre des chiffres uniquement"
 
-#: ../libnm-core/nm-setting-infiniband.c:207
+#: ../libnm-core/nm-setting-gsm.c:428
+msgid "can't be enabled when manual configuration is present"
+msgstr "ne peut pas être activé en présence d'une configuration manuelle"
+
+#: ../libnm-core/nm-setting-infiniband.c:193
 msgid "Must specify a P_Key if specifying parent"
 msgstr "P_Key doit être spécifié si le parent est spécifié"
 
-#: ../libnm-core/nm-setting-infiniband.c:217
+#: ../libnm-core/nm-setting-infiniband.c:203
 msgid "InfiniBand P_Key connection did not specify parent interface name"
-msgstr ""
-"La connexion InfiniBand P_Key ne spécifie pas le nom de l'interface parent"
+msgstr "La connexion InfiniBand P_Key ne spécifie pas le nom de l'interface parent"
 
-#: ../libnm-core/nm-setting-infiniband.c:255
+#: ../libnm-core/nm-setting-infiniband.c:241
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
-msgstr ""
-"le nom d'interface du périphérique de logiciel infinisband doit correspondre "
-"à « %s » ou ne doit pas être défini (au lieu de « %s »)"
+msgstr "le nom d'interface du périphérique de logiciel infinisband doit correspondre à « %s » ou ne doit pas être défini (au lieu de « %s »)"
 
-#: ../libnm-core/nm-setting-infiniband.c:279
+#: ../libnm-core/nm-setting-infiniband.c:265
 #, c-format
 msgid "mtu can be at most %u but it is %u"
 msgstr "mtu peut être %u au maximum but il est à %u"
 
-#: ../libnm-core/nm-setting-ip-config.c:134
+#: ../libnm-core/nm-setting-ip-config.c:120
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "adresse IPv4 manquante"
 
-#: ../libnm-core/nm-setting-ip-config.c:134
+#: ../libnm-core/nm-setting-ip-config.c:120
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "adresse IPv6 manquante"
 
-#: ../libnm-core/nm-setting-ip-config.c:139
+#: ../libnm-core/nm-setting-ip-config.c:125
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "adresse IPv4 « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:139
+#: ../libnm-core/nm-setting-ip-config.c:125
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "adresse IPv6 « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:154
+#: ../libnm-core/nm-setting-ip-config.c:140
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "préfixe d'adresse IPv4 « %u » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:154
+#: ../libnm-core/nm-setting-ip-config.c:140
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "préfixe d'adresse IPv6 « %u » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:169
+#: ../libnm-core/nm-setting-ip-config.c:155
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "métrique de routage « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:417
+#: ../libnm-core/nm-setting-ip-config.c:1282
+#: ../libnm-core/nm-setting-sriov.c:409
 msgid "unknown attribute"
 msgstr "attribut inconnu"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:427
+#: ../libnm-core/nm-setting-ip-config.c:1292
+#: ../libnm-core/nm-setting-sriov.c:419
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "type d'attribut « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1303
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "attribut invalide pour une route IPv4"
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1304
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "attribut invalide pour une route IPv6"
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
+#: ../libnm-core/nm-setting-ip-config.c:1318
+#: ../libnm-core/nm-setting-ip-config.c:1346
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "« %s » n'est pas une adresse IPv4 valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
+#: ../libnm-core/nm-setting-ip-config.c:1319
+#: ../libnm-core/nm-setting-ip-config.c:1347
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "« %s » n'est pas une adresse IPv6 valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
+#: ../libnm-core/nm-setting-ip-config.c:1337
 #, c-format
 msgid "invalid prefix %s"
 msgstr "préfixe %s non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2515
+#: ../libnm-core/nm-setting-ip-config.c:2513
 msgid "invalid priority"
 msgstr "priorité non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2526
+#: ../libnm-core/nm-setting-ip-config.c:2524
 msgid "missing table"
 msgstr "tableau manquant"
 
-#: ../libnm-core/nm-setting-ip-config.c:2532
+#: ../libnm-core/nm-setting-ip-config.c:2530
 msgid "invalid action"
 msgstr "action non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2539
+#: ../libnm-core/nm-setting-ip-config.c:2537
 msgid "has from/src but the prefix-length is zero"
 msgstr "comprend « from/src » mais la longueur du préfixe est zéro"
 
-#: ../libnm-core/nm-setting-ip-config.c:2546
+#: ../libnm-core/nm-setting-ip-config.c:2544
 msgid "missing from/src for a non zero prefix-length"
 msgstr "ne comprend pas « from/src » et la longueur du préfixe n'est pas zéro"
 
-#: ../libnm-core/nm-setting-ip-config.c:2551
+#: ../libnm-core/nm-setting-ip-config.c:2549
 msgid "invalid from/src"
 msgstr "from/src non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2556
+#: ../libnm-core/nm-setting-ip-config.c:2554
 msgid "invalid prefix length for from/src"
 msgstr "longueur de préfixe non valide pour « from/src »"
 
-#: ../libnm-core/nm-setting-ip-config.c:2563
+#: ../libnm-core/nm-setting-ip-config.c:2561
 msgid "has to/dst but the prefix-length is zero"
 msgstr "comprend « to/dst » mais la longueur du préfixe est zéro"
 
-#: ../libnm-core/nm-setting-ip-config.c:2570
+#: ../libnm-core/nm-setting-ip-config.c:2568
 msgid "missing to/dst for a non zero prefix-length"
 msgstr "ne comprend pas « to/dst  » et la longueur du préfixe n'est pas zéro"
 
-#: ../libnm-core/nm-setting-ip-config.c:2575
+#: ../libnm-core/nm-setting-ip-config.c:2573
 msgid "invalid to/dst"
 msgstr "to/dst non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2580
+#: ../libnm-core/nm-setting-ip-config.c:2578
 msgid "invalid prefix length for to/dst"
 msgstr "longueur de préfixe non valide pour « to/dst  »"
 
-#: ../libnm-core/nm-setting-ip-config.c:2588
+#: ../libnm-core/nm-setting-ip-config.c:2586
 msgid "invalid iifname"
 msgstr "iifname non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2596
+#: ../libnm-core/nm-setting-ip-config.c:2594
 msgid "invalid oifname"
 msgstr "oifname non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2602
+#: ../libnm-core/nm-setting-ip-config.c:2600
 msgid "invalid source port range"
 msgstr "Plage de ports source non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2606
 msgid "invalid destination port range"
 msgstr "Plage de ports de destination non valides"
 
-#: ../libnm-core/nm-setting-ip-config.c:2616
+#: ../libnm-core/nm-setting-ip-config.c:2614
 msgid "suppress_prefixlength out of range"
 msgstr "suppress_prefixlength hors de portée"
 
-#: ../libnm-core/nm-setting-ip-config.c:2621
+#: ../libnm-core/nm-setting-ip-config.c:2619
 msgid "suppress_prefixlength is only allowed with the to-table action"
 msgstr "suppress_prefixlength n'est permis qu'avec l'action to-table"
 
-#: ../libnm-core/nm-setting-ip-config.c:2728
+#: ../libnm-core/nm-setting-ip-config.c:2726
 #, c-format
 msgid "duplicate key %s"
 msgstr "clé dupliquée %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2742
+#: ../libnm-core/nm-setting-ip-config.c:2740
 #, c-format
 msgid "invalid key \"%s\""
 msgstr "clé non valide « %s »"
 
-#: ../libnm-core/nm-setting-ip-config.c:2755
+#: ../libnm-core/nm-setting-ip-config.c:2753
 #, c-format
 msgid "invalid variant type '%s' for \"%s\""
 msgstr "type de variante  '%s' pour \"%s\" non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:2764
+#: ../libnm-core/nm-setting-ip-config.c:2762
 msgid "missing \""
 msgstr "manquant \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2770
+#: ../libnm-core/nm-setting-ip-config.c:2768
 msgid "invalid \""
 msgstr "non valid \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2967
+#: ../libnm-core/nm-setting-ip-config.c:2965
 msgid "Unsupported to-string-flags argument"
 msgstr "Argument to-string-flag non pris en charge"
 
-#: ../libnm-core/nm-setting-ip-config.c:2974
+#: ../libnm-core/nm-setting-ip-config.c:2972
 msgid "Unsupported extra-argument"
 msgstr "extra-argument non pris en charge"
 
-#: ../libnm-core/nm-setting-ip-config.c:3240
+#: ../libnm-core/nm-setting-ip-config.c:3239
 #, c-format
 msgid "unsupported key \"%s\""
 msgstr "clé « %s » non prise en charge"
 
-#: ../libnm-core/nm-setting-ip-config.c:3245
+#: ../libnm-core/nm-setting-ip-config.c:3244
 #, c-format
 msgid "duplicate key \"%s\""
 msgstr "clé « %s » dupliquée"
 
-#: ../libnm-core/nm-setting-ip-config.c:3250
+#: ../libnm-core/nm-setting-ip-config.c:3249
 #, c-format
 msgid "invalid value for \"%s\""
 msgstr "valeur de « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:3260
+#: ../libnm-core/nm-setting-ip-config.c:3259
 msgid "empty text does not describe a rule"
 msgstr "texte vide qui ne décrit pas de règle"
 
-#: ../libnm-core/nm-setting-ip-config.c:3266
+#: ../libnm-core/nm-setting-ip-config.c:3265
 #, c-format
 msgid "missing argument for \"%s\""
 msgstr "argument manquant pour « %s »"
 
-#: ../libnm-core/nm-setting-ip-config.c:3278
+#: ../libnm-core/nm-setting-ip-config.c:3277
 msgid "invalid \"from\" part"
 msgstr "partie « from » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:3292
+#: ../libnm-core/nm-setting-ip-config.c:3291
 msgid "invalid \"to\" part"
 msgstr "parie « to » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:3301
+#: ../libnm-core/nm-setting-ip-config.c:3300
 #, c-format
 msgid "cannot detect address family for rule"
 msgstr "impossible de détecter la famille d'adresses pour la règle"
 
-#: ../libnm-core/nm-setting-ip-config.c:3361
-#: ../libnm-core/nm-setting-ip-config.c:3455
+#: ../libnm-core/nm-setting-ip-config.c:3360
+#: ../libnm-core/nm-setting-ip-config.c:3454
 #, c-format
 msgid "rule is invalid: %s"
 msgstr "règle suivante non valide : %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:3438
+#: ../libnm-core/nm-setting-ip-config.c:3437
 msgid "invalid address family"
 msgstr "famille d'adresses non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:4707
+#: ../libnm-core/nm-setting-ip-config.c:4710
 #, c-format
 msgid "rule #%u is invalid: %s"
 msgstr "règle #%u non valide : %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:4925
+#: ../libnm-core/nm-setting-ip-config.c:4966
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. L'adresse de serveur DNS n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:4941
+#: ../libnm-core/nm-setting-ip-config.c:4982
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. L'adresse IP n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip-config.c:4994
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
-msgstr ""
-"%d. L'adresse IP a une propriété 'label' (étiquette) de type non valide"
+msgstr "%d. L'adresse IP a une propriété 'label' (étiquette) de type non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:4962
+#: ../libnm-core/nm-setting-ip-config.c:5003
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. L'adresse IP a une étiquette « %s » non valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:4976
+#: ../libnm-core/nm-setting-ip-config.c:5017
 msgid "gateway cannot be set if there are no addresses configured"
-msgstr ""
-"la passerelle ne peut pas être définie si aucune adresse est configurée"
+msgstr "la passerelle ne peut pas être définie si aucune adresse est configurée"
 
-#: ../libnm-core/nm-setting-ip-config.c:4985
+#: ../libnm-core/nm-setting-ip-config.c:5026
 msgid "gateway is invalid"
 msgstr "la passerelle n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:4999
+#: ../libnm-core/nm-setting-ip-config.c:5040
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. La route n'est pas valide"
 
-#: ../libnm-core/nm-setting-ip-config.c:5008
-#, c-format
-msgid "%d. route cannot be a default route"
-msgstr "%d. La route ne peut pas être une route par défaut"
-
-#: ../libnm-core/nm-setting-ip-config.c:5024
+#: ../libnm-core/nm-setting-ip-config.c:5056
 #, c-format
 msgid "%u. rule has wrong address-family"
 msgstr "la règle %u. a une mauvaise address-family"
 
-#: ../libnm-core/nm-setting-ip-config.c:5033
+#: ../libnm-core/nm-setting-ip-config.c:5065
 #, c-format
 msgid "%u. rule is invalid: %s"
 msgstr "la règle %u. est non valide : %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:5046
+#: ../libnm-core/nm-setting-ip-config.c:5079
+#, c-format
+msgid "'%s' is not a valid IAID"
+msgstr "« %s » n’est pas un IAID valide"
+
+#: ../libnm-core/nm-setting-ip-config.c:5093
+#, c-format
+msgid "the property cannot be set when '%s' is disabled"
+msgstr "la propriété ne peut pas être définie lorsque «%s» est désactivé"
+
+#: ../libnm-core/nm-setting-ip-config.c:5115
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "une passerelle n'est pas compatible avec « %s »"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:339
+#: ../libnm-core/nm-setting-ip-tunnel.c:325
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr "« %d » n'est pas un mode de tunnel valide"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:362
-#: ../libnm-core/nm-setting-ip-tunnel.c:382
+#: ../libnm-core/nm-setting-ip-tunnel.c:348
+#: ../libnm-core/nm-setting-ip-tunnel.c:368
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "« %s » n'est pas une adresse Iv%c valide"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:399
+#: ../libnm-core/nm-setting-ip-tunnel.c:385
 msgid "tunnel keys can only be specified for GRE tunnels"
-msgstr ""
-"les clés de tunnel ne peuvent être spécifiées que pour les tunnels GRE"
+msgstr "les clés de tunnel ne peuvent être spécifiées que pour les tunnels GRE"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:412
-#: ../libnm-core/nm-setting-ip-tunnel.c:428
+#: ../libnm-core/nm-setting-ip-tunnel.c:398
+#: ../libnm-core/nm-setting-ip-tunnel.c:414
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "« %s » n'est pas une clé de tunnel valide"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:440
+#: ../libnm-core/nm-setting-ip-tunnel.c:426
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "un TTL fixe est permis quand le chemin MTU de découverte est actif"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:453
+#: ../libnm-core/nm-setting-ip-tunnel.c:439
 #, c-format
 msgid "some flags are invalid for the select mode: %s"
 msgstr "certains marqueurs ne sont pas valides pour le mode select : %s"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:467
+#: ../libnm-core/nm-setting-ip-tunnel.c:453
 #, c-format
 msgid "wired setting not allowed for mode %s"
 msgstr "réglage câblé non autorisé pour le mode %s"
 
-#: ../libnm-core/nm-setting-ip4-config.c:126
-#: ../libnm-core/nm-setting-ip6-config.c:173
+#: ../libnm-core/nm-setting-ip4-config.c:112
+#: ../libnm-core/nm-setting-ip6-config.c:159
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "cette propriété ne peut pas demeurer vide pour « %s=%s »"
 
-#: ../libnm-core/nm-setting-ip4-config.c:138
-#: ../libnm-core/nm-setting-ip4-config.c:148
-#: ../libnm-core/nm-setting-ip4-config.c:160
-#: ../libnm-core/nm-setting-ip6-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:198
-#: ../libnm-core/nm-setting-ip6-config.c:208
+#: ../libnm-core/nm-setting-ip4-config.c:124
+#: ../libnm-core/nm-setting-ip4-config.c:134
+#: ../libnm-core/nm-setting-ip4-config.c:146
+#: ../libnm-core/nm-setting-ip6-config.c:174
+#: ../libnm-core/nm-setting-ip6-config.c:184
+#: ../libnm-core/nm-setting-ip6-config.c:194
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "cette propriété n'est pas autorisée pour « %s=%s »"
 
-#: ../libnm-core/nm-setting-ip4-config.c:197
+#: ../libnm-core/nm-setting-ip4-config.c:183
 #, c-format
 msgid "'%s' is not a valid FQDN"
 msgstr "« %s » n'est pas un FQDN valide"
 
-#: ../libnm-core/nm-setting-ip4-config.c:206
+#: ../libnm-core/nm-setting-ip4-config.c:192
 msgid "property cannot be set when dhcp-hostname is also set"
-msgstr ""
-"la propriété ne peut pas être définie quand dhcp-hostname est également "
-"défini"
+msgstr "la propriété ne peut pas être définie quand dhcp-hostname est également défini"
 
-#: ../libnm-core/nm-setting-ip4-config.c:218
+#: ../libnm-core/nm-setting-ip4-config.c:204
+msgid "FQDN flags requires a FQDN set"
+msgstr "Les drapeaux FQDN nécessitent un jeu de FQDN"
+
+#: ../libnm-core/nm-setting-ip4-config.c:216
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
 msgstr "adresses multiples non autorisé pour « %s=%s »"
 
-#: ../libnm-core/nm-setting-ip4-config.c:232
+#: ../libnm-core/nm-setting-ip4-config.c:230
 msgid "property should be TRUE when method is set to disabled"
-msgstr ""
-"la propriété doit être sur TRUE lorsque la méthode est définie comme "
-"désactivée"
+msgstr "la propriété doit être sur TRUE lorsque la méthode est définie comme désactivée"
 
-#: ../libnm-core/nm-setting-ip6-config.c:247
+#: ../libnm-core/nm-setting-ip6-config.c:233
 msgid "value is not a valid token"
 msgstr "la valeur ne correspond pas à un jeton valide"
 
-#: ../libnm-core/nm-setting-ip6-config.c:258
+#: ../libnm-core/nm-setting-ip6-config.c:244
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "n'a de sens qu'en mode de génération d'adresses  EUI64"
 
-#: ../libnm-core/nm-setting-ip6-config.c:269
+#: ../libnm-core/nm-setting-ip6-config.c:255
 msgid "invalid DUID"
 msgstr "DUID non valide"
 
-#: ../libnm-core/nm-setting-ip6-config.c:281
+#: ../libnm-core/nm-setting-ip6-config.c:267
 msgid "token is not in canonical form"
 msgstr "le jeton n'est pas dans une forme canonique"
 
-#: ../libnm-core/nm-setting-ip6-config.c:294
+#: ../libnm-core/nm-setting-ip6-config.c:280
 msgid "property should be TRUE when method is set to ignore or disabled"
-msgstr ""
-"la propriété doit être sur TRUE lorsque la méthode est définie sur ignore ou "
-"désactivée"
+msgstr "la propriété doit être sur TRUE lorsque la méthode est définie sur ignore ou désactivée"
 
-#: ../libnm-core/nm-setting-macsec.c:245
+#: ../libnm-core/nm-setting-macsec.c:231
 msgid "the key is empty"
 msgstr "la clé est vide"
 
-#: ../libnm-core/nm-setting-macsec.c:256
+#: ../libnm-core/nm-setting-macsec.c:242
 #, c-format
 msgid "the key must be %d characters"
 msgstr "la clé doit faire %d caractères"
 
-#: ../libnm-core/nm-setting-macsec.c:264
+#: ../libnm-core/nm-setting-macsec.c:250
 msgid "the key contains non-hexadecimal characters"
 msgstr "la clé contient des chiffres non hexadécimaux."
 
-#: ../libnm-core/nm-setting-macsec.c:326 ../libnm-core/nm-setting-macvlan.c:155
-#: ../libnm-core/nm-setting-vlan.c:638
+#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
+#: ../libnm-core/nm-setting-vlan.c:625
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "la propriété n'est pas spécifiée et n'est pas « %s:%s »"
 
-#: ../libnm-core/nm-setting-macsec.c:347
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "La gestion des clés EAP requiert la présence de paramètres  '%s'"
 
-#: ../libnm-core/nm-setting-macsec.c:356
+#: ../libnm-core/nm-setting-macsec.c:342
 msgid "must be either psk (0) or eap (1)"
 msgstr "doit être soit psk (0), soit eap (1)"
 
-#: ../libnm-core/nm-setting-macsec.c:365
+#: ../libnm-core/nm-setting-macsec.c:351
 #, c-format
 msgid "invalid port %d"
 msgstr "port invalide %d"
 
-#: ../libnm-core/nm-setting-macsec.c:376
+#: ../libnm-core/nm-setting-macsec.c:362
 msgid "only valid for psk mode"
 msgstr "uniquement valide en mode psk"
 
-#: ../libnm-core/nm-setting-macvlan.c:166
+#: ../libnm-core/nm-setting-macvlan.c:152
 msgid "non promiscuous operation is allowed only in passthru mode"
-msgstr "opération de non promiscuité autorisée en mode passthru uniquement "
+msgstr "opération de non promiscuité autorisée en mode passthru uniquement"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:108
-#: ../libnm-core/nm-setting-wireless.c:786
+#: ../libnm-core/nm-setting-olpc-mesh.c:94
+#: ../libnm-core/nm-setting-wireless.c:769
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "La longueur SSID est hors de portée <1-32> octets"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:117
-#: ../libnm-core/nm-setting-wireless.c:826
+#: ../libnm-core/nm-setting-olpc-mesh.c:103
+#: ../libnm-core/nm-setting-wireless.c:809
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "« %d » n'est pas un canal valide"
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:176
+#: ../libnm-core/nm-setting-ovs-bridge.c:162
 #, c-format
 msgid "A connection with a '%s' setting must not have a master."
 msgstr "Une connexion avec une configuration  '%s' doit avoir un master."
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:187
+#: ../libnm-core/nm-setting-ovs-bridge.c:173
 #, c-format
 msgid "'%s' is not allowed in fail_mode"
-msgstr " '%s' n'est pas autorisé en fail_mode"
+msgstr "'%s' n'est pas autorisé en fail_mode"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:108
+#: ../libnm-core/nm-setting-ovs-interface.c:94
 #, c-format
 msgid "'%s' is not a valid interface type"
 msgstr "« %s » n'est pas un nom d'interface valide"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:130
+#: ../libnm-core/nm-setting-ovs-interface.c:116
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
-msgstr ""
-"Une connexion avec un paramètre  '%s' nécessite connection.type "
-"explicitement défini"
+msgstr "Une connexion avec un paramètre  '%s' nécessite connection.type explicitement défini"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:142
+#: ../libnm-core/nm-setting-ovs-interface.c:128
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
-msgstr ""
-"Une connexion de type '%s' ne peut pas avoir une interface ovs-interface."
-"type \"system\""
+msgstr "Une connexion de type '%s' ne peut pas avoir une interface ovs-interface.type \"system\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:154
+#: ../libnm-core/nm-setting-ovs-interface.c:140
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
-msgstr ""
-"Une connexion de type '%s' ne peut pas avoir une interface ovs-interface."
-"type \"%s\""
+msgstr "Une connexion de type '%s' ne peut pas avoir une interface ovs-interface.type \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:159
 #, c-format
 msgid "A connection can not have both '%s' and '%s' settings at the same time"
 msgstr "Une connexion peut avoir à la fois '%s' et '%s' en même temps"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:187
+#: ../libnm-core/nm-setting-ovs-interface.c:173
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
-msgstr ""
-"Une connexion de type '%s' doit avoir connection.type \"ovs-interface\" mais "
-"est \"%s\""
+msgstr "Une connexion de type '%s' doit avoir connection.type \"ovs-interface\" mais est \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:199
+#: ../libnm-core/nm-setting-ovs-interface.c:185
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
-msgstr ""
-"Une connexion de type '%s' doit être de type d’interface '%s' et non '%s'"
+msgstr "Une connexion de type '%s' doit être de type d’interface '%s' et non '%s'"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:215
+#: ../libnm-core/nm-setting-ovs-interface.c:201
 #, c-format
-msgid ""
-"A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
+msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr "Une connexion avec ovs-interface.type '%s'  configurant 'ovs-patch'"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:235
+#: ../libnm-core/nm-setting-ovs-interface.c:221
 #, c-format
 msgid "Missing ovs interface setting"
 msgstr "Réglage de l'interface ovs manquante"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:241
+#: ../libnm-core/nm-setting-ovs-interface.c:227
 #, c-format
 msgid "Missing ovs interface type"
 msgstr "Type d’interface ovs manquant"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:282
-#: ../libnm-core/nm-setting-ovs-port.c:195
+#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-port.c:181
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
 msgstr "Une connexion avec une configuration  '%s' doit avoir un master."
 
-#: ../libnm-core/nm-setting-ovs-patch.c:103
-#: ../libnm-core/nm-setting-vxlan.c:352
+#: ../libnm-core/nm-setting-ovs-patch.c:89 ../libnm-core/nm-setting-vxlan.c:338
 #, c-format
 msgid "'%s' is not a valid IP address"
 msgstr "« %s » n'est pas une adresse IP valide"
 
-#: ../libnm-core/nm-setting-ovs-port.c:220
+#: ../libnm-core/nm-setting-ovs-port.c:206
 #, c-format
 msgid "'%s' is not allowed in vlan_mode"
-msgstr " '%s' n'est pas autorisé en mode vlan_mode"
+msgstr "'%s' n'est pas autorisé en mode vlan_mode"
 
-#: ../libnm-core/nm-setting-ovs-port.c:230
+#: ../libnm-core/nm-setting-ovs-port.c:216
 #, c-format
 msgid "the tag id must be in range 0-4094 but is %u"
 msgstr "l'id de balise doit être entre 0-4094 mais est %u"
 
-#: ../libnm-core/nm-setting-ovs-port.c:240
+#: ../libnm-core/nm-setting-ovs-port.c:226
 #, c-format
 msgid "'%s' is not allowed in lacp"
-msgstr " '%s' n'est pas autorisé dans le lacp"
+msgstr "'%s' n'est pas autorisé dans le lacp"
 
-#: ../libnm-core/nm-setting-ovs-port.c:250
+#: ../libnm-core/nm-setting-ovs-port.c:236
 #, c-format
 msgid "'%s' is not allowed in bond_mode"
-msgstr " '%s' n'est pas autorisé en bond_mode"
+msgstr "'%s' n'est pas autorisé en bond_mode"
 
-#: ../libnm-core/nm-setting-ppp.c:350
+#: ../libnm-core/nm-setting-ppp.c:336
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "’%d’ est hors de la portée valide <128-16384>"
 
-#: ../libnm-core/nm-setting-ppp.c:363
+#: ../libnm-core/nm-setting-ppp.c:349
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr "définir cette propriété requiert une propriété non-nulle « %s »"
 
-#: ../libnm-core/nm-setting-proxy.c:146
+#: ../libnm-core/nm-setting-proxy.c:132
 #, c-format
 msgid "invalid proxy method"
 msgstr "méthode de proxy invalide"
 
-#: ../libnm-core/nm-setting-proxy.c:156 ../libnm-core/nm-setting-proxy.c:165
+#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "cette propriété n'est pas autorisée pour la méthode « none »"
 
-#: ../libnm-core/nm-setting-proxy.c:176
+#: ../libnm-core/nm-setting-proxy.c:162
 #, c-format
 msgid "the script is too large"
 msgstr "ce script est trop grand"
 
-#: ../libnm-core/nm-setting-proxy.c:184
+#: ../libnm-core/nm-setting-proxy.c:170
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "le script n'est pas valide utf8"
 
-#: ../libnm-core/nm-setting-proxy.c:192
+#: ../libnm-core/nm-setting-proxy.c:178
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "il manque à ce script la fonction FindProxyForURL"
 
-#: ../libnm-core/nm-setting-sriov.c:1074
+#: ../libnm-core/nm-setting-sriov.c:1066
 #, c-format
 msgid "VF with index %u, but the total number of VFs is %u"
 msgstr "VF avec index %u, mais le nombre total de VF est %u"
 
-#: ../libnm-core/nm-setting-sriov.c:1085
+#: ../libnm-core/nm-setting-sriov.c:1077
 #, c-format
 msgid "invalid VF %u: %s"
 msgstr "VF non valide %u: %s"
 
-#: ../libnm-core/nm-setting-sriov.c:1097
+#: ../libnm-core/nm-setting-sriov.c:1089
 #, c-format
 msgid "duplicate VF index %u"
 msgstr "index VF dupliqué %u"
 
-#: ../libnm-core/nm-setting-sriov.c:1118
+#: ../libnm-core/nm-setting-sriov.c:1110
 #, c-format
 msgid "VFs %d and %d are not sorted by ascending index"
 msgstr "les VF %d et %d ne sont pas ordonnancés par index ascendant"
 
-#: ../libnm-core/nm-setting-tc-config.c:70
-#: ../libnm-core/nm-setting-tc-config.c:436
-#: ../libnm-core/nm-setting-tc-config.c:706
+#: ../libnm-core/nm-setting-tc-config.c:56
+#: ../libnm-core/nm-setting-tc-config.c:422
+#: ../libnm-core/nm-setting-tc-config.c:692
 #, c-format
 msgid "kind is missing"
 msgstr "type manquant"
 
-#: ../libnm-core/nm-setting-tc-config.c:78
-#: ../libnm-core/nm-setting-tc-config.c:444
-#: ../libnm-core/nm-setting-tc-config.c:714
+#: ../libnm-core/nm-setting-tc-config.c:64
+#: ../libnm-core/nm-setting-tc-config.c:430
+#: ../libnm-core/nm-setting-tc-config.c:700
 #, c-format
 msgid "'%s' is not a valid kind"
 msgstr "'%s' n’est pas un type valide"
 
-#: ../libnm-core/nm-setting-tc-config.c:86
-#: ../libnm-core/nm-setting-tc-config.c:722
+#: ../libnm-core/nm-setting-tc-config.c:72
+#: ../libnm-core/nm-setting-tc-config.c:708
 msgid "parent handle missing"
 msgstr "propriété parente manquante"
 
-#: ../libnm-core/nm-setting-tc-config.c:1292
+#: ../libnm-core/nm-setting-tc-config.c:1278
 msgid "there are duplicate TC qdiscs"
 msgstr "il y a des qdisques TC en double"
 
-#: ../libnm-core/nm-setting-tc-config.c:1312
+#: ../libnm-core/nm-setting-tc-config.c:1298
 msgid "there are duplicate TC filters"
 msgstr "il y a des filtres TC en double"
 
-#: ../libnm-core/nm-setting-team.c:129 ../libnm-core/nm-setting-team.c:190
-#: ../libnm-core/nm-setting-team.c:312
+#: ../libnm-core/nm-setting-team.c:115 ../libnm-core/nm-setting-team.c:176
+#: ../libnm-core/nm-setting-team.c:298
 #, c-format
 msgid "%s is out of range [0, %d]"
 msgstr "La valeur « %s » est hors de portée %d"
 
-#: ../libnm-core/nm-setting-team.c:172
+#: ../libnm-core/nm-setting-team.c:158
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
 msgstr "Cible-hôte manquante dans nsna_ping link watcher"
 
-#: ../libnm-core/nm-setting-team.c:178 ../libnm-core/nm-setting-team.c:294
+#: ../libnm-core/nm-setting-team.c:164 ../libnm-core/nm-setting-team.c:280
 #, c-format
 msgid "target-host '%s' contains invalid characters"
 msgstr "cible-hôte '%s' contient des caractères non valides"
 
-#: ../libnm-core/nm-setting-team.c:287
+#: ../libnm-core/nm-setting-team.c:273
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
 msgstr "%s manquant dans arp_ping link watcher"
 
-#: ../libnm-core/nm-setting-team.c:300
+#: ../libnm-core/nm-setting-team.c:286
 #, c-format
 msgid "source-host '%s' contains invalid characters"
 msgstr "hôte-source « %s » contient des caractères non valides"
 
-#: ../libnm-core/nm-setting-team.c:318
+#: ../libnm-core/nm-setting-team.c:304
 msgid "vlanid is out of range [-1, 4094]"
 msgstr "vlanid n'est pas entre [-1, 4094]"
 
-#: ../libnm-core/nm-setting-tun.c:165
+#: ../libnm-core/nm-setting-tun.c:151
 #, c-format
 msgid "'%u': invalid mode"
 msgstr "« %u » n'est pas un mode valide"
 
-#: ../libnm-core/nm-setting-tun.c:175
+#: ../libnm-core/nm-setting-tun.c:161
 #, c-format
 msgid "'%s': invalid user ID"
 msgstr "« %s » n'est pas un ID d'utilisateur valide"
 
-#: ../libnm-core/nm-setting-tun.c:186
+#: ../libnm-core/nm-setting-tun.c:172
 #, c-format
 msgid "'%s': invalid group ID"
 msgstr "« %s » n'est pas un ID de groupe valide"
 
-#: ../libnm-core/nm-setting-user.c:107
+#: ../libnm-core/nm-setting-user.c:93
 msgid "missing key"
 msgstr "clé manquante"
 
-#: ../libnm-core/nm-setting-user.c:113
+#: ../libnm-core/nm-setting-user.c:99
 msgid "key is too long"
 msgstr "clé trop longue"
 
-#: ../libnm-core/nm-setting-user.c:118
+#: ../libnm-core/nm-setting-user.c:104
 msgid "key must be UTF8"
 msgstr "la clé doit être UTF-8"
 
-#: ../libnm-core/nm-setting-user.c:141
+#: ../libnm-core/nm-setting-user.c:127
 msgid "key requires a '.' for a namespace"
 msgstr "la clé nécessite un '.' pour un espace de nommage"
 
-#: ../libnm-core/nm-setting-user.c:154
+#: ../libnm-core/nm-setting-user.c:140
 msgid "key cannot contain \"..\""
 msgstr "la clé ne peut pas contenir \"..\""
 
-#: ../libnm-core/nm-setting-user.c:159
+#: ../libnm-core/nm-setting-user.c:145
 msgid "key contains invalid characters"
 msgstr "la clé contient des chiffres non hexadécimaux."
 
-#: ../libnm-core/nm-setting-user.c:184
+#: ../libnm-core/nm-setting-user.c:170
 msgid "value is missing"
 msgstr "la valeur est  manquante"
 
-#: ../libnm-core/nm-setting-user.c:191
+#: ../libnm-core/nm-setting-user.c:177
 msgid "value is too large"
 msgstr "valeur trop grande"
 
-#: ../libnm-core/nm-setting-user.c:197
+#: ../libnm-core/nm-setting-user.c:183
 msgid "value is not valid UTF8"
 msgstr "la valeur n'est pas un UTF-8 valide"
 
-#: ../libnm-core/nm-setting-user.c:327
+#: ../libnm-core/nm-setting-user.c:313
 msgid "maximum number of user data entries reached"
 msgstr "nombre maximal d'entrées de données d'utilisateur atteint"
 
-#: ../libnm-core/nm-setting-user.c:368
+#: ../libnm-core/nm-setting-user.c:354
 #, c-format
 msgid "invalid key \"%s\": %s"
 msgstr "clé non valide \"%s\": %s"
 
-#: ../libnm-core/nm-setting-user.c:387
+#: ../libnm-core/nm-setting-user.c:373
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
-msgstr ""
-"nombre maximal d'entrées de données d'utilisateur atteint (%u au lieu de %u)"
+msgstr "nombre maximal d'entrées de données d'utilisateur atteint (%u au lieu de %u)"
 
-#: ../libnm-core/nm-setting-vlan.c:649
+#: ../libnm-core/nm-setting-vlan.c:636
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "l'id de vlan doit être entre 0-4094 mais est à %u"
 
-#: ../libnm-core/nm-setting-vlan.c:659
+#: ../libnm-core/nm-setting-vlan.c:646
 msgid "flags are invalid"
 msgstr "les marqueurs ne sont pas valides"
 
-#: ../libnm-core/nm-setting-vlan.c:671
+#: ../libnm-core/nm-setting-vlan.c:658
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "le paramètre vlan doit également avoir un paramètre ethernet"
 
-#: ../libnm-core/nm-setting-vpn.c:560
+#: ../libnm-core/nm-setting-vpn.c:546
 msgid "cannot set connection.multi-connect for VPN setting"
-msgstr ""
-"ne peut pas définir connection.multi-connect pour la configuration du VPN"
+msgstr "ne peut pas définir connection.multi-connect pour la configuration du VPN"
 
-#: ../libnm-core/nm-setting-vpn.c:581
+#: ../libnm-core/nm-setting-vpn.c:567
 #, c-format
 msgid "secret was empty"
 msgstr "secret vide"
 
-#: ../libnm-core/nm-setting-vpn.c:611
+#: ../libnm-core/nm-setting-vpn.c:597
 msgid "setting contained a secret with an empty name"
 msgstr "configuration contenant un secret avec un nom vide"
 
-#: ../libnm-core/nm-setting-vpn.c:619
+#: ../libnm-core/nm-setting-vpn.c:605
 #, c-format
 msgid "secret value was empty"
 msgstr "valeur de secret vide"
 
-#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2224
+#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
 msgid "not a secret property"
 msgstr "ne correspond pas à une propriété secrète"
 
-#: ../libnm-core/nm-setting-vpn.c:672
+#: ../libnm-core/nm-setting-vpn.c:658
 msgid "secret is not of correct type"
 msgstr "secret de type erroné"
 
-#: ../libnm-core/nm-setting-vpn.c:756
+#: ../libnm-core/nm-setting-vpn.c:742
 msgid "secret flags property not found"
 msgstr "la propriété des marqueurs secrets n'a pas été trouvée"
 
-#: ../libnm-core/nm-setting-vxlan.c:365
+#: ../libnm-core/nm-setting-vxlan.c:351
 #, c-format
 msgid "'%s' is not a valid IP%c address"
 msgstr "« %s » n'est pas une adresse IP%c valide"
 
-#: ../libnm-core/nm-setting-vxlan.c:392
+#: ../libnm-core/nm-setting-vxlan.c:378
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d est supérieure à la valeur du port local max %d"
 
-#: ../libnm-core/nm-setting-wired.c:752
+#: ../libnm-core/nm-setting-wired.c:738
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "« %s » n'est pas une valeur de port Ethernet valide"
 
-#: ../libnm-core/nm-setting-wired.c:762
+#: ../libnm-core/nm-setting-wired.c:748
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "« %s » n'est pas une valeur duplex valide"
 
-#: ../libnm-core/nm-setting-wired.c:825
+#: ../libnm-core/nm-setting-wired.c:811
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "« %s » ou sa valeur « %s » n'est pas valide"
 
-#: ../libnm-core/nm-setting-wired.c:863
+#: ../libnm-core/nm-setting-wired.c:849
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
-"les modes « default » et « ignore » de Wake-on LAN sont des marqueurs "
-"exclusifs"
+msgstr "les modes « default » et « ignore » de Wake-on LAN sont des marqueurs exclusifs"
 
-#: ../libnm-core/nm-setting-wired.c:872
+#: ../libnm-core/nm-setting-wired.c:858
 msgid "Wake-on-LAN password can only be used with magic packet mode"
-msgstr ""
-"le mot de passe Wake-on-LAN ne peut pas être utilisé en mode magic packet"
+msgstr "le mot de passe Wake-on-LAN ne peut pas être utilisé en mode magic packet"
 
-#: ../libnm-core/nm-setting-wired.c:898
-msgid ""
-"both speed and duplex should have a valid value or both should be unset"
-msgstr ""
-"la vitesse et le recto verso doivent avoir une valeur valide ou les deux "
-"doivent être désactivés"
+#: ../libnm-core/nm-setting-wired.c:884
+msgid "both speed and duplex should have a valid value or both should be unset"
+msgstr "la vitesse et le recto verso doivent avoir une valeur valide ou les deux doivent être désactivés"
 
-#: ../libnm-core/nm-setting-wired.c:899
+#: ../libnm-core/nm-setting-wired.c:885
 msgid "both speed and duplex are required for static link configuration"
-msgstr ""
-"la vitesse et le mode duplex sont tous deux requis pour la configuration de "
-"la liaison statique"
+msgstr "la vitesse et le mode duplex sont tous deux requis pour la configuration de la liaison statique"
 
-#: ../libnm-core/nm-setting-wireguard.c:778
+#: ../libnm-core/nm-setting-wireguard.c:764
 msgid "missing public-key for peer"
 msgstr "clé publique manquante pour l'homologue"
 
-#: ../libnm-core/nm-setting-wireguard.c:782
+#: ../libnm-core/nm-setting-wireguard.c:768
 msgid "invalid public-key for peer"
 msgstr "clé publique non valide pour l'homologue"
 
-#: ../libnm-core/nm-setting-wireguard.c:791
+#: ../libnm-core/nm-setting-wireguard.c:777
 msgid "invalid preshared-key for peer"
 msgstr "clé pré-partagée non valide pour l'homologue"
 
-#: ../libnm-core/nm-setting-wireguard.c:809
+#: ../libnm-core/nm-setting-wireguard.c:795
 msgid "invalid endpoint for peer"
 msgstr "point de terminaison non valide pour l'homologue"
 
-#: ../libnm-core/nm-setting-wireguard.c:819
+#: ../libnm-core/nm-setting-wireguard.c:805
 #, c-format
 msgid "invalid IP address \"%s\" for allowed-ip of peer"
-msgstr ""
-"adresse IP non valide : « %s » pour l'adresse ip autorisée (allowed-ip) de "
-"l'homologue"
+msgstr "adresse IP non valide : « %s » pour l'adresse ip autorisée (allowed-ip) de l'homologue"
 
-#: ../libnm-core/nm-setting-wireguard.c:828
+#: ../libnm-core/nm-setting-wireguard.c:814
 msgid "invalid preshared-key-flags for peer"
 msgstr "marqueurs preshared-key-flags non valide pour l'homologue"
 
-#: ../libnm-core/nm-setting-wireguard.c:1604
+#: ../libnm-core/nm-setting-wireguard.c:1590
 #, c-format
 msgid "peer #%u has no public-key"
 msgstr "l'homologue #%u n'a pas de clé publique"
 
-#: ../libnm-core/nm-setting-wireguard.c:1615
+#: ../libnm-core/nm-setting-wireguard.c:1601
 #, c-format
 msgid "peer #%u has invalid public-key"
 msgstr "l'homologue #%u a une clé publique non valide"
 
-#: ../libnm-core/nm-setting-wireguard.c:1629
+#: ../libnm-core/nm-setting-wireguard.c:1615
 #, c-format
 msgid "peer #%u has invalid endpoint"
 msgstr "l'homologue #%u a un point de terminaison non valide"
 
-#: ../libnm-core/nm-setting-wireguard.c:1659
+#: ../libnm-core/nm-setting-wireguard.c:1645
 #, c-format
 msgid "peer #%u has invalid allowed-ips setting"
 msgstr "l'homologue #%u a une configuration aloowed-ip non valide"
 
-#: ../libnm-core/nm-setting-wireguard.c:1671
+#: ../libnm-core/nm-setting-wireguard.c:1657
 #, c-format
 msgid "peer #%u is invalid: %s"
 msgstr "l'homologue #%u est non valide : %s"
 
-#: ../libnm-core/nm-setting-wireguard.c:1742
-#: ../libnm-core/nm-setting-wireguard.c:1757
+#: ../libnm-core/nm-setting-wireguard.c:1728
+#: ../libnm-core/nm-setting-wireguard.c:1743
 #, c-format
 msgid "method \"%s\" is not supported for WireGuard"
 msgstr "la méthode « %s » n'est pas prise en charge par WireGuard"
 
-#: ../libnm-core/nm-setting-wireguard.c:1777
+#: ../libnm-core/nm-setting-wireguard.c:1763
 msgid "key must be 32 bytes base64 encoded"
 msgstr "la clé doit compter 32 octets et chiffrée base64"
 
-#: ../libnm-core/nm-setting-wireguard.c:1913
+#: ../libnm-core/nm-setting-wireguard.c:1899
 msgid "invalid peer secrets"
 msgstr "Secrets de l'homologue non valides"
 
-#: ../libnm-core/nm-setting-wireguard.c:1936
+#: ../libnm-core/nm-setting-wireguard.c:1922
 #, c-format
 msgid "peer #%u lacks public-key"
 msgstr "l'homologue #%u n'a pas de clé publique"
 
-#: ../libnm-core/nm-setting-wireguard.c:1950
+#: ../libnm-core/nm-setting-wireguard.c:1936
 #, c-format
 msgid "non-existing peer '%s'"
 msgstr "l'homologue « %s » n'existe pas"
 
-#: ../libnm-core/nm-setting-wireless-security.c:928
+#: ../libnm-core/nm-setting-wireless-security.c:913
 #, c-format
 msgid "'%s' is not a valid value for '%s' mode connections"
 msgstr "« %s » n'est pas une valeur valide pour les connexions de type « %s »"
 
-#: ../libnm-core/nm-setting-wireless-security.c:951
+#: ../libnm-core/nm-setting-wireless-security.c:936
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "la sécurité « %s » requiert « %s=%s »"
 
-#: ../libnm-core/nm-setting-wireless-security.c:972
+#: ../libnm-core/nm-setting-wireless-security.c:957
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "la sécurité « %s » requiert la présence du paramètre « %s »"
 
-#: ../libnm-core/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:978
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "La valeur « %d » est hors de la portée <0-3>"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1048
-#, c-format
-msgid "'%s' connections require '%s' in this property"
-msgstr "les connexions « %s » requièrent que « %s » soit dans cette propriété"
-
-#: ../libnm-core/nm-setting-wireless-security.c:1078
+#: ../libnm-core/nm-setting-wireless-security.c:1037
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "« %s » peut uniquement être utilisé avec '%s=%s' (WEP)"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1102
+#: ../libnm-core/nm-setting-wireless-security.c:1061
 #, c-format
 msgid ""
 "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
-msgstr ""
-"« %s » ne peut pas être utilisé avec les clés de gestion 'wpa-eap', 'wpa-"
-"psk', et 'sae' "
+msgstr "« %s » ne peut pas être utilisé avec les clés de gestion 'wpa-eap', 'wpa-psk', et 'sae' "
 
-#: ../libnm-core/nm-setting-wireless.c:795
+#: ../libnm-core/nm-setting-wireless.c:778
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "« %s » n'est pas un mode Wi-Fi valide"
 
-#: ../libnm-core/nm-setting-wireless.c:805
+#: ../libnm-core/nm-setting-wireless.c:788
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "« %s » n'est pas une bande valide"
 
-#: ../libnm-core/nm-setting-wireless.c:815
+#: ../libnm-core/nm-setting-wireless.c:798
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "« %s » requiert de paramétrer la propriété « %s »"
 
-#: ../libnm-core/nm-setting-wireless.c:837
+#: ../libnm-core/nm-setting-wireless.c:820
 #, c-format
 msgid "'%s' requires '%s' and '%s' property"
 msgstr "« %s » requiert « %s » et la propriété « %s »"
 
-#: ../libnm-core/nm-setting-wireless.c:924 ../libnm-core/nm-team-utils.c:2004
+#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
 #, c-format
 msgid "invalid value"
 msgstr "valeur non valide"
 
-#: ../libnm-core/nm-setting-wireless.c:934
+#: ../libnm-core/nm-setting-wireless.c:917
 msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
-msgstr ""
-"les modes « default » et « ignore » de Wake-on LAN sont des marqueurs "
-"exclusifs"
+msgstr "les modes « default » et « ignore » de Wake-on LAN sont des marqueurs exclusifs"
 
-#: ../libnm-core/nm-setting-wireless.c:943
+#: ../libnm-core/nm-setting-wireless.c:926
 msgid "Wake-on-WLAN trying to set unknown flag"
 msgstr "Wake-on-WLAN essaye d'activer un marqueur inconnu"
 
-#: ../libnm-core/nm-setting-wireless.c:965
+#: ../libnm-core/nm-setting-wireless.c:948
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
-msgstr ""
-"valeur conflictuelle de l'adresse mac aléatoire et de l'adresse mac clonée"
+msgstr "valeur conflictuelle de l'adresse mac aléatoire et de l'adresse mac clonée"
 
-#: ../libnm-core/nm-setting-wpan.c:185
+#: ../libnm-core/nm-setting-wpan.c:171
 msgid "page must be defined along with a channel"
 msgstr "page et canal doivent être définis"
 
-#: ../libnm-core/nm-setting-wpan.c:194
+#: ../libnm-core/nm-setting-wpan.c:180
 #, c-format
 msgid "page must be between %d and %d"
 msgstr "page doit être entre %d et %d"
 
-#: ../libnm-core/nm-setting-wpan.c:205
+#: ../libnm-core/nm-setting-wpan.c:191
 #, c-format
 msgid "channel must not be between %d and %d"
 msgstr "canal ne doit pas être entre %d et %d"
 
-#: ../libnm-core/nm-setting.c:919
+#: ../libnm-core/nm-setting.c:806
 #, c-format
 msgid "duplicate property"
 msgstr "dupliquer la propriété"
 
-#: ../libnm-core/nm-setting.c:942
+#: ../libnm-core/nm-setting.c:829
 #, c-format
 msgid "unknown property"
 msgstr "propriété inconnue"
 
-#: ../libnm-core/nm-setting.c:1013 ../libnm-core/nm-setting.c:1062
+#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
-msgstr ""
-"impossible de définir la propriété de type « %s » à partir de valeurs de "
-"type « %s »"
+msgstr "impossible de définir la propriété de type « %s » à partir de valeurs de type « %s »"
 
-#: ../libnm-core/nm-setting.c:1032 ../libnm-core/nm-setting.c:1047
+#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:934
 #, c-format
 msgid "failed to set property: %s"
 msgstr "n'a pas pu définir la propriété : %s"
 
-#: ../libnm-core/nm-setting.c:1077
+#: ../libnm-core/nm-setting.c:964
 #, c-format
 msgid "can not set property: %s"
 msgstr "n'a pas pu définir la propriété : %s"
 
-#: ../libnm-core/nm-setting.c:2115
+#: ../libnm-core/nm-setting.c:2015
 msgid "secret not found"
 msgstr "secret non trouvé"
 
-#: ../libnm-core/nm-team-utils.c:1338 ../libnm-core/nm-team-utils.c:1353
+#: ../libnm-core/nm-team-utils.c:1324 ../libnm-core/nm-team-utils.c:1339
 #, c-format
 msgid "invalid D-Bus property \"%s\""
 msgstr "Propriété D-Bus non valide « %s »"
 
-#: ../libnm-core/nm-team-utils.c:1363
+#: ../libnm-core/nm-team-utils.c:1349
 #, c-format
 msgid "duplicate D-Bus property \"%s\""
 msgstr "dupliquer la propriété D-Bus « %s »"
 
-#: ../libnm-core/nm-team-utils.c:1384
+#: ../libnm-core/nm-team-utils.c:1370
 #, c-format
 msgid "invalid D-Bus property \"%s\" for \"%s\""
 msgstr "propriété D-Bus non valide « %s » pour « %s »"
 
-#: ../libnm-core/nm-team-utils.c:1442
+#: ../libnm-core/nm-team-utils.c:1428
 #, c-format
 msgid "unknown link-watcher name \"%s\""
 msgstr "nom d'observateur de liens inconnu « %s »"
 
-#: ../libnm-core/nm-team-utils.c:1993
+#: ../libnm-core/nm-team-utils.c:1979
 #, c-format
 msgid "value out or range"
 msgstr "valeur en dehors de la plage autorisée"
 
-#: ../libnm-core/nm-team-utils.c:2023
+#: ../libnm-core/nm-team-utils.c:2009
 #, c-format
 msgid "invalid runner-tx-hash"
 msgstr "exécuteur runner-tx-hash non valide"
 
-#: ../libnm-core/nm-team-utils.c:2050
+#: ../libnm-core/nm-team-utils.c:2036
 #, c-format
 msgid "%s is only allowed for runner %s"
 msgstr "%s uniquement valide pour l'exécuteur %s"
 
-#: ../libnm-core/nm-team-utils.c:2058
+#: ../libnm-core/nm-team-utils.c:2044
 #, c-format
 msgid "%s is only allowed for runners %s"
 msgstr "%s uniquement autorisé pour les exécuteurs %s"
 
-#: ../libnm-core/nm-team-utils.c:2075
+#: ../libnm-core/nm-team-utils.c:2061
 #, c-format
 msgid "cannot set parameters for lacp and activebackup runners together"
-msgstr ""
-"impossible de définir les paramètres pour les exécuteurs lacp et "
-"activebackup à la fois"
+msgstr "impossible de définir les paramètres pour les exécuteurs lacp et activebackup à la fois"
 
-#: ../libnm-core/nm-team-utils.c:2084
+#: ../libnm-core/nm-team-utils.c:2070
 #, c-format
 msgid "missing link watcher"
 msgstr "observateur de liens manquant"
 
-#: ../libnm-core/nm-team-utils.c:2106
+#: ../libnm-core/nm-team-utils.c:2092
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "la configuration de l'équipe dépasse la limite de taille"
 
-#: ../libnm-core/nm-team-utils.c:2112
+#: ../libnm-core/nm-team-utils.c:2098
 #, c-format
 msgid "team config is not valid UTF-8"
 msgstr "la configuration de l'équipe n'est pas un UTF-8 valide"
 
-#: ../libnm-core/nm-team-utils.c:2118
-#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9014
+#: ../libnm-core/nm-team-utils.c:2104
+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
 #, c-format
 msgid "invalid json"
 msgstr "json non valide"
 
-#: ../libnm-core/nm-team-utils.c:2272
+#: ../libnm-core/nm-team-utils.c:2258
 #, c-format
 msgid "invalid D-Bus type \"%s\""
 msgstr "type de D-Bus non valide : « %s »"
 
-#: ../libnm-core/nm-team-utils.c:2311
+#: ../libnm-core/nm-team-utils.c:2297
 #, c-format
 msgid "invalid link-watchers: %s"
 msgstr "observateurs de liens non valide : %s"
 
-#: ../libnm-core/nm-utils.c:2327
+#: ../libnm-core/nm-utils.c:2330
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "« %s » n'est pas un handle valide"
 
-#: ../libnm-core/nm-utils.c:2455
+#: ../libnm-core/nm-utils.c:2458
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "« %s » inattendu : parent déjà spécifié."
 
-#: ../libnm-core/nm-utils.c:2471
+#: ../libnm-core/nm-utils.c:2474
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "action non valide : '%s'"
 
-#: ../libnm-core/nm-utils.c:2493
+#: ../libnm-core/nm-utils.c:2496
 msgid "parent not specified."
 msgstr "parent non spécifié"
 
-#: ../libnm-core/nm-utils.c:2555
+#: ../libnm-core/nm-utils.c:2558
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "attribut « %s » de type «  » non supporté"
 
-#: ../libnm-core/nm-utils.c:2677
+#: ../libnm-core/nm-utils.c:2680
 msgid "action name missing."
 msgstr "nom de l'action manquant"
 
-#: ../libnm-core/nm-utils.c:2703
+#: ../libnm-core/nm-utils.c:2706
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "attribut « %s » de type «  » non supporté"
 
-#: ../libnm-core/nm-utils.c:2841
+#: ../libnm-core/nm-utils.c:2844
 msgid "invalid action: "
-msgstr "option «  » non valide"
+msgstr "option «  » non valide : "
 
-#: ../libnm-core/nm-utils.c:2845
+#: ../libnm-core/nm-utils.c:2848
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "attribut « %s » de type «  » non supporté"
 
-#: ../libnm-core/nm-utils.c:3446
+#: ../libnm-core/nm-utils.c:3449
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "échec fichier stat %s: %s"
 
-#: ../libnm-core/nm-utils.c:3455
+#: ../libnm-core/nm-utils.c:3458
 #, c-format
 msgid "not a file (%s)"
-msgstr "pas un fichier  (%s) "
+msgstr "pas un fichier (%s)"
 
-#: ../libnm-core/nm-utils.c:3466
+#: ../libnm-core/nm-utils.c:3469
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "propriétaire de fichier non valide %d pour %s"
 
-#: ../libnm-core/nm-utils.c:3477
+#: ../libnm-core/nm-utils.c:3480
 #, c-format
 msgid "file permissions for %s"
 msgstr "permissions de fichier pour %s"
 
-#: ../libnm-core/nm-utils.c:3487
+#: ../libnm-core/nm-utils.c:3490
 #, c-format
 msgid "reject %s"
 msgstr "rejète %s"
 
-#: ../libnm-core/nm-utils.c:3506
+#: ../libnm-core/nm-utils.c:3509
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "le chemin n'est pas absolu (%s)"
 
-#: ../libnm-core/nm-utils.c:3520
+#: ../libnm-core/nm-utils.c:3523
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "le fichier de greffon n'existe pas (%s)"
 
-#: ../libnm-core/nm-utils.c:3528
+#: ../libnm-core/nm-utils.c:3531
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "Le greffon n'est pas un fichier valide (%s)"
 
-#: ../libnm-core/nm-utils.c:3538
+#: ../libnm-core/nm-utils.c:3541
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "les archives libtool ne sont pas prises en charge (%s)"
 
-#: ../libnm-core/nm-utils.c:3620
+#: ../libnm-core/nm-utils.c:3623
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "N'a pas pu trouver le binaire « %s »"
 
-#: ../libnm-core/nm-utils.c:4494
+#: ../libnm-core/nm-utils.c:4517
 msgid "unknown secret flags"
 msgstr "marqueurs de secret inconnus"
 
-#: ../libnm-core/nm-utils.c:4504
+#: ../libnm-core/nm-utils.c:4527
 msgid "conflicting secret flags"
 msgstr "marqueurs de secret conflictueux"
 
-#: ../libnm-core/nm-utils.c:4515
+#: ../libnm-core/nm-utils.c:4538
 msgid "secret flags must not be \"not-required\""
 msgstr "les marqueurs de secret non doivent pas être «non-requis»"
 
-#: ../libnm-core/nm-utils.c:4523
+#: ../libnm-core/nm-utils.c:4546
 msgid "unsupported secret flags"
 msgstr "marqueurs de secret non pris en charge"
 
-#: ../libnm-core/nm-utils.c:4553
+#: ../libnm-core/nm-utils.c:4576
 msgid "can't be simultaneously disabled and enabled"
 msgstr "ne peut pas être simultanément désactivé et activé"
 
-#: ../libnm-core/nm-utils.c:4561
+#: ../libnm-core/nm-utils.c:4584
 msgid "WPS is required"
 msgstr "WPS requis"
 
-#: ../libnm-core/nm-utils.c:4627
+#: ../libnm-core/nm-utils.c:4650
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "adresse MAC Ethernet non valide pour masque à la position %lld"
 
-#: ../libnm-core/nm-utils.c:4642
+#: ../libnm-core/nm-utils.c:4665
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "adresse MAC Ethernet #%u invalide à la position %lld"
 
-#: ../libnm-core/nm-utils.c:4702
+#: ../libnm-core/nm-utils.c:4725
 msgid "interface name is missing"
 msgstr "le nom d'interface est manquant"
 
-#: ../libnm-core/nm-utils.c:4708
+#: ../libnm-core/nm-utils.c:4731
 msgid "interface name is too short"
 msgstr "le nom de l'interface est trop court"
 
-#: ../libnm-core/nm-utils.c:4717
+#: ../libnm-core/nm-utils.c:4740
 msgid "interface name is reserved"
 msgstr "le nom d'interface est réservé"
 
-#: ../libnm-core/nm-utils.c:4729
+#: ../libnm-core/nm-utils.c:4752
 msgid "interface name contains an invalid character"
 msgstr "le nom de l'interface contient un caractère invalide"
 
-#: ../libnm-core/nm-utils.c:4735
+#: ../libnm-core/nm-utils.c:4758
 msgid "interface name is longer than 15 characters"
 msgstr "le nom de l'interface fait plus de 15 caractères"
 
-#: ../libnm-core/nm-utils.c:5402
+#: ../libnm-core/nm-utils.c:5425
 msgid "not valid utf-8"
 msgstr "utf-8 invalide"
 
-#: ../libnm-core/nm-utils.c:5423 ../libnm-core/nm-utils.c:5476
+#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
 msgid "is not a JSON object"
 msgstr "n'est pas un objet JSON"
 
-#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
+#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
 msgid "value is NULL"
 msgstr "la valeur est NULL"
 
-#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
+#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
 msgid "value is empty"
 msgstr "la valeur est vide"
 
-#: ../libnm-core/nm-utils.c:5464
+#: ../libnm-core/nm-utils.c:5487
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "JSON invalide à la position %d (%s)"
 
-#: ../libnm-core/nm-utils.c:5584 ../libnm-core/nm-utils.c:5604
+#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
 msgid "unterminated escape sequence"
 msgstr "séquence d'échappement no terminée"
 
-#: ../libnm-core/nm-utils.c:5629
+#: ../libnm-core/nm-utils.c:5694
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "attribut inconnu « %s »"
 
-#: ../libnm-core/nm-utils.c:5644
+#: ../libnm-core/nm-utils.c:5709
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "séparateur clé-valeur « %c » manquant après « %s »"
 
-#: ../libnm-core/nm-utils.c:5660
+#: ../libnm-core/nm-utils.c:5725
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "valeur « %s » uint32 invalide pour l'attribut  « %s »"
 
-#: ../libnm-core/nm-utils.c:5669
+#: ../libnm-core/nm-utils.c:5734
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "valeur « %s » uint8 invalide pour l'attribut  « %s »"
 
-#: ../libnm-core/nm-utils.c:5679
+#: ../libnm-core/nm-utils.c:5744
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "valeur de booléen non valide « %s » pour attribut « %s »"
 
-#: ../libnm-core/nm-utils.c:5689
+#: ../libnm-core/nm-utils.c:5754
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "attribut « %s » de type « %s » non supporté"
 
-#: ../libnm-core/nm-utils.c:6038
+#: ../libnm-core/nm-utils.c:6119
 #, c-format
 msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
 msgstr "Les VLAN %d et %d ne sont pas ordonnancés par vid ascendant"
 
-#: ../libnm-core/nm-utils.c:6062
+#: ../libnm-core/nm-utils.c:6143
 #, c-format
 msgid "duplicate bridge VLAN vid %u"
 msgstr "VLAN vid %u de pontage dupliqué"
 
-#: ../libnm-core/nm-utils.c:6074
+#: ../libnm-core/nm-utils.c:6155
 msgid "only one VLAN can be the PVID"
 msgstr "un VLAN uniquement peut correspondre au PVID"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:295
+#: ../libnm-core/nm-utils.c:6205
+#, c-format
+msgid "unknown flags 0x%x"
+msgstr "drapeaux inconnus 0x%x"
+
+#: ../libnm-core/nm-utils.c:6215
+msgid ""
+"'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
+msgstr "Les indicateurs \"fqdn-no-update\" et \"fqdn-serv-update\" ne peuvent pas être activés en même temps"
+
+#: ../libnm-core/nm-utils.c:6226
+msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
+msgstr "Le drapeau 'fqdn-clear-flags' est incompatible avec les autres drapeaux FQDN"
+
+#: ../libnm-core/nm-utils.c:6235
+msgid "DHCPv6 does not support the E (encoded) FQDN flag"
+msgstr "DHCPv6 ne prend pas en charge l'indicateur FQDN E (encodé)"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:281
 #, c-format
 msgid "cannot load plugin \"%s\": %s"
 msgstr "impossible de charger le greffon « %s » : %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:306
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
-msgstr ""
-"impossible de charger la méthode nm_vpn_editor_plugin_factory() depuis %s "
-"(%s)"
+msgstr "impossible de charger la méthode nm_vpn_editor_plugin_factory() depuis %s (%s)"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:331
+#: ../libnm-core/nm-vpn-editor-plugin.c:317
 #, c-format
 msgid "unknown error initializing plugin %s"
 msgstr "erreur inconnue lors de l'initialisation du greffon %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:348
+#: ../libnm-core/nm-vpn-editor-plugin.c:334
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
-msgstr ""
-"impossible de charger le greffon VPN dans « %s » : nom de greffon manquant"
+msgstr "impossible de charger le greffon VPN dans « %s » : nom de greffon manquant"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:357
+#: ../libnm-core/nm-vpn-editor-plugin.c:343
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
-msgstr ""
-"impossible de charger le greffon VPN dans « %s » : nom de service manquant"
+msgstr "impossible de charger le greffon VPN dans « %s » : nom de service manquant"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:500
+#: ../libnm-core/nm-vpn-editor-plugin.c:486
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "le greffon ne prend pas en charge la fonction d'importation"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:520
+#: ../libnm-core/nm-vpn-editor-plugin.c:506
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "le greffon ne prend pas en charge la fonction d'exportation"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:107
+#: ../libnm-core/nm-vpn-plugin-info.c:93
 #, c-format
 msgid "missing filename"
 msgstr "nom de fichier manquant"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:115
+#: ../libnm-core/nm-vpn-plugin-info.c:101
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "le nom du fichier doit correspondre à un chemin absolu (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:124
+#: ../libnm-core/nm-vpn-plugin-info.c:110
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "le nom du fichier a un format non valide (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:447
+#: ../libnm-core/nm-vpn-plugin-info.c:433
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
-msgstr ""
-"il y a un greffon (%s) qui rentre en conflit et qui a la même valeur %s.%s"
+msgstr "il y a un greffon (%s) qui rentre en conflit et qui a la même valeur %s.%s"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:485
+#: ../libnm-core/nm-vpn-plugin-info.c:471
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "il y a un greffon qui rentre en conflit et qui a le même nom (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1067
+#: ../libnm-core/nm-vpn-plugin-info.c:1053
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "paramètre \"plugin\" manquant"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1077
+#: ../libnm-core/nm-vpn-plugin-info.c:1063
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s : n'essayez pas de charger le greffon qui a déjà échoué à nouveau"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1153
+#: ../libnm-core/nm-vpn-plugin-info.c:1139
 msgid "missing filename to load VPN plugin info"
 msgstr "nom de fichier manquant pour charger les informations de greffon VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1165
+#: ../libnm-core/nm-vpn-plugin-info.c:1151
 msgid "missing name for VPN plugin info"
 msgstr "nom manquant pour les informations de greffon VPN"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1160
 msgid "missing service for VPN plugin info"
 msgstr "service manquant pour les informations de greffon VPN"
 
-#: ../libnm/nm-device-adsl.c:68
+#: ../libnm/nm-client.c:3584
+#, c-format
+msgid "request succeeded with %s but object is in an unsuitable state"
+msgstr "requête réussie avec %smais l'objet est dans un état inapproprié"
+
+#: ../libnm/nm-client.c:3675
+#, c-format
+msgid "operation succeeded but object %s does not exist"
+msgstr "l'opération a réussi mais l'objet %sn'existe pas"
+
+#: ../libnm/nm-device-adsl.c:64
 msgid "The connection was not an ADSL connection."
 msgstr "La connexion n'était pas une connexion ADSL."
 
-#: ../libnm/nm-device-bond.c:108
+#: ../libnm/nm-device-bond.c:104
 msgid "The connection was not a bond connection."
 msgstr "La connexion n'était pas un connexion de liaison"
 
-#: ../libnm/nm-device-bridge.c:112
+#: ../libnm/nm-device-bridge.c:108
 msgid "The connection was not a bridge connection."
 msgstr "La connexion n'était pas une connexion de pontage"
 
-#: ../libnm/nm-device-bt.c:134
+#: ../libnm/nm-device-bt.c:130
 #, c-format
 msgid "The connection was not a Bluetooth connection."
 msgstr "La connexion n'était pas une connexion Bluetooth"
 
-#: ../libnm/nm-device-bt.c:140
+#: ../libnm/nm-device-bt.c:136
 #, c-format
 msgid "The connection is of Bluetooth NAP type."
 msgstr "La connexion est de type Bluetooth NAP."
 
-#: ../libnm/nm-device-bt.c:149
+#: ../libnm/nm-device-bt.c:145
 msgid "Invalid device Bluetooth address."
 msgstr "Adresse de périphérique Bluetooth non valide"
 
-#: ../libnm/nm-device-bt.c:155
+#: ../libnm/nm-device-bt.c:151
 msgid "The Bluetooth addresses of the device and the connection didn't match."
-msgstr ""
-"Les adresses Bluetooth du périphérique et la connexion ne correspondaient "
-"pas."
+msgstr "Les adresses Bluetooth du périphérique et la connexion ne correspondaient pas."
 
-#: ../libnm/nm-device-bt.c:164
+#: ../libnm/nm-device-bt.c:160
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
-msgstr ""
-"Le périphérique ne possède pas les fonctionnalités Bluetooth requises pour "
-"établir la connexion."
+msgstr "Le périphérique ne possède pas les fonctionnalités Bluetooth requises pour établir la connexion."
 
-#: ../libnm/nm-device-dummy.c:74
+#: ../libnm/nm-device-dummy.c:68
 msgid "The connection was not a dummy connection."
 msgstr "La connexion n'était pas une connexion factice."
 
-#: ../libnm/nm-device-dummy.c:81 ../libnm/nm-device-generic.c:95
-#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
-#: ../libnm/nm-device-ovs-port.c:96
+#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
+#: ../libnm/nm-device-ovs-port.c:84
 msgid "The connection did not specify an interface name."
 msgstr "La connexion ne spécifiait pas de nom d'interface."
 
-#: ../libnm/nm-device-ethernet.c:203
+#: ../libnm/nm-device-ethernet.c:187
 msgid "The connection was not an Ethernet or PPPoE connection."
 msgstr "La connexion n'était pas une connexion Ethernet ou PPPoE."
 
-#: ../libnm/nm-device-ethernet.c:218
+#: ../libnm/nm-device-ethernet.c:202
 msgid "The connection and device differ in S390 subchannels."
 msgstr "La connexion et le périphérique diffèrent dans les sous-canaux S390."
 
-#: ../libnm/nm-device-ethernet.c:233
+#: ../libnm/nm-device-ethernet.c:217
 #, c-format
 msgid "Invalid device MAC address %s."
 msgstr "Adresse MAC du périphérique %s invalide"
 
-#: ../libnm/nm-device-ethernet.c:238
+#: ../libnm/nm-device-ethernet.c:222
 msgid "The MACs of the device and the connection do not match."
 msgstr "Les MAC de périphérique et de la connexion ne correspondent pas."
 
-#: ../libnm/nm-device-ethernet.c:248
+#: ../libnm/nm-device-ethernet.c:232
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
 msgstr "MAC non valide, dans la liste noire : %s"
 
-#: ../libnm/nm-device-ethernet.c:254
+#: ../libnm/nm-device-ethernet.c:238
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "MAC (%s) du périphérique est sur la liste noire de la connexion."
 
-#: ../libnm/nm-device-generic.c:88
+#: ../libnm/nm-device-generic.c:84
 msgid "The connection was not a generic connection."
 msgstr "La connexion n'était pas une connexion standard"
 
-#: ../libnm/nm-device-infiniband.c:90
+#: ../libnm/nm-device-infiniband.c:86
 msgid "The connection was not an InfiniBand connection."
 msgstr "La connexion n'était pas une connexion InfiniBand."
 
-#: ../libnm/nm-device-infiniband.c:98 ../libnm/nm-device-wifi.c:621
-#: ../libnm/nm-device-wimax.c:321
+#: ../libnm/nm-device-infiniband.c:94 ../libnm/nm-device-wifi.c:470
 msgid "Invalid device MAC address."
 msgstr "Adresse MAC de périphérique non valide."
 
-#: ../libnm/nm-device-infiniband.c:106 ../libnm/nm-device-wifi.c:628
-#: ../libnm/nm-device-wimax.c:328
+#: ../libnm/nm-device-infiniband.c:102 ../libnm/nm-device-wifi.c:477
 msgid "The MACs of the device and the connection didn't match."
 msgstr "Les MAC de périphérique et de la connexion ne correspondaient pas."
 
-#: ../libnm/nm-device-ip-tunnel.c:268
+#: ../libnm/nm-device-ip-tunnel.c:264
 msgid "The connection was not an IP tunnel connection."
 msgstr "La connexion n'était pas une connexion de tunnel IP."
 
-#: ../libnm/nm-device-macvlan.c:154
+#: ../libnm/nm-device-macvlan.c:151
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "La connexion n'était pas une connexion MAC-VLAN."
 
-#: ../libnm/nm-device-modem.c:178
+#: ../libnm/nm-device-modem.c:175
 msgid "The connection was not a modem connection."
 msgstr "La connexion n'était pas une connexion de modem."
 
-#: ../libnm/nm-device-modem.c:186
+#: ../libnm/nm-device-modem.c:183
 msgid "The connection was not a valid modem connection."
 msgstr "La connexion n'était pas une connexion de modem valide."
 
-#: ../libnm/nm-device-modem.c:193
+#: ../libnm/nm-device-modem.c:190
 msgid "The device is lacking capabilities required by the connection."
-msgstr ""
-"Le périphérique ne possède pas les fonctionnalités requises par la connexion."
-""
+msgstr "Le périphérique ne possède pas les fonctionnalités requises par la connexion."
 
-#: ../libnm/nm-device-olpc-mesh.c:111
+#: ../libnm/nm-device-olpc-mesh.c:107
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "La connexion n'était pas une connexion « OLPC Mesh »."
 
-#: ../libnm/nm-device-ovs-bridge.c:89
+#: ../libnm/nm-device-ovs-bridge.c:77
 msgid "The connection was not a ovs_bridge connection."
 msgstr "La connexion n'était pas une connexion ovs_bridge."
 
-#: ../libnm/nm-device-ovs-interface.c:60
+#: ../libnm/nm-device-ovs-interface.c:45
 msgid "The connection was not a ovs_interface connection."
 msgstr "La connexion n'était pas une connexion ovs_interface."
 
-#: ../libnm/nm-device-ovs-port.c:89
+#: ../libnm/nm-device-ovs-port.c:77
 msgid "The connection was not a ovs_port connection."
 msgstr "La connexion n'était pas une connexion ovs_port."
 
-#: ../libnm/nm-device-team.c:135
+#: ../libnm/nm-device-team.c:131
 msgid "The connection was not a team connection."
 msgstr "La connexion n'était pas une connexion team."
 
-#: ../libnm/nm-device-tun.c:206
+#: ../libnm/nm-device-tun.c:202
 msgid "The connection was not a tun connection."
 msgstr "La connexion n'était pas une connexion tun."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../libnm/nm-device-tun.c:215
+#: ../libnm/nm-device-tun.c:211
 msgid "The mode of the device and the connection didn't match"
 msgstr "Le mode du périphérique et de la connexion ne correspondaient pas."
 
-#: ../libnm/nm-device-vlan.c:125
+#: ../libnm/nm-device-vlan.c:121
 msgid "The connection was not a VLAN connection."
 msgstr "La connexion n'était pas une connexion VLAN."
 
-#: ../libnm/nm-device-vlan.c:132
+#: ../libnm/nm-device-vlan.c:128
 msgid "The VLAN identifiers of the device and the connection didn't match."
-msgstr ""
-"Les identifiants VLAN du périphérique et de la connexion ne correspondaient "
-"pas."
+msgstr "Les identifiants VLAN du périphérique et de la connexion ne correspondaient pas."
 
-#: ../libnm/nm-device-vlan.c:147
+#: ../libnm/nm-device-vlan.c:143
 msgid "The hardware address of the device and the connection didn't match."
-msgstr ""
-"L'adresse de matériel du périphérique et de la connexion ne correspondait "
-"pas."
+msgstr "L'adresse de matériel du périphérique et de la connexion ne correspondait pas."
 
-#: ../libnm/nm-device-vxlan.c:383
+#: ../libnm/nm-device-vxlan.c:381
 msgid "The connection was not a VXLAN connection."
 msgstr "La connexion n'était pas une connexion VXLAN."
 
-#: ../libnm/nm-device-vxlan.c:390
+#: ../libnm/nm-device-vxlan.c:388
 msgid "The VXLAN identifiers of the device and the connection didn't match."
-msgstr ""
-"Les identifiants VXLAN du périphérique et de la connexion ne correspondaient "
-"pas."
+msgstr "Les identifiants VXLAN du périphérique et de la connexion ne correspondaient pas."
 
-#: ../libnm/nm-device-wifi-p2p.c:326
+#: ../libnm/nm-device-wifi-p2p.c:268
 msgid "The connection was not a Wi-Fi P2P connection."
 msgstr "La connexion n'était pas une connexion Wi-Fi P2P."
 
-#: ../libnm/nm-device-wifi.c:612
+#: ../libnm/nm-device-wifi.c:461
 msgid "The connection was not a Wi-Fi connection."
 msgstr "La connexion n'était pas une connexion Wi-Fi."
 
-#: ../libnm/nm-device-wifi.c:648
+#: ../libnm/nm-device-wifi.c:496
 msgid "The device is lacking WPA capabilities required by the connection."
-msgstr ""
-"Le périphérique ne possède pas les fonctionnalités WPA requises par la "
-"connexion."
+msgstr "Le périphérique ne possède pas les fonctionnalités WPA requises par la connexion."
 
-#: ../libnm/nm-device-wifi.c:655
-msgid ""
-"The device is lacking WPA2/RSN capabilities required by the connection."
-msgstr ""
-"Le périphérique ne possède pas les fonctionnalités WPA2/RSN requises par la "
-"connexion."
+#: ../libnm/nm-device-wifi.c:503
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgstr "Le périphérique ne possède pas les fonctionnalités WPA2/RSN requises par la connexion."
 
-#: ../libnm/nm-device-wimax.c:312
-msgid "The connection was not a WiMAX connection."
-msgstr "La connexion n'était pas une connexion WiMAX."
-
-#: ../libnm/nm-device-wpan.c:81
+#: ../libnm/nm-device-wpan.c:64
 msgid "The connection was not a wpan connection."
 msgstr "La connexion n'était pas une connexion wpan."
 
-#: ../libnm/nm-device.c:1383
+#: ../libnm/nm-device.c:1459
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm/nm-device.c:1385
+#: ../libnm/nm-device.c:1461
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../libnm/nm-device.c:1387
+#: ../libnm/nm-device.c:1463
 msgid "Open vSwitch Interface"
 msgstr "Ouvrir l'interface vSwitch"
 
-#: ../libnm/nm-device.c:1389
+#: ../libnm/nm-device.c:1465
 msgid "Open vSwitch Port"
 msgstr "Ouvrir le port vSwitch"
 
-#: ../libnm/nm-device.c:1391
+#: ../libnm/nm-device.c:1467
 msgid "Open vSwitch Bridge"
 msgstr "Ouvrir le pont vSwitch"
 
-#: ../libnm/nm-device.c:1393
+#: ../libnm/nm-device.c:1469
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm/nm-device.c:1407
+#: ../libnm/nm-device.c:1483
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm/nm-device.c:1409
+#: ../libnm/nm-device.c:1485
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm/nm-device.c:1411
+#: ../libnm/nm-device.c:1487
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm/nm-device.c:1413
+#: ../libnm/nm-device.c:1489
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm/nm-device.c:1415
+#: ../libnm/nm-device.c:1491
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm/nm-device.c:1417
+#: ../libnm/nm-device.c:1493
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm/nm-device.c:1419
+#: ../libnm/nm-device.c:1495
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1421
+#: ../libnm/nm-device.c:1497
 msgid "Dummy"
 msgstr "Factice"
 
-#: ../libnm/nm-device.c:1423
+#: ../libnm/nm-device.c:1499
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1425
+#: ../libnm/nm-device.c:1501
 msgid "IEEE 802.15.4"
 msgstr "IEEE 802.15.4"
 
-#: ../libnm/nm-device.c:1427
+#: ../libnm/nm-device.c:1503
 msgid "6LoWPAN"
 msgstr "6LoWPAN"
 
-#: ../libnm/nm-device.c:1429
+#: ../libnm/nm-device.c:1505
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: ../libnm/nm-device.c:1431
+#: ../libnm/nm-device.c:1507
 msgid "Wi-Fi P2P"
 msgstr "Wi-Fi P2P"
 
-#: ../libnm/nm-device.c:1463
+#: ../libnm/nm-device.c:1539
 msgid "Wired"
 msgstr "Filaire"
 
-#: ../libnm/nm-device.c:1494
+#: ../libnm/nm-device.c:1571
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm/nm-device.c:1496
+#: ../libnm/nm-device.c:1573
 msgid "USB"
 msgstr "USB"
 
@@ -13592,38 +12064,24 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#. 
-#: ../libnm/nm-device.c:1809 ../libnm/nm-device.c:1828
+#.
+#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm/nm-device.c:2551
+#: ../libnm/nm-device.c:2569
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "La connexion n'était pas valide : %s"
 
-#: ../libnm/nm-device.c:2560
+#: ../libnm/nm-device.c:2578
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
-msgstr ""
-"Les noms d'interface du périphérique et de la connexion ne correspondaient "
-"pas."
-
-#: ../libnm/nm-manager.c:271
-msgid "Checkpoint was removed before it was initialized"
-msgstr "Point de contrôle supprimé avant l'initialisation"
+msgstr "Les noms d'interface du périphérique et de la connexion ne correspondaient pas."
 
-#: ../libnm/nm-manager.c:998
-msgid "Active connection removed before it was initialized"
-msgstr "La connexion active a été supprimée avant d'être initialisée"
-
-#: ../libnm/nm-remote-settings.c:284
-msgid "Connection removed before it was initialized"
-msgstr "La connexion a été supprimée avant d'être initialisée"
-
-#: ../libnm/nm-vpn-plugin-old.c:845 ../libnm/nm-vpn-service-plugin.c:1044
+#: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
 msgid "No service name specified"
 msgstr "Aucun nom de service spécifié"
 
@@ -13633,9 +12091,7 @@ msgstr "Activer ou désactiver le réseau système"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr ""
-"La politique du système empêche l'activation ou la désactivation du réseau "
-"du système"
+msgstr "La politique du système empêche l'activation ou la désactivation du réseau du système"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid "Reload NetworkManager configuration"
@@ -13643,22 +12099,17 @@ msgstr "Réinitialiser la configuration de NetworkManager"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents reloading NetworkManager"
-msgstr ""
-"La politique du système empêche le chargement à nouveau du NetworkManager"
+msgstr "La politique du système empêche le chargement à nouveau du NetworkManager"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
-msgstr ""
-"Mettre NetworkManager en veille ou le réveiller (utile uniquement pour la "
-"gestion d'énergie du système)"
+msgstr "Mettre NetworkManager en veille ou le réveiller (utile uniquement pour la gestion d'énergie du système)"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:6
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
-msgstr ""
-"La politique du système empêche la mise en veille et le réveil de "
-"NetworkManager"
+msgstr "La politique du système empêche la mise en veille et le réveil de NetworkManager"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:7
 msgid "Enable or disable Wi-Fi devices"
@@ -13666,9 +12117,7 @@ msgstr "Activer ou désactiver des périphériques Wi-Fi"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling Wi-Fi devices"
-msgstr ""
-"La politique du système empêche l'activation ou la désactivation de "
-"périphériques Wi-Fi"
+msgstr "La politique du système empêche l'activation ou la désactivation de périphériques Wi-Fi"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable mobile broadband devices"
@@ -13676,9 +12125,7 @@ msgstr "Activer ou désactiver des périphériques mobiles à large bande"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:10
 msgid "System policy prevents enabling or disabling mobile broadband devices"
-msgstr ""
-"La politique du système empêche l'activation ou la désactivation de "
-"périphériques mobiles à large bande"
+msgstr "La politique du système empêche l'activation ou la désactivation de périphériques mobiles à large bande"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Enable or disable WiMAX mobile broadband devices"
@@ -13687,9 +12134,7 @@ msgstr "Activer ou désactiver des périphériques WiMAX à large bande"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:12
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
-msgstr ""
-"La politique du système empêche l'activation ou la désactivation de "
-"périphériques WiMAX à large bande"
+msgstr "La politique du système empêche l'activation ou la désactivation de périphériques WiMAX à large bande"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:13
 msgid "Allow control of network connections"
@@ -13714,9 +12159,7 @@ msgstr "Partage de connexion via un réseau Wi-Fi protégé"
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:18
 msgid ""
 "System policy prevents sharing connections via a protected Wi-Fi network"
-msgstr ""
-"La politique du système empêche tout partage des connexions via un réseau Wi-"
-"Fi protégé"
+msgstr "La politique du système empêche tout partage des connexions via un réseau Wi-Fi protégé"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:19
 msgid "Connection sharing via an open Wi-Fi network"
@@ -13724,9 +12167,7 @@ msgstr "Partage de connexion via un réseau Wi-Fi ouvert"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:20
 msgid "System policy prevents sharing connections via an open Wi-Fi network"
-msgstr ""
-"La politique du système empêche tout partage des connexions via un réseau Wi-"
-"Fi ouvert"
+msgstr "La politique du système empêche tout partage des connexions via un réseau Wi-Fi ouvert"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:21
 msgid "Modify personal network connections"
@@ -13734,9 +12175,7 @@ msgstr "Modifier les connexions du réseau personnel"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:22
 msgid "System policy prevents modification of personal network settings"
-msgstr ""
-"La politique du système empêche toute modification des paramètres réseau "
-"personnels"
+msgstr "La politique du système empêche toute modification des paramètres réseau personnels"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:23
 msgid "Modify network connections for all users"
@@ -13744,9 +12183,7 @@ msgstr "Modifier les connexions réseau pour tous les utilisateurs"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:24
 msgid "System policy prevents modification of network settings for all users"
-msgstr ""
-"La politique du système empêche toute modification des paramètres réseau "
-"pour tous les utilisateurs"
+msgstr "La politique du système empêche toute modification des paramètres réseau pour tous les utilisateurs"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:25
 msgid "Modify persistent system hostname"
@@ -13754,9 +12191,7 @@ msgstr "Modifier le nom d'hôte persistant du système"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:26
 msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"La politique du système empêche toute modification du nom d'hôte persistant "
-"du système"
+msgstr "La politique du système empêche toute modification du nom d'hôte persistant du système"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:27
 msgid "Modify persistent global DNS configuration"
@@ -13766,21 +12201,15 @@ msgstr "Modifier la configuration DNS globale persistante"
 msgid ""
 "System policy prevents modification of the persistent global DNS "
 "configuration"
-msgstr ""
-"La politique du système empêche toute modification de la configuration DNS "
-"globale persistante"
+msgstr "La politique du système empêche toute modification de la configuration DNS globale persistante"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:29
 msgid "Perform a checkpoint or rollback of interfaces configuration"
-msgstr ""
-"Faire un point de contrôle ou un retour en arrière de la configuration des "
-"interfaces"
+msgstr "Faire un point de contrôle ou un retour en arrière de la configuration des interfaces"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:30
 msgid "System policy prevents the creation of a checkpoint or its rollback"
-msgstr ""
-"La politique du système empêche la création d'un point de contrôle ou son "
-"annulation"
+msgstr "La politique du système empêche la création d'un point de contrôle ou son annulation"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:31
 msgid "Enable or disable device statistics"
@@ -13788,9 +12217,7 @@ msgstr "Activer ou désactiver les statistiques système du périphérique"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:32
 msgid "System policy prevents enabling or disabling device statistics"
-msgstr ""
-"La politique du système empêche l'activation ou la désactivation des "
-"statistiques système du périphérique"
+msgstr "La politique du système empêche l'activation ou la désactivation des statistiques système du périphérique"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:33
 msgid "Enable or disable connectivity checking"
@@ -13798,674 +12225,658 @@ msgstr "Activer ou désactiver le contrôle de connectivité"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:34
 msgid "System policy prevents enabling or disabling connectivity checking"
-msgstr ""
-"La politique système empêche d'activer ou de désactiver le contrôle de "
-"connectivité"
+msgstr "La politique système empêche d'activer ou de désactiver le contrôle de connectivité"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1500
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "classe d'objet « %s » n'a pas de propriété nommée « %s »"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1507
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "propriété « %s » de la classe d'objet « %s » n'est pas en écriture"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1514
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
-msgstr ""
-"propriété de construction « %s » de l'objet « %s » ne peut pas être définie "
-"après la construction"
+msgstr "propriété de construction « %s » de l'objet « %s » ne peut pas être définie après la construction"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1522
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
-msgstr ""
-"« %s::%s » n'est pas un nom de propriété valide ; « %s » n'est pas un sous-"
-"type de GObject"
+msgstr "« %s::%s » n'est pas un nom de propriété valide ; « %s » n'est pas un sous-type de GObject"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1531
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr ""
-"impossible de définir la propriété « %s » de type « %s » à partir de valeurs "
-"de type « %s »"
+msgstr "impossible de définir la propriété « %s » de type « %s » à partir de valeurs de type « %s »"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1542
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
-msgstr ""
-"valeur « %s » de type « %s » est non valide ou en dehors de la plage de "
-"valeurs pour la propriété « %s » de type « %s »"
+msgstr "valeur « %s » de type « %s » est non valide ou en dehors de la plage de valeurs pour la propriété « %s » de type « %s »"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
 #, c-format
 msgid "'%s' is not valid: properties should be specified as 'key=value'"
-msgstr ""
-"« %s » n'est pas valide : les propriétés doivent être spécifiées sous la "
-"forme key=value"
+msgstr "« %s » n'est pas valide : les propriétés doivent être spécifiées sous la forme key=value"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:251
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
 #, c-format
 msgid "'%s' is not a valid key"
 msgstr "« %s » n’est pas une clé valide"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:257
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:242
 #, c-format
 msgid "duplicate key '%s'"
 msgstr "clé dupliquée « %s »"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:271
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:256
 #, c-format
 msgid "number for '%s' is out of range"
 msgstr "le nombre « %s » est en dehors de la plage autorisée"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:274
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:259
 #, c-format
 msgid "value for '%s' must be a number"
 msgstr "« %s » n'est pas un numéro"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:285
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:270
 #, c-format
 msgid "value for '%s' must be a boolean"
 msgstr "« %s » n'est pas un boléen"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:294
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:279
 msgid "missing 'name' attribute"
 msgstr "attribut de « nom »  manquant"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:301
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:286
 #, c-format
 msgid "invalid 'name' \"%s\""
 msgstr "« nom » non valide « %s »"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:313
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:298
 #, c-format
 msgid "attribute '%s' is invalid for \"%s\""
-msgstr "attribut '%s' non pas valide pour « %s » "
+msgstr "attribut '%s' non pas valide pour « %s »"
 
 #. TRANSLATORS: the first %s is a prefix for the connection id, such
 #. * as "Wired Connection" or "VPN Connection". The %d is a number
 #. * that is combined with the first argument to create a unique
 #. * connection id.
-#: ../src/NetworkManagerUtils.c:121
+#: ../src/NetworkManagerUtils.c:107
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %u"
 msgstr "%s %u"
 
-#: ../src/main.c:176 ../src/main.c:341
+#: ../src/main.c:163 ../src/main.c:335
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "Échec de la lecture de la configuration : %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:190 ../src/nm-iface-helper.c:292
+#: ../src/main.c:184 ../src/nm-iface-helper.c:295
 msgid "Print NetworkManager version and exit"
 msgstr "Imprimer la version de NetworkManager et quitter"
 
-#: ../src/main.c:191 ../src/nm-iface-helper.c:293
+#: ../src/main.c:185 ../src/nm-iface-helper.c:296
 msgid "Don't become a daemon"
 msgstr "Ne pas devenir un démon"
 
-#: ../src/main.c:192 ../src/nm-iface-helper.c:295
+#: ../src/main.c:186 ../src/nm-iface-helper.c:298
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Niveau du journal : un de [%s]"
 
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:188 ../src/nm-iface-helper.c:300
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
-msgstr ""
-"Domaine de journalisation séparés par des virgules « , » : toute combinaison "
-"de [%s]"
+msgstr "Domaine de journalisation séparés par des virgules « , » : toute combinaison de [%s]"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:299
+#: ../src/main.c:190 ../src/nm-iface-helper.c:302
 msgid "Make all warnings fatal"
 msgstr "Rendre tous les avertissements fatals"
 
-#: ../src/main.c:197
+#: ../src/main.c:191
 msgid "Specify the location of a PID file"
 msgstr "Spécifier l'emplacement d'un fichier PID"
 
-#: ../src/main.c:199
+#: ../src/main.c:193
 msgid "Print NetworkManager configuration and exit"
 msgstr "Imprimer la configuration de NetworkManager et quitter"
 
-#: ../src/main.c:209
+#: ../src/main.c:203
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
 "specify wireless access points which wireless cards in the computer\n"
 "should associate with."
-msgstr ""
-"NetworkManager contrôle toutes les connexions réseau et choisit "
-"automatiquement\n"
-"la meilleure connexion à utiliser. NetworkManager permet aussi à "
-"l'utilisateur\n"
-"de spécifier des points d'accès sans fil avec lesquels les cartes sans fil "
-"de\n"
+msgstr "NetworkManager contrôle toutes les connexions réseau et choisit automatiquement\n"
+"la meilleure connexion à utiliser. NetworkManager permet aussi à l'utilisateur\n"
+"de spécifier des points d'accès sans fil avec lesquels les cartes sans fil de\n"
 "l'ordinateur devraient s'associer."
 
-#: ../src/main.c:331 ../src/main-utils.c:289 ../src/nm-iface-helper.c:440
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Utilisez --help pour afficher une liste d'options valides.\n"
 
-#: ../src/main.c:364 ../src/nm-iface-helper.c:453
+#: ../src/main.c:358 ../src/nm-iface-helper.c:456
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "Impossible de démoniser : %s [error %u]\n"
 
-#: ../src/main-utils.c:99
+#: ../src/main-utils.c:85
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "Échec de l'ouverture de  %s : %s\n"
 
-#: ../src/main-utils.c:106
+#: ../src/main-utils.c:92
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "Échec de l'écriture sur %s : %s\n"
 
-#: ../src/main-utils.c:112
+#: ../src/main-utils.c:98
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "Échec de la fermeture de %s : %s\n"
 
-#: ../src/main-utils.c:151 ../src/main-utils.c:162
+#: ../src/main-utils.c:137 ../src/main-utils.c:148
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "Impossible de créer « %s » : %s"
 
-#: ../src/main-utils.c:215
+#: ../src/main-utils.c:201
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s est déjà en cours d'exécution (pid %ld)\n"
 
-#: ../src/main-utils.c:225
+#: ../src/main-utils.c:211
 #, c-format
 msgid "You must be root to run %s!\n"
-msgstr ""
-"Vous devez être connecté en tant que super-utilisateur pour exécuter %s !\n"
+msgstr "Vous devez être connecté en tant que super-utilisateur pour exécuter %s !\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:301
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:303
 msgid "# Created by NetworkManager\n"
 msgstr "# Créé par NetworkManager\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:312
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
 #, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
 "\n"
 msgstr "# Fusionné depuis %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:209
+#: ../src/devices/bluetooth/nm-bluez-manager.c:1341
 #, c-format
 msgid "%s Network"
 msgstr "Réseau %s"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:271
+#: ../src/devices/bluetooth/nm-device-bt.c:298
 msgid "PAN requested, but Bluetooth device does not support NAP"
-msgstr ""
-"PAN exigé, sauf que le périphérique Bletooth ne prend pas NAP en charge"
+msgstr "PAN exigé, sauf que le périphérique Bletooth ne prend pas NAP en charge"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:281
+#: ../src/devices/bluetooth/nm-device-bt.c:311
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
-msgstr ""
-"Les connexions PAN ne peuvent pas spécifier les configurations en série, "
-"GSM, ou CDMA."
+msgstr "Les connexions PAN ne peuvent pas spécifier les configurations en série, GSM, ou CDMA."
 
-#: ../src/devices/bluetooth/nm-device-bt.c:294
+#: ../src/devices/bluetooth/nm-device-bt.c:324
 msgid "PAN connection"
 msgstr "Connexion PAN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:301
+#: ../src/devices/bluetooth/nm-device-bt.c:331
 msgid "DUN requested, but Bluetooth device does not support DUN"
-msgstr ""
-"DUN exigé, sauf que le périphérique Bletooth ne prend pas DUN en charge"
+msgstr "DUN exigé, sauf que le périphérique Bletooth ne prend pas DUN en charge"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:311
+#: ../src/devices/bluetooth/nm-device-bt.c:342
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "La connexion DUN doit inclure une configuration GSM ou CDMA"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:321
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:352
+#: ../src/devices/wwan/nm-modem-broadband.c:784
 msgid "GSM connection"
 msgstr "Connexion GSM"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:323
-#: ../src/devices/wwan/nm-modem-broadband.c:730
+#: ../src/devices/bluetooth/nm-device-bt.c:354
+#: ../src/devices/wwan/nm-modem-broadband.c:809
 msgid "CDMA connection"
 msgstr "Connexion CDMA"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:331
+#: ../src/devices/bluetooth/nm-device-bt.c:362
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "Type de connexion Bluetooth inconnu/non supporté"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:353
+#: ../src/devices/bluetooth/nm-device-bt.c:384
 msgid "connection does not match device"
 msgstr "la connexion ne correspond pas au périphérique"
 
-#: ../src/devices/nm-device-6lowpan.c:191
+#: ../src/devices/nm-device-6lowpan.c:177
 msgid "6LOWPAN connection"
 msgstr "Connexion 6LOWPAN"
 
-#: ../src/devices/nm-device-bond.c:70
+#: ../src/devices/nm-device-bond.c:56
 msgid "Bond connection"
 msgstr "Connexion de liaison"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:147
 msgid "Bridge connection"
 msgstr "Connexion de pont"
 
-#: ../src/devices/nm-device-dummy.c:66
+#: ../src/devices/nm-device-dummy.c:58
 msgid "Dummy connection"
 msgstr "Connexion factice"
 
-#: ../src/devices/nm-device-ethernet.c:1415
+#: ../src/devices/nm-device-ethernet.c:1506
 msgid "PPPoE connection"
 msgstr "Connexion PPPoE"
 
-#: ../src/devices/nm-device-ethernet.c:1415
+#: ../src/devices/nm-device-ethernet.c:1506
 msgid "Wired connection"
 msgstr "Connexion filaire"
 
-#: ../src/devices/nm-device-ethernet-utils.c:32
+#: ../src/devices/nm-device-ethernet-utils.c:20
 #, c-format
 msgid "Wired connection %d"
 msgstr "Connexion filaire %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:421
+#: ../src/devices/nm-device-ip-tunnel.c:407
 msgid "IP tunnel connection"
 msgstr "Connexion de tunnel IP"
 
-#: ../src/devices/nm-device-macvlan.c:364
+#: ../src/devices/nm-device-macvlan.c:365
 msgid "MACVLAN connection"
 msgstr "Connexion MACVLAN"
 
-#: ../src/devices/nm-device-tun.c:156
+#: ../src/devices/nm-device-tun.c:142
 msgid "TUN connection"
 msgstr "Connexion TUN"
 
-#: ../src/devices/nm-device-wpan.c:68
+#: ../src/devices/nm-device-wpan.c:54
 msgid "WPAN connection"
 msgstr "Connexion WPAN"
 
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:87
 msgid "Team connection"
 msgstr "Connexion Team"
 
-#: ../src/devices/wifi/nm-device-wifi.c:964
-msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr "WPA Ad-Hoc désactivé pour cause de bogues dans le noyau"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:42
+#: ../src/devices/wifi/nm-wifi-utils.c:28
 #, c-format
 msgid "%s is incompatible with static WEP keys"
 msgstr "%s incompatible avec clés statiques WEP"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:76
+#: ../src/devices/wifi/nm-wifi-utils.c:62
 msgid "LEAP authentication requires a LEAP username"
 msgstr "L'authentification LEP requiert un nom d'utilisateur LEAP"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:86
+#: ../src/devices/wifi/nm-wifi-utils.c:72
 msgid "LEAP username requires 'leap' authentication"
 msgstr "Le nom d'utilisateur LEAP requiert une authentification LEAP"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:99
+#: ../src/devices/wifi/nm-wifi-utils.c:85
 msgid "LEAP authentication requires IEEE 802.1x key management"
 msgstr "L'authentification LEAP requiert un gestion de clès IEEE 802.1x"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:119
+#: ../src/devices/wifi/nm-wifi-utils.c:105
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
 msgstr "L'authentification LEAP est incompatible avec le mode Ad_Hoc"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:131
+#: ../src/devices/wifi/nm-wifi-utils.c:117
 msgid "LEAP authentication is incompatible with 802.1x setting"
 msgstr "L'authentification LEAP est incompatible avec la configuration 802.1x"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:153
+#: ../src/devices/wifi/nm-wifi-utils.c:139
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
-msgstr ""
-"une connexion utilisant l'authentification « %s » ne peut pas utiliser une "
-"gestion de clés WPA"
+msgstr "une connexion utilisant l'authentification « %s » ne peut pas utiliser une gestion de clés WPA"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:164
+#: ../src/devices/wifi/nm-wifi-utils.c:150
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
-msgstr ""
-"une connexion qui utilise une authentification « %s » ne peut pas spécifier "
-"de protocoles WPA"
+msgstr "une connexion qui utilise une authentification « %s » ne peut pas spécifier de protocoles WPA"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:180
-#: ../src/devices/wifi/nm-wifi-utils.c:197
+#: ../src/devices/wifi/nm-wifi-utils.c:166
+#: ../src/devices/wifi/nm-wifi-utils.c:183
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr ""
-"une connexion utilisant l'authentification « %s » ne peut pas spécifier de "
-"chiffrement WPA"
+msgstr "une connexion utilisant l'authentification « %s » ne peut pas spécifier de chiffrement WPA"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:209
+#: ../src/devices/wifi/nm-wifi-utils.c:195
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
-msgstr ""
-"une connexion qui utilise une authentification « %s » ne peut pas indiquer "
-"un mot de passe WPA"
+msgstr "une connexion qui utilise une authentification « %s » ne peut pas indiquer un mot de passe WPA"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:240
+#: ../src/devices/wifi/nm-wifi-utils.c:226
 msgid "Dynamic WEP requires an 802.1x setting"
 msgstr "WEP Dynamique requiert une configuration 802.1x"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:250
-#: ../src/devices/wifi/nm-wifi-utils.c:278
+#: ../src/devices/wifi/nm-wifi-utils.c:236
+#: ../src/devices/wifi/nm-wifi-utils.c:264
 msgid "Dynamic WEP requires 'open' authentication"
 msgstr "WEP Dynamique requiert une authentification « open »"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:265
+#: ../src/devices/wifi/nm-wifi-utils.c:251
 msgid "Dynamic WEP requires 'ieee8021x' key management"
 msgstr "WEP Dynamique requiert une gestion de clés « ieee802x »"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:312
+#: ../src/devices/wifi/nm-wifi-utils.c:298
 msgid "WPA-PSK authentication is incompatible with 802.1x"
 msgstr "L'authentification WPA-PSK est incompatible avec 802.1x"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:322
+#: ../src/devices/wifi/nm-wifi-utils.c:308
 msgid "WPA-PSK requires 'open' authentication"
 msgstr "Authentification « open » exige WPA-PSK"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:334
-msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr "L'authentification WPA Ad-Hoc requiert un AP mode Ad-Hoc"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:347
-msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "L'authentification WPA Ad-Hoc requiert un protocole « wpa »"
+#: ../src/devices/wifi/nm-wifi-utils.c:320
+msgid "Access point does not support PSK but setting requires it"
+msgstr "Le point d'accès ne supporte pas PSK mais la configuration l'exige"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:359
-msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr ""
-"L'authentification WPA Ad-Hoc requiert un chiffrement « none » pairwise"
+#: ../src/devices/wifi/nm-wifi-utils.c:333
+msgid "WPA Ad-Hoc authentication requires 'rsn' protocol"
+msgstr "L'authentification WPA Ad-Hoc requiert le protocole 'rsn'"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:371
-msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "WPA Ad-Hoc requiert un chiffrement de groupe « tkip »"
+#: ../src/devices/wifi/nm-wifi-utils.c:344
+msgid "WPA Ad-Hoc authentication requires 'ccmp' pairwise cipher"
+msgstr "L'authentification WPA Ad-Hoc nécessite un chiffrement par paire 'ccmp'"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:385
-msgid "Access point does not support PSK but setting requires it"
-msgstr "Le point d'accès ne supporte pas PSK mais la configuration l'exige"
+#: ../src/devices/wifi/nm-wifi-utils.c:355
+msgid "WPA Ad-Hoc requires 'ccmp' group cipher"
+msgstr "WPA Ad-Hoc exige le chiffrement de groupe 'ccmp'"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:415
+#: ../src/devices/wifi/nm-wifi-utils.c:384
 msgid "WPA-EAP authentication requires an 802.1x setting"
 msgstr "L'authentification WPA-EAP requiert une configuration 802.1x"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:425
+#: ../src/devices/wifi/nm-wifi-utils.c:394
 msgid "WPA-EAP requires 'open' authentication"
 msgstr "WPA-EAP requiert une authentification « open »"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:436
+#: ../src/devices/wifi/nm-wifi-utils.c:405
 msgid "802.1x setting requires 'wpa-eap' key management"
 msgstr "La configuration 802.1x requiert une gestion de clé « wpa-eap »"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:449
+#: ../src/devices/wifi/nm-wifi-utils.c:418
 msgid "Access point does not support 802.1x but setting requires it"
-msgstr ""
-"Le point d'accès ne prend pas 802.1x en charge mais la configuration l'exige"
+msgstr "Le point d'accès ne prend pas 802.1x en charge mais la configuration l'exige"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:477
-msgid ""
-"Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr ""
-"Le mode de point d'accès est Ad-Hoc mais la configuration exige une sécurité "
-"Infrastructure"
+#: ../src/devices/wifi/nm-wifi-utils.c:448
+msgid "Ad-Hoc mode requires 'none' or 'wpa-psk' key management"
+msgstr "Le mode ad-hoc nécessite une gestion de clé 'none' ou 'wpa-psk'"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:487
+#: ../src/devices/wifi/nm-wifi-utils.c:458
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
 msgstr "Le mode Ad-Hoc n'est pas compatible avec la sécurité 802.1x"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:496
+#: ../src/devices/wifi/nm-wifi-utils.c:467
 msgid "Ad-Hoc mode is incompatible with LEAP security"
 msgstr "Le mode Ad-Hoc n'est pas compatible avec la sécurité LEAP"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:506
+#: ../src/devices/wifi/nm-wifi-utils.c:477
 msgid "Ad-Hoc mode requires 'open' authentication"
 msgstr "Le mode Ad-Hoc requiert une authentification « open »"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:516
-msgid ""
-"Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr ""
-"Le mode de point d'accès est Infrastructure mais la configuration exige une "
-"sécurité Ad-Hoc"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:559
-#: ../src/devices/wifi/nm-wifi-utils.c:591
+#: ../src/devices/wifi/nm-wifi-utils.c:519
+#: ../src/devices/wifi/nm-wifi-utils.c:551
 #, c-format
 msgid "connection does not match access point"
 msgstr "la connexion ne correspond pas au point d'acccès"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:645
+#: ../src/devices/wifi/nm-wifi-utils.c:605
 #, c-format
 msgid "connection does not match mesh point"
 msgstr "la connexion ne correspond pas au point mesh"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:662
+#: ../src/devices/wifi/nm-wifi-utils.c:622
 msgid "Access point is unencrypted but setting specifies security"
-msgstr ""
-"Le point d'accès est encrypté mais la configuration spécifie la sécurité"
+msgstr "Le point d'accès est encrypté mais la configuration spécifie la sécurité"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:751
+#: ../src/devices/wifi/nm-wifi-utils.c:711
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
-msgstr ""
-"L'authentification WPA n'est pas compatible avec un LEAP non-EAP (original) "
-"ou une WEP Dynamique"
+msgstr "L'authentification WPA n'est pas compatible avec un LEAP non-EAP (original) ou une WEP Dynamique"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:761
+#: ../src/devices/wifi/nm-wifi-utils.c:721
 msgid "WPA authentication is incompatible with Shared Key authentication"
-msgstr ""
-"L'authentification WPA n'est pas compatible avec l'authentification de clés "
-"partagées"
+msgstr "L'authentification WPA n'est pas compatible avec l'authentification de clés partagées"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:814
+#: ../src/devices/wifi/nm-wifi-utils.c:776
 msgid "Failed to determine AP security information"
 msgstr "N'a pas pu déterminer les informations de sécurité AP"
 
-#: ../src/nm-config.c:580
+#: ../src/nm-config.c:572
 #, c-format
 msgid "Bad '%s' option: "
-msgstr "Option « %s » erronée :"
+msgstr "Option « %s » erronée : "
 
-#: ../src/nm-config.c:593
+#: ../src/nm-config.c:585
 msgid "Config file location"
 msgstr "Emplacement du fichier de configuration"
 
-#: ../src/nm-config.c:594
+#: ../src/nm-config.c:586
 msgid "Config directory location"
 msgstr "Emplacement du répertoire de configuration"
 
-#: ../src/nm-config.c:595
+#: ../src/nm-config.c:587
 msgid "System config directory location"
 msgstr "Emplacement du répertoire de configuration système"
 
-#: ../src/nm-config.c:596
+#: ../src/nm-config.c:588
 msgid "Internal config file location"
 msgstr "Emplacement du fichier de configuration interne"
 
-#: ../src/nm-config.c:597
+#: ../src/nm-config.c:589
 msgid "State file location"
 msgstr "Indiquez l'emplacement du fichier"
 
-#: ../src/nm-config.c:598
+#: ../src/nm-config.c:590
 msgid "State file for no-auto-default devices"
 msgstr "Indiquer le fichier pour périphériques non-auto-par défaut"
 
-#: ../src/nm-config.c:599
+#: ../src/nm-config.c:591
 msgid "List of plugins separated by ','"
 msgstr "Liste des greffons séparée par des virgules « , »"
 
-#: ../src/nm-config.c:600
+#: ../src/nm-config.c:592
 msgid "Quit after initial configuration"
 msgstr "Sortie après la configuration initiale"
 
-#: ../src/nm-config.c:601 ../src/nm-iface-helper.c:294
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
 msgid "Don't become a daemon, and log to stderr"
 msgstr "Ne pas devenir un démon, et se connecter à stderr"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:604
+#: ../src/nm-config.c:596
 msgid "An http(s) address for checking internet connectivity"
 msgstr "Adresse http(s) pour vérifier la connectivité internet"
 
-#: ../src/nm-config.c:605
+#: ../src/nm-config.c:597
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "Intervalle entre les vérifications de connectivité (en secondes)"
 
-#: ../src/nm-config.c:606
+#: ../src/nm-config.c:598
 msgid "The expected start of the response"
 msgstr "Début prévu de la réponse"
 
-#: ../src/nm-config.c:613
+#: ../src/nm-config.c:605
 msgid "NetworkManager options"
 msgstr "Options NetworkManager"
 
-#: ../src/nm-config.c:613
+#: ../src/nm-config.c:605
 msgid "Show NetworkManager options"
 msgstr "Afficher options NetworkManager"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:274
+#: ../src/nm-iface-helper.c:277
 msgid "The interface to manage"
 msgstr "L'interface à gérer"
 
-#: ../src/nm-iface-helper.c:275
+#: ../src/nm-iface-helper.c:278
 msgid "Connection UUID"
 msgstr "Connexion UUID"
 
-#: ../src/nm-iface-helper.c:276
+#: ../src/nm-iface-helper.c:279
 msgid "Connection Token for Stable IDs"
 msgstr "Jeton de connexion pour les ID stables"
 
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:280
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "Indique si on doit gérer IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:281
 msgid "Whether SLAAC must be successful"
 msgstr "Indique si SLAAC doit avoir réussi"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:282
 msgid "Use an IPv6 temporary privacy address"
 msgstr "Utiliser une adresse privée temporaire d'IPv6"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:283
 msgid "Current DHCPv4 address"
 msgstr "Adresse DHCPv4 actuelle"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:284
 msgid "Whether DHCPv4 must be successful"
 msgstr "Indique si DHCPv4 doit avoir réussi"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:285
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "Identifiant de client DHCPv4 encodé en hexadécimal"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:286
 msgid "Hostname to send to DHCP server"
 msgstr "Nom d'hôte à envoyer au serveur DHCP"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:286
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:287
 msgid "FQDN to send to DHCP server"
 msgstr "FQDN à envoyer au serveur DHCP"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:287
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:288
 msgid "Route priority for IPv4"
 msgstr "Priorité de route pour IPv4"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:288
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:289
 msgid "Route priority for IPv6"
 msgstr "Priorité de route pour IPv6"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:289
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:290
 msgid "Hex-encoded Interface Identifier"
 msgstr "Identifiant d'interface encodé en hexadécimal"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:291
 msgid "IPv6 SLAAC address generation mode"
 msgstr "Mode de génération d'adresses IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:292
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
-msgstr ""
-"La valeur de configuration du backend de journalisation. Voir logging."
-"backend dans NetworkManager.conf"
+msgstr "La valeur de configuration du backend de journalisation. Voir logging.backend dans NetworkManager.conf"
 
-#: ../src/nm-iface-helper.c:309
+#: ../src/nm-iface-helper.c:312
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
-msgstr ""
-"nm-iface-helper est un petit processus autonome qui gère une interface de "
-"réseau unique."
+msgstr "nm-iface-helper est un petit processus autonome qui gère une interface de réseau unique."
 
-#: ../src/nm-iface-helper.c:420
+#: ../src/nm-iface-helper.c:423
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "UUID et Nom d'interface obligatoires\n"
 
-#: ../src/nm-iface-helper.c:427
+#: ../src/nm-iface-helper.c:430
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "N'a pas pu trouver l'index d'interface pour %s (%s)\n"
 
-#: ../src/nm-iface-helper.c:445
+#: ../src/nm-iface-helper.c:448
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
-msgstr ""
-"Ignore le(s) domaine(s) de journalisation non reconnus « %s » sur la ligne "
-"de commande.\n"
+msgstr "Ignore le(s) domaine(s) de journalisation non reconnus « %s » sur la ligne de commande.\n"
 
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:489
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): IID non valide %s\n"
 
-#: ../src/nm-iface-helper.c:497
+#: ../src/nm-iface-helper.c:500
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s) : id-client DHCP non valide %s\n"
-"\n"
 
-#: ../src/nm-logging.c:298
+#: ../src/nm-logging.c:253
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Niveau de journalisation « %s » inconnu"
 
-#: ../src/nm-logging.c:408
+#: ../src/nm-logging.c:363
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Domaine de journalisation « %s » inconnu"
+
+#~ msgid "Unknown parameter: %s\n"
+#~ msgstr "Paramètre inconnu : %s\n"
+
+#~ msgid "Unknown parameter: %s"
+#~ msgstr "Paramètre inconnu : %s"
+
+#~ msgid "Error: Device activation failed: device was disconnected"
+#~ msgstr ""
+#~ "Erreur : l'activation du périphérique a échoué : le périphérique a été "
+#~ "disconnecté"
+
+#~ msgid "Error: Unknown parameter %s."
+#~ msgstr "Erreur : paramètre inconnu : %s."
+
+#~ msgid "%d. route cannot be a default route"
+#~ msgstr "%d. La route ne peut pas être une route par défaut"
+
+#~ msgid "'%s' connections require '%s' in this property"
+#~ msgstr ""
+#~ "les connexions « %s » requièrent que « %s » soit dans cette propriété"
+
+#~ msgid "The connection was not a WiMAX connection."
+#~ msgstr "La connexion n'était pas une connexion WiMAX."
+
+#~ msgid "Checkpoint was removed before it was initialized"
+#~ msgstr "Point de contrôle supprimé avant l'initialisation"
+
+#~ msgid "Active connection removed before it was initialized"
+#~ msgstr "La connexion active a été supprimée avant d'être initialisée"
+
+#~ msgid "Connection removed before it was initialized"
+#~ msgstr "La connexion a été supprimée avant d'être initialisée"
+
+#~ msgid "WPA Ad-Hoc disabled due to kernel bugs"
+#~ msgstr "WPA Ad-Hoc désactivé pour cause de bogues dans le noyau"
+
+#~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
+#~ msgstr "L'authentification WPA Ad-Hoc requiert un AP mode Ad-Hoc"
+
+#~ msgid ""
+#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
+#~ msgstr ""
+#~ "Le mode de point d'accès est Ad-Hoc mais la configuration exige une "
+#~ "sécurité Infrastructure"
+
diff --git a/po/ja.po b/po/ja.po
index facd3259..05693479 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,32 +11,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-31 17:50+0200\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-12-23 18:47+0100\n"
 "PO-Revision-Date: 2019-08-15 04:44+0000\n"
 "Last-Translator: kemorigu <kemorigu@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../clients/cli/agent.c:39
+#: ../clients/cli/agent.c:23
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
 "\n"
 "COMMAND := { secret | polkit | all }\n"
 "\n"
-msgstr ""
-"使�方: nmcli agent { COMMAND | help }\n"
+msgstr "使�方: nmcli agent { COMMAND | help }\n"
 "\n"
 "コマンド := { secret | polkit | all }\n"
 "\n"
-"\n"
 
-#: ../clients/cli/agent.c:47
+#: ../clients/cli/agent.c:31
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -46,15 +44,12 @@ msgid ""
 "running\n"
 "and if a password is required asks the user for it.\n"
 "\n"
-msgstr ""
-"使�方: nmcli agent secret { help }\n"
+msgstr "使�方: nmcli agent secret { help }\n"
 "\n"
-"nmcli を NetworkManager シークレットエージェント���実行���。NetworkManager "
-"�パスワードを必���る場���登録��エージェント�パスワードを尋���。��コマンド�より�nmcli "
-"�引�続�実行��パスワード�必��場��パスワード入力�求�られ��。\n"
+"nmcli を NetworkManager シークレットエージェント���実行���。NetworkManager �パスワードを必���る場���登録��エージェント�パスワードを尋���。��コマンド�より�nmcli �引�続�実行��パスワード�必��場��パスワード入力�求�られ��。\n"
 "\n"
 
-#: ../clients/cli/agent.c:57
+#: ../clients/cli/agent.c:41
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -64,208 +59,213 @@ msgid ""
 "gives\n"
 "the response back to polkit.\n"
 "\n"
-msgstr ""
-"使�方: nmcli agent polkit { help }\n"
+msgstr "使�方: nmcli agent polkit { help }\n"
 "\n"
 "nmcli を�ユーザーセッション� polkit アクション���登録���。\n"
 "polkit デーモン�承�を必���る場���nmcli �ら承�を求�られ���応答を polkit �返���。\n"
 "\n"
 
-#: ../clients/cli/agent.c:67
+#: ../clients/cli/agent.c:51
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
 "\n"
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
-msgstr ""
-"使�方: nmcli agent all { help }\n"
+msgstr "使�方: nmcli agent all { help }\n"
 "\n"
 "nmcli を NetworkManager シークレット� polkit エージェント���実行���。\n"
 "\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:143
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr "nmcli � NetworkManager �シークレットエージェント����切�登録�れ���。\n"
 
-#: ../clients/cli/agent.c:161
+#: ../clients/cli/agent.c:145
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "エラー: シークレットエージェント��期化�失敗����"
 
-#: ../clients/cli/agent.c:180
+#: ../clients/cli/agent.c:164
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "エラー: polkit エージェント��期化�失敗����: %s"
 
-#: ../clients/cli/agent.c:188
+#: ../clients/cli/agent.c:172
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli � polkit エージェント����切�登録�れ���。\n"
 
-#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
-#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
-#: ../clients/cli/connections.c:1503
+#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
+#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
+#: ../clients/cli/connections.c:1495
 msgid "GROUP"
 msgstr "グループ"
 
-#: ../clients/cli/common.c:644
+#: ../clients/cli/common.c:628
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "エラー: openconnect �失敗����: %s\n"
 
-#: ../clients/cli/common.c:651
+#: ../clients/cli/common.c:635
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "エラー: openconnect �ステータス %d �失敗����\n"
 
-#: ../clients/cli/common.c:653
+#: ../clients/cli/common.c:637
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "エラー: openconnect �シグナル %d �失敗����\n"
 
-#: ../clients/cli/common.c:741
+#: ../clients/cli/common.c:725
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
 "without '--ask' option.\n"
-msgstr ""
-"警告: '%s' �パスワード� 'passwd-file' ��供�れ����ん。nmcli � '--ask' "
-"オプション����尋�る�������ん。\n"
+msgstr "警告: '%s' �パスワード� 'passwd-file' ��供�れ����ん。nmcli � '--ask' オプション����尋�る�������ん。\n"
 
-#: ../clients/cli/common.c:1241
+#: ../clients/cli/common.c:1227
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "エラー: NMClient オブジェクトを作�����ん���: %s。"
 
-#: ../clients/cli/common.c:1261
+#: ../clients/cli/common.c:1246
 msgid "Error: NetworkManager is not running."
 msgstr "エラー: NetworkManager �起動�����ん。"
 
-#: ../clients/cli/common.c:1357
+#: ../clients/cli/common.c:1339
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "エラー: 引数 '%s' ��識�れ��ん。代�り� --help を渡������。"
 
-#: ../clients/cli/common.c:1367
+#: ../clients/cli/common.c:1347
 msgid "Error: missing argument. Try passing --help."
 msgstr "エラー: 引数��り��ん。--help を渡������。"
 
-#: ../clients/cli/common.c:1436
+#: ../clients/cli/common.c:1414
 msgid "access denied"
 msgstr "アクセス�拒��れ���"
 
-#: ../clients/cli/common.c:1444 ../clients/cli/connections.c:80
-#: ../clients/cli/connections.c:89 ../clients/cli/devices.c:438
-#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:537
-#: ../clients/cli/general.c:40 ../clients/cli/general.c:130
-#: ../clients/cli/general.c:135 ../clients/common/nm-client-utils.c:264
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:281
-#: ../clients/common/nm-client-utils.c:286
-#: ../clients/common/nm-meta-setting-desc.c:1711
-#: ../clients/common/nm-meta-setting-desc.c:1742
-#: ../clients/common/nm-meta-setting-desc.c:2674
-#: ../clients/common/nm-meta-setting-desc.c:2732
+#: ../clients/cli/common.c:1416
+msgid "NetworkManager is not running"
+msgstr "NetworkManager �実行�����ん"
+
+#: ../clients/cli/common.c:1442
+#, c-format
+msgid "Error: error connecting to system bus: %s"
+msgstr "エラー: システム�ス��接続エラー: %s"
+
+#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
+#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
+#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
+#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
+#: ../clients/common/nm-client-utils.c:263
+#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-meta-setting-desc.c:1724
+#: ../clients/common/nm-meta-setting-desc.c:1755
+#: ../clients/common/nm-meta-setting-desc.c:2687
+#: ../clients/common/nm-meta-setting-desc.c:2745
 msgid "unknown"
 msgstr "�明"
 
-#: ../clients/cli/common.c:1445
+#: ../clients/cli/common.c:1469
 msgid "none"
 msgstr "��"
 
-#: ../clients/cli/common.c:1446
+#: ../clients/cli/common.c:1470
 msgid "portal"
 msgstr "�ータル"
 
-#: ../clients/cli/common.c:1447
+#: ../clients/cli/common.c:1471
 msgid "limited"
 msgstr "制�付�"
 
-#: ../clients/cli/common.c:1448
+#: ../clients/cli/common.c:1472
 msgid "full"
 msgstr "完全"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:64
+#: ../clients/cli/connections.c:50
 msgid "Setting name? "
 msgstr "設定��? "
 
-#: ../clients/cli/connections.c:65
+#: ../clients/cli/connections.c:51
 msgid "Property name? "
 msgstr "プロパティー��? "
 
-#: ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:52
 msgid "Enter connection type: "
 msgstr "接続タイプを入力������: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:56
 msgid "Connection (name, UUID, or path): "
 msgstr "接続 (���UUID ���パス): "
 
-#: ../clients/cli/connections.c:71
+#: ../clients/cli/connections.c:57
 msgid "VPN connection (name, UUID, or path): "
 msgstr "VPN 接続 (���UUID ���パス): "
 
-#: ../clients/cli/connections.c:72
+#: ../clients/cli/connections.c:58
 msgid "Connection(s) (name, UUID, or path): "
 msgstr "接続 (���UUID ���パス): "
 
-#: ../clients/cli/connections.c:73
+#: ../clients/cli/connections.c:59
 msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "接続 (���UUID�パス ��� apath): "
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:67
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:68
 msgid "activated"
 msgstr "アクティベート済�"
 
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:275
+#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
 msgid "deactivating"
 msgstr "�止中"
 
-#: ../clients/cli/connections.c:84
+#: ../clients/cli/connections.c:70
 msgid "deactivated"
 msgstr "�止����"
 
-#: ../clients/cli/connections.c:90
+#: ../clients/cli/connections.c:76
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続（準備）"
 
-#: ../clients/cli/connections.c:91
+#: ../clients/cli/connections.c:77
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続（�証�必�）"
 
-#: ../clients/cli/connections.c:92
+#: ../clients/cli/connections.c:78
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../clients/cli/connections.c:93
+#: ../clients/cli/connections.c:79
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続（IP 設定を�得）"
 
-#: ../clients/cli/connections.c:94
+#: ../clients/cli/connections.c:80
 msgid "VPN connected"
 msgstr "VPN 接続済�"
 
-#: ../clients/cli/connections.c:95
+#: ../clients/cli/connections.c:81
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../clients/cli/connections.c:96
+#: ../clients/cli/connections.c:82
 msgid "VPN disconnected"
 msgstr "VPN 切断済�"
 
-#: ../clients/cli/connections.c:558
+#: ../clients/cli/connections.c:544
 msgid "never"
 msgstr "���"
 
-#: ../clients/cli/connections.c:911
+#: ../clients/cli/connections.c:904
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -281,8 +281,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -304,25 +304,20 @@ msgid ""
 "\n"
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection { コマンド | help }\n"
+msgstr "使�方: nmcli connection { コマンド | help }\n"
 "\n"
-"コマンド := { show | up | down | add | modify | clone | edit | delete | monitor "
-"| reload | load | import | export }\n"
+"コマンド := { show | up | down | add | modify | clone | edit | delete | monitor | reload | load | import | export }\n"
 "\n"
 "  show [--active] [--order <order spec>]\n"
 "  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
-"<file with passwords>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file <file with passwords>]\n"
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
-"<value>)+\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
 "  clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
 "\n"
@@ -342,7 +337,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:926
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -367,8 +362,7 @@ msgid ""
 "When --active option is specified, only the active profiles are taken into\n"
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
-msgstr ""
-"使�方: nmcli connection show { 引数 | help }\n"
+msgstr "使�方: nmcli connection show { 引数 | help }\n"
 "\n"
 "引数 := [--active] [--order <order spec>]\n"
 "\n"
@@ -384,7 +378,7 @@ msgstr ""
 "����。--active オプションを指定�る��アクティブ�プロファイル���考慮�れ��。\n"
 "関連�るシークレットも表示�る場���グロー�ル� --show-secrets オプションを使用���。\n"
 
-#: ../clients/cli/connections.c:954
+#: ../clients/cli/connections.c:947
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -407,17 +401,14 @@ msgid ""
 "nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection up { 引数 | help }\n"
+msgstr "使�方: nmcli connection up { 引数 | help }\n"
 "\n"
-"引数 := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>] "
-"[passwd-file <file with passwords>]\n"
+"引数 := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp <name>] [passwd-file <file with passwords>]\n"
 "\n"
 "デ�イス上�接続をアクティブ����。アクティブ��るプロファイル�\n"
 "���UUID���� D-Bus �識別���。\n"
 "\n"
-"引数 := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file with "
-"passwords>]\n"
+"引数 := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file with passwords>]\n"
 "\n"
 "接続を使��デ�イスをアクティブ����。接続プロファイル� \n"
 "NetworkManager �より自動的��択�れ��。\n"
@@ -428,7 +419,7 @@ msgstr ""
 "passwd-file - 接続をアクティブ��る��必��パスワードを�むファイル\n"
 "\n"
 
-#: ../clients/cli/connections.c:975
+#: ../clients/cli/connections.c:968
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -440,8 +431,7 @@ msgid ""
 "name,\n"
 "UUID or D-Bus path.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection down { 引数 | help }\n"
+msgstr "使�方: nmcli connection down { 引数 | help }\n"
 "\n"
 "引数 := [id | uuid | path | apath] <ID> ...\n"
 "\n"
@@ -450,13 +440,13 @@ msgstr ""
 "�識別���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:987
+#: ../clients/cli/connections.c:980
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -543,8 +533,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -607,11 +597,9 @@ msgid ""
 "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection add { ARGUMENTS | help }\n"
+msgstr "使�方: nmcli connection add { 引数 | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"引数 := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -665,10 +653,8 @@ msgstr ""
 "                  [egress <egress priority mapping>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
-"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
-"| broadcast (3) |\n"
-"                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
-"(6)]\n"
+"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+"                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
 "                  [primary <ifname>]\n"
 "                  [miimon <num>]\n"
 "                  [downdelay <num>]\n"
@@ -698,8 +684,7 @@ msgstr ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -763,7 +748,7 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:1111
+#: ../clients/cli/connections.c:1104
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -778,16 +763,15 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
 "nmcli con mod bond0 +bond.options mii=500\n"
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection modify { 引数 | help }\n"
+msgstr "使�方: nmcli connection modify { 引数 | help }\n"
 "\n"
 "引数 := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
@@ -799,8 +783,7 @@ msgstr ""
 "\n"
 "例:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -808,7 +791,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1134
+#: ../clients/cli/connections.c:1127
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -816,11 +799,11 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) "
+"and\n"
 "id (provided as <new name> argument).\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection clone { 引数 | help }\n"
+msgstr "使�方: nmcli connection clone { 引数 | help }\n"
 "\n"
 "引数 := [--temporary] [id | uuid | path] <ID> <新����>\n"
 "\n"
@@ -829,7 +812,7 @@ msgstr ""
 "を除��<ID> �完全�コピー��り��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1146
+#: ../clients/cli/connections.c:1139
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -843,8 +826,7 @@ msgid ""
 "\n"
 "Add a new connection profile in an interactive editor.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection edit { 引数 | help }\n"
+msgstr "使�方: nmcli connection edit { 引数 | help }\n"
 "\n"
 "引数 := [id | uuid | path] <ID>\n"
 "\n"
@@ -856,7 +838,7 @@ msgstr ""
 "インテラクティブ�エディター�新��接続プロファイルを追加���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1161
+#: ../clients/cli/connections.c:1154
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -866,8 +848,7 @@ msgid ""
 "Delete a connection profile.\n"
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection delete { 引数 | help }\n"
+msgstr "使�方: nmcli connection delete { 引数 | help }\n"
 "\n"
 "引数 := [id | uuid | path] <ID>\n"
 "\n"
@@ -875,7 +856,7 @@ msgstr ""
 "プロファイル����UUID�D-Bus パス�識別���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1172
+#: ../clients/cli/connections.c:1165
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -886,8 +867,7 @@ msgid ""
 "This command prints a line whenever the specified connection changes.\n"
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection monitor { 引数 | help }\n"
+msgstr "使�方: nmcli connection monitor { 引数 | help }\n"
 "\n"
 "引数 := [id | uuid | path] <ID> ...\n"
 "\n"
@@ -896,7 +876,7 @@ msgstr ""
 "何も指定�れ��場�������接続プロファイルを監視���。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1184
+#: ../clients/cli/connections.c:1177
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -906,8 +886,9 @@ msgid ""
 msgstr "使�方: nmcli connection reload { help }\n"
 "\n"
 "ディスク�ら����接続ファイルを�読�込����。\n"
+"\n"
 
-#: ../clients/cli/connections.c:1192
+#: ../clients/cli/connections.c:1185
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -919,8 +900,7 @@ msgid ""
 "latest\n"
 "state.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection load { 引数 | help }\n"
+msgstr "使�方: nmcli connection load { 引数 | help }\n"
 "\n"
 "引数 := <filename> [<filename>...]\n"
 "\n"
@@ -929,7 +909,7 @@ msgstr ""
 "NetworkManager �最新�状態を�識�������。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1204
+#: ../clients/cli/connections.c:1197
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -942,8 +922,7 @@ msgid ""
 "Only VPN configurations are supported at the moment. The configuration\n"
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection import { 引数 | help }\n"
+msgstr "使�方: nmcli connection import { 引数 | help }\n"
 "\n"
 "引数 := [--temporary] type <タイプ> file <イン�ート�るファイル>\n"
 "\n"
@@ -953,7 +932,7 @@ msgstr ""
 "NetworkManager VPN プラグイン�よりイン�ート�れ��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1217
+#: ../clients/cli/connections.c:1210
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -963,8 +942,7 @@ msgid ""
 "Export a connection. Only VPN connections are supported at the moment.\n"
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
-msgstr ""
-"使�方: nmcli connection export { 引数 | help }\n"
+msgstr "使�方: nmcli connection export { 引数 | help }\n"
 "\n"
 "引数 := [id | uuid | path] <ID> [<出力ファイル>]\n"
 "\n"
@@ -972,415 +950,418 @@ msgstr ""
 "データ�標準出力���ファイル (���指定�れ�場�) ��信�れ��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1307
+#: ../clients/cli/connections.c:1301
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "%s �シークレット�更新中�エラー�発生����: %s\n"
 
-#: ../clients/cli/connections.c:1356
+#: ../clients/cli/connections.c:1348
 msgid "Connection profile details"
 msgstr "接続プロファイル�詳細"
 
-#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1454
+#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "エラー: 'connection show': %s"
 
-#: ../clients/cli/connections.c:1444
+#: ../clients/cli/connections.c:1436
 msgid "Activate connection details"
 msgstr "アクティブ�接続�詳細"
 
-#: ../clients/cli/connections.c:1552 ../clients/cli/devices.c:1452
-#: ../clients/cli/devices.c:1466 ../clients/cli/devices.c:1481
-#: ../clients/cli/devices.c:1539 ../clients/cli/devices.c:1641
+#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
+#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
+#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
+#: ../clients/cli/devices.c:1688
 msgid "NAME"
 msgstr "��"
 
-#: ../clients/cli/connections.c:1645
+#: ../clients/cli/connections.c:1637
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "無効�フィールド '%s'; 使用��るフィールド: %s �よ� %s���� %s�%s"
 
-#: ../clients/cli/connections.c:1655 ../clients/cli/connections.c:1663
+#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "'%s' �孤立��る必���り��"
 
-#: ../clients/cli/connections.c:1923
+#: ../clients/cli/connections.c:1915
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "'--order' オプション�正����文字列 '%s'"
 
-#: ../clients/cli/connections.c:1948
+#: ../clients/cli/connections.c:1940
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "'--order' オプション�正����アイテム '%s'"
 
-#: ../clients/cli/connections.c:1986
+#: ../clients/cli/connections.c:1978
 msgid "No connection specified"
 msgstr "接続�指定�れ����ん。"
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:1989
 #, c-format
 msgid "%s argument is missing"
 msgstr "%s 引数��り��ん。"
 
-#: ../clients/cli/connections.c:2015
+#: ../clients/cli/connections.c:2007
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "�明�接続 '%s'"
 
-#: ../clients/cli/connections.c:2044
+#: ../clients/cli/connections.c:2036
 msgid "'--order' argument is missing"
 msgstr "'--order' 引数��り��ん"
 
-#: ../clients/cli/connections.c:2104
+#: ../clients/cli/connections.c:2096
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager �アクティブ�プロファイル"
 
-#: ../clients/cli/connections.c:2105
+#: ../clients/cli/connections.c:2097
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager 接続プロファイル"
 
-#: ../clients/cli/connections.c:2157 ../clients/cli/connections.c:2902
-#: ../clients/cli/connections.c:2914 ../clients/cli/connections.c:2926
-#: ../clients/cli/connections.c:3155 ../clients/cli/connections.c:8873
-#: ../clients/cli/connections.c:8894 ../clients/cli/devices.c:2974
-#: ../clients/cli/devices.c:2986 ../clients/cli/devices.c:2999
-#: ../clients/cli/devices.c:3193 ../clients/cli/devices.c:3204
-#: ../clients/cli/devices.c:3222 ../clients/cli/devices.c:3231
-#: ../clients/cli/devices.c:3252 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3281 ../clients/cli/devices.c:3725
-#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743
-#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770
-#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3953
-#: ../clients/cli/devices.c:3964 ../clients/cli/devices.c:4135
+#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
+#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
+#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
+#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
+#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
+#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
+#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
+#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
+#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
+#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
+#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
+#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
+#: ../clients/cli/devices.c:4495
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数��り��ん。"
 
-#: ../clients/cli/connections.c:2185
+#: ../clients/cli/connections.c:2177
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "エラー: %s - ��よ��接続プロファイル��り��ん。"
 
-#: ../clients/cli/connections.c:2276 ../clients/cli/connections.c:2889
-#: ../clients/cli/connections.c:2953 ../clients/cli/connections.c:8417
-#: ../clients/cli/connections.c:8508 ../clients/cli/connections.c:8994
-#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:1993
-#: ../clients/cli/devices.c:2166 ../clients/cli/devices.c:2274
-#: ../clients/cli/devices.c:2466 ../clients/cli/devices.c:3916
-#: ../clients/cli/devices.c:4141 ../clients/cli/general.c:896
+#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
+#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
+#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
+#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
+#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
+#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
+#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
+#: ../clients/cli/general.c:982
 #, c-format
 msgid "Error: %s."
 msgstr "エラー: %s."
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "デ�イス '%s' 上�アクティブ�接続��り��ん"
 
-#: ../clients/cli/connections.c:2377
+#: ../clients/cli/connections.c:2369
 msgid "no active connection or device"
 msgstr "アクティブ�接続���デ�イス��り��ん"
 
-#: ../clients/cli/connections.c:2397
+#: ../clients/cli/connections.c:2389
 #, c-format
 msgid "device '%s' not compatible with connection '%s': "
 msgstr "デ�イス '%s' �接続 '%s' �互�性��り��ん: "
 
-#: ../clients/cli/connections.c:2430
+#: ../clients/cli/connections.c:2422
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "デ�イス '%s' �接続 '%s' �互�性��り��ん"
 
-#: ../clients/cli/connections.c:2433
+#: ../clients/cli/connections.c:2425
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "接続 '%s'用�デ�イス�見��り��ん"
 
-#: ../clients/cli/connections.c:2484
+#: ../clients/cli/connections.c:2476
 #, c-format
 msgid "Hint: use '%s' to get more details."
 msgstr "ヒント: '%s' を使用��詳細を�得���。"
 
-#: ../clients/cli/connections.c:2502
+#: ../clients/cli/connections.c:2494
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "接続�正常�アクティベート�れ��� (%s) (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2506 ../clients/cli/connections.c:2656
-#: ../clients/cli/connections.c:6738
+#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
+#: ../clients/cli/connections.c:6798
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "接続�正常�アクティベート�れ��� (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2635
+#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続�アクティベーション�失敗: %s"
 
-#: ../clients/cli/connections.c:2550
+#: ../clients/cli/connections.c:2542
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "エラー: タイムアウト (%d 秒) ��り���"
 
-#: ../clients/cli/connections.c:2718
+#: ../clients/cli/connections.c:2709
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "passwd-file '%s'�読�込��失敗: %s"
 
-#: ../clients/cli/connections.c:2731
+#: ../clients/cli/connections.c:2722
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' �コロン��り��ん"
 
-#: ../clients/cli/connections.c:2739
+#: ../clients/cli/connections.c:2730
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' �ドット��り��ん"
 
-#: ../clients/cli/connections.c:2752
+#: ../clients/cli/connections.c:2743
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "'password' エントリー '%s' �設定��無効��"
 
-#: ../clients/cli/connections.c:2806
+#: ../clients/cli/connections.c:2800
 #, c-format
 msgid "unknown device '%s'."
 msgstr "�明�デ�イス '%s' ��。"
 
-#: ../clients/cli/connections.c:2811
+#: ../clients/cli/connections.c:2805
 msgid "neither a valid connection nor device given"
 msgstr "有効�接続�デ�イス��れも指定�れ����ん"
 
-#: ../clients/cli/connections.c:2936 ../clients/cli/devices.c:1685
-#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3294
-#: ../clients/cli/devices.c:3970
+#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
+#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
+#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
+#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
+#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
+#: ../clients/cli/devices.c:4505
 #, c-format
-msgid "Unknown parameter: %s\n"
-msgstr "�明�パラメーター: %s\n"
+msgid "Error: invalid extra argument '%s'."
+msgstr "エラー:  '%s' �無効�追加引数��。"
 
-#: ../clients/cli/connections.c:2961
+#: ../clients/cli/connections.c:2955
 msgid "preparing"
 msgstr "準備中"
 
-#: ../clients/cli/connections.c:3070
+#: ../clients/cli/connections.c:3064
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "接続 '%s' (%s) �正常�削除�れ���。\n"
 
-#: ../clients/cli/connections.c:3086
+#: ../clients/cli/connections.c:3080
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "接続 '%s' �正常��アクティブ化�れ��� (D-Bus アクティブパス: %s)\n"
 
-#: ../clients/cli/connections.c:3137 ../clients/cli/connections.c:8604
-#: ../clients/cli/connections.c:8635 ../clients/cli/connections.c:8794
+#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
+#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
 #, c-format
 msgid "Error: No connection specified."
 msgstr "エラー: 接続�指定�れ����ん。"
 
-#: ../clients/cli/connections.c:3167
+#: ../clients/cli/connections.c:3161
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "エラー: '%s' �アクティブ�接続���り��ん。\n"
 
-#: ../clients/cli/connections.c:3168
+#: ../clients/cli/connections.c:3162
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "エラー: アクティブ�一部�接続�見��り��ん。"
 
-#: ../clients/cli/connections.c:3176
+#: ../clients/cli/connections.c:3170
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "エラー: アクティブ�接続��り��ん。"
 
-#: ../clients/cli/connections.c:3207
+#: ../clients/cli/connections.c:3201
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "接続 '%s' ��アクティブ化�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:3458 ../clients/cli/connections.c:3515
-#: ../clients/common/nm-client-utils.c:225
+#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
+#: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' � [%s] ���り��ん"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3478 ../clients/cli/connections.c:3538
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
+#: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "�明�エラー"
 
-#: ../clients/cli/connections.c:3672
+#: ../clients/cli/connections.c:3675
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告: master='%s' �既存�プロファイルを�照���ん。\n"
 
-#: ../clients/cli/connections.c:4027
+#: ../clients/cli/connections.c:4038
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "エラー: 無効�プロパティー '%s': %s。"
 
-#: ../clients/cli/connections.c:4041
+#: ../clients/cli/connections.c:4053
 #, c-format
 msgid "Error: failed to %s %s.%s: %s."
 msgstr "エラー: %s %s.%s: %s. �失敗����"
 
-#: ../clients/cli/connections.c:4076
+#: ../clients/cli/connections.c:4095
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "エラー: '%s' �必須��。"
 
-#: ../clients/cli/connections.c:4103
+#: ../clients/cli/connections.c:4122
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "エラー: 無効�スレーブタイプ; %s。"
 
-#: ../clients/cli/connections.c:4111
+#: ../clients/cli/connections.c:4130
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "エラー: 無効�接続タイプ; %s。"
 
-#: ../clients/cli/connections.c:4188
+#: ../clients/cli/connections.c:4207
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "エラー: �題��る接続タイプ: %s"
 
-#: ../clients/cli/connections.c:4234
+#: ../clients/cli/connections.c:4263
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "エラー: '%s': %s"
 
-#: ../clients/cli/connections.c:4255
+#: ../clients/cli/connections.c:4290
 msgid "Error: master is required"
 msgstr "エラー: マスター�必���"
 
-#: ../clients/cli/connections.c:4314
+#: ../clients/cli/connections.c:4359
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "エラー: ボンドオプション '%s=%s' �追加中�エラー。"
 
-#: ../clients/cli/connections.c:4345
+#: ../clients/cli/connections.c:4390
 #, 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:4376
+#: ../clients/cli/connections.c:4421
 #, 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:4625
+#: ../clients/cli/connections.c:4686
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "エラー: '%s' �値�見��り��ん。"
 
-#: ../clients/cli/connections.c:4671
+#: ../clients/cli/connections.c:4730
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "エラー: <setting>.<property> 引数��り��ん。"
 
-#: ../clients/cli/connections.c:4694
+#: ../clients/cli/connections.c:4756
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "エラー: 無効���許��れ����設定 '%s' ��: %s。"
 
-#: ../clients/cli/connections.c:4742 ../clients/cli/connections.c:4758
+#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "エラー:'%s' ������� (%s.%s ��� %s.%s)。"
 
-#: ../clients/cli/connections.c:4776
+#: ../clients/cli/connections.c:4837
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "エラー: 無効� <setting>.<property> '%s' ��。"
 
-#: ../clients/cli/connections.c:4815 ../clients/cli/connections.c:8456
+#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "エラー: '%s' 接続�追加�失敗����: %s"
 
-#: ../clients/cli/connections.c:4833
+#: ../clients/cli/connections.c:4894
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
 "connection by its uuid '%2$s'\n"
-msgid_plural ""
-"Warning: There are %3$u other connections with the name '%1$s'. Reference "
-"the connection by its uuid '%2$s'\n"
+msgid_plural "Warning: There are %3$u other connections with the name '%1$s'. Reference the connection by its uuid '%2$s'\n"
 msgstr[0] "警告: ��� '%1$s' �接続�他� %3$u 個�り��。uuid � '%2$s' �接続を�照������。\n"
 
-#: ../clients/cli/connections.c:4842
+#: ../clients/cli/connections.c:4903
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "接続 '%s' (%s) �正常�追加�れ���。\n"
 
-#: ../clients/cli/connections.c:4904 ../clients/cli/connections.c:6861
-#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:529
-#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1206
-#: ../clients/cli/general.c:137 ../clients/cli/utils.h:297
-#: ../clients/common/nm-client-utils.c:283
-#: ../clients/common/nm-meta-setting-desc.c:871
-#: ../clients/common/nm-meta-setting-desc.c:2669
+#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
+#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
+#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
+#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
+#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-meta-setting-desc.c:866
+#: ../clients/common/nm-meta-setting-desc.c:2682
 msgid "no"
 msgstr "���"
 
-#: ../clients/cli/connections.c:4905 ../clients/cli/connections.c:6861
-#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:528
-#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1206
-#: ../clients/cli/general.c:136 ../clients/cli/utils.h:297
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:871
-#: ../clients/common/nm-meta-setting-desc.c:2666
+#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
+#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
+#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
+#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
+#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-meta-setting-desc.c:866
+#: ../clients/common/nm-meta-setting-desc.c:2679
 msgid "yes"
 msgstr "��"
 
-#: ../clients/cli/connections.c:4991
+#: ../clients/cli/connections.c:5052
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done."
-"\n"
+"You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr "��オプション�複数回指定�る�������。終了��ら <Enter> を押������。\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5093
+#: ../clients/cli/connections.c:5154
 #, 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:5099
+#: ../clients/cli/connections.c:5160
 #, 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:5231 ../clients/cli/utils.c:293
+#: ../clients/cli/connections.c:5292 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "エラー: '%s' 引数�値�必���。"
 
-#: ../clients/cli/connections.c:5238
+#: ../clients/cli/connections.c:5299
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "エラー: 'save': %s。"
 
-#: ../clients/cli/connections.c:5324 ../clients/cli/connections.c:5335
+#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "エラー: '%s' 引数�必���。"
 
-#: ../clients/cli/connections.c:6294
+#: ../clients/cli/connections.c:6354
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' 設定値]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:6403
+#.
+#: ../clients/cli/connections.c:6463
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1397,8 +1378,7 @@ msgid ""
 "help/?   [<command>]                 :: print this help\n"
 "nmcli    <conf-option> <value>       :: nmcli configuration\n"
 "quit                                 :: exit nmcli\n"
-msgstr ""
-"---[ メインメニュー ]---\n"
+msgstr "---[ メインメニュー ]---\n"
 "goto     [<setting> | <prop>]        :: 設定���プロパティー�移動�る\n"
 "remove   <setting>[.<prop>] | <prop> :: 設定を削除�る����プロパティー値をリセット�る\n"
 "set      [<setting>.<prop> <value>]  :: プロパティー値を設定�る\n"
@@ -1412,7 +1392,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: nmcli 設定\n"
 "quit                                 :: nmcli を終了�る\n"
 
-#: ../clients/cli/connections.c:6430
+#: ../clients/cli/connections.c:6490
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1422,8 +1402,7 @@ msgid ""
 "Examples: nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
-msgstr ""
-"goto <setting>[.<prop>] | <prop>  :: 設定/プロパティー�入り編集�る\n"
+msgstr "goto <setting>[.<prop>] | <prop>  :: 設定/プロパティー�入り編集�る\n"
 "\n"
 "��コマンドを使��設定���プロパティー�入り編集を行���。\n"
 "\n"
@@ -1431,18 +1410,18 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6437
+#: ../clients/cli/connections.c:6497
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
-msgstr ""
-"remove <setting>[.<prop>]  :: 設定を削除�る����プロパティー値をリセット�る\n"
+msgstr "remove <setting>[.<prop>]  :: 設定を削除�る����プロパティー値をリセット�る\n"
 "\n"
 "��コマンドを使��接続�ら全設定を削除���。����プロパティーを\n"
 "指定���る場�����プロパティーをデフォルト値���リセット���。\n"
@@ -1450,7 +1429,7 @@ msgstr ""
 "例: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6444
+#: ../clients/cli/connections.c:6504
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1458,26 +1437,24 @@ msgid ""
 "This command sets property value.\n"
 "\n"
 "Example: nmcli> set con.id My connection\n"
-msgstr ""
-"set [<setting>.<prop> <value>]  :: プロパティー値を設定�る\n"
+msgstr "set [<setting>.<prop> <value>]  :: プロパティー値を設定�る\n"
 "\n"
 "��コマンドを使��プロパティー値を設定���。\n"
 "\n"
 "例: nmcli> set con.id My connection\n"
 
-#: ../clients/cli/connections.c:6449
+#: ../clients/cli/connections.c:6509
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
 "\n"
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
-msgstr ""
-"describe [<setting>.<prop>]  :: プロパティー値を表示�る\n"
+msgstr "describe [<setting>.<prop>]  :: プロパティー値を表示�る\n"
 "\n"
 "プロパティー詳細を表示���。NM �設定�よ�プロパティー�全詳細������nm-settings(5) � man ページを�照������。\n"
 
-#: ../clients/cli/connections.c:6454
+#: ../clients/cli/connections.c:6514
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1485,27 +1462,26 @@ msgid ""
 "Shows current property or the whole connection.\n"
 "\n"
 "Example: nmcli ipv4> print all\n"
-msgstr ""
-"print [all]  :: 設定���接続値を出力�る\n"
+msgstr "print [all]  :: 設定���接続値を出力�る\n"
 "\n"
 "�在�プロパティー���接続全体を表示���。\n"
 "\n"
 "例: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6459
+#: ../clients/cli/connections.c:6519
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed automatically\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
-msgstr ""
-"verify [all | fix]  :: 設定���接続�有効性を確��る\n"
+msgstr "verify [all | fix]  :: 設定���接続�有効性を確��る\n"
 "\n"
 "設定���接続�有効����を確�������存�る�������。\n"
 "エラー�場���無効�値を表示���。'fix' オプション�より一部�エラー�自動的�\n"
@@ -1515,7 +1491,7 @@ msgstr ""
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6468
+#: ../clients/cli/connections.c:6528
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1529,8 +1505,7 @@ msgid ""
 "restart. If you want to fully remove the persistent connection, the "
 "connection\n"
 "profile must be deleted.\n"
-msgstr ""
-"save [persistent|temporary]  :: 接続を�存�る\n"
+msgstr "save [persistent|temporary]  :: 接続を�存�る\n"
 "\n"
 "接続プロファイルを NetworkManager ��信��永続的��存�る��\n"
 "メモリー��������。引数��� 'save' � 'save persistent' を\n"
@@ -1541,7 +1516,7 @@ msgstr ""
 "永続的�接続を完全�削除�る場���接続プロファイルを削除�る\n"
 "必���り��。\n"
 
-#: ../clients/cli/connections.c:6479
+#: ../clients/cli/connections.c:6539
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1552,8 +1527,7 @@ msgid ""
 "<ifname>    - device the connection will be activated on\n"
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
-msgstr ""
-"activate [<ifname>] [/<ap>|<nsp>]  :: 接続をアクティベート�る\n"
+msgstr "activate [<ifname>] [/<ap>|<nsp>]  :: 接続をアクティベート�る\n"
 "\n"
 "接続をアクティベート���。\n"
 "\n"
@@ -1561,21 +1535,23 @@ msgstr ""
 "<ifname>    - ��デ�イス�接続をアクティベート�る\n"
 "/<ap>|<nsp> - AP (Wi-Fi) ��� NSP (WiMAX) (<ifname> �指定�れ����場�� / を先頭�付�る)\n"
 
-#: ../clients/cli/connections.c:6486 ../clients/cli/connections.c:6644
+#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
 #, c-format
-msgid "back  :: go to upper menu level\n"
+msgid ""
+"back  :: go to upper menu level\n"
 "\n"
 msgstr "back  :: 一�上�メニューレベル�移動\n"
 "\n"
 
-#: ../clients/cli/connections.c:6489
+#: ../clients/cli/connections.c:6549
 #, c-format
-msgid "help/? [<command>]  :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
 msgstr "help/? [<command>]  :: nmcli コマンド�ヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6492
+#: ../clients/cli/connections.c:6552
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1589,8 +1565,7 @@ msgid ""
 "Examples: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
-msgstr ""
-"nmcli [<conf-option> <value>]  :: nmcli 設定\n"
+msgstr "nmcli [<conf-option> <value>]  :: nmcli 設定\n"
 "\n"
 "nmcli �設定を行����。次�オプション�使用�能��。\n"
 "status-line yes | no          [default: no]\n"
@@ -1602,7 +1577,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6514 ../clients/cli/connections.c:6650
+#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1613,16 +1588,16 @@ msgstr "quit  :: nmcli �終了\n"
 "\n"
 "nmcli を終了���。変更��接続��存を行������場����動作�確��求�られ��。\n"
 
-#: ../clients/cli/connections.c:6519 ../clients/cli/connections.c:6655
-#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:8043
+#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
+#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "�明�コマンド: '%s'\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:6584
+#.
+#: ../clients/cli/connections.c:6644
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1636,8 +1611,7 @@ msgid ""
 "back                             :: go to upper level\n"
 "help/?   [<command>]             :: print this help or command description\n"
 "quit                             :: exit nmcli\n"
-msgstr ""
-"---[ プロパティーメニュー]---\n"
+msgstr "---[ プロパティーメニュー]---\n"
 "set      [<value>]               :: 新��値�設定\n"
 "add      [<value>]               :: プロパティー�新�オプションを追加\n"
 "change                           :: �在�値を変更\n"
@@ -1648,7 +1622,7 @@ msgstr ""
 "help/?   [<command>]             :: ��ヘルプ���コマンド�詳細を表示\n"
 "quit                             :: nmcli �終了\n"
 
-#: ../clients/cli/connections.c:6609
+#: ../clients/cli/connections.c:6669
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1658,7 +1632,7 @@ msgstr "set [<value>]  :: 新��値�設定\n"
 "\n"
 "��プロパティー�指定�� <value> を設定���。\n"
 
-#: ../clients/cli/connections.c:6613
+#: ../clients/cli/connections.c:6673
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1666,13 +1640,11 @@ msgid ""
 "This command adds provided <value> to this property, if the property is of a "
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
-msgstr ""
-"add [<value>]  :: プロパティー�新��値を追加�る\n"
+msgstr "add [<value>]  :: プロパティー�新��値を追加�る\n"
 "\n"
-"��コマンドを実行�る��プロパティー�タイプ�コンテナー�場���指定�� <value> "
-"���プロパティー�追加�れ��。�一値�プロパティー�場�����プロパティー値�置��れ�� ('set' �場����)。\n"
+"��コマンドを実行�る��プロパティー�タイプ�コンテナー�場���指定�� <value> ���プロパティー�追加�れ��。�一値�プロパティー�場�����プロパティー値�置��れ�� ('set' �場����)。\n"
 
-#: ../clients/cli/connections.c:6619
+#: ../clients/cli/connections.c:6679
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1682,7 +1654,7 @@ msgstr "change  :: �在�値を変更\n"
 "\n"
 "�在�値を表示����値を変更�る�������。\n"
 
-#: ../clients/cli/connections.c:6623
+#: ../clients/cli/connections.c:6683
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1700,8 +1672,7 @@ msgid ""
 "          nmcli ipv4.dns> remove 2\n"
 "          nmcli bond.options> remove downdelay\n"
 "\n"
-msgstr ""
-"remove [<value>|<index>|<option name>]  :: 値を削除�る\n"
+msgstr "remove [<value>|<index>|<option name>]  :: 値を削除�る\n"
 "\n"
 "プロパティー値を削除���。�一値�プロパティー�場���\n"
 "プロパティー�デフォルト値�戻り��。コンテナータイププロパティー�場���\n"
@@ -1714,19 +1685,18 @@ msgstr ""
 "          nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6634
+#: ../clients/cli/connections.c:6694
 #, c-format
 msgid ""
 "describe  :: describe property\n"
 "\n"
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
-msgstr ""
-"describe  :: プロパティー�詳細表示\n"
+msgstr "describe  :: プロパティー�詳細表示\n"
 "\n"
 "プロパティー�詳細を表示���。NM 設定�プロパティー�詳細��nm-settings(5) man ページを�照������。\n"
 
-#: ../clients/cli/connections.c:6639
+#: ../clients/cli/connections.c:6699
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1734,567 +1704,564 @@ msgid ""
 "\n"
 "Shows property value. Providing an argument you can also display values for "
 "the whole setting or connection.\n"
-msgstr ""
-"print [property|setting|connection]  :: プロパティー値�表示 (設定�接続)\n"
+msgstr "print [property|setting|connection]  :: プロパティー値�表示 (設定�接続)\n"
 "\n"
 "プロパティー値を表示���。引数を指定�る��設定���接続全体�値を表示��る��も����。\n"
 
-#: ../clients/cli/connections.c:6647
+#: ../clients/cli/connections.c:6707
 #, c-format
-msgid "help/? [<command>]  :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 msgstr "help/? [<command>]  :: nmcli コマンド�ヘルプ\n"
 "\n"
 
-#: ../clients/cli/connections.c:6744
+#: ../clients/cli/connections.c:6804
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "エラー: 接続�アクティベート�失敗����。\n"
 
-#: ../clients/cli/connections.c:6841
+#: ../clients/cli/connections.c:6901
 #, 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:6859
+#: ../clients/cli/connections.c:6919
 #, 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:6895
+#: ../clients/cli/connections.c:6955
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "��接続��存�れ��ん。本当�終了����? %s"
 
-#: ../clients/cli/connections.c:6936
+#: ../clients/cli/connections.c:6996
 #, 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"
 
-#: ../clients/cli/connections.c:6970 ../clients/cli/connections.c:7359
-#: ../clients/cli/connections.c:7418
+#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
+#: ../clients/cli/connections.c:7488
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "'%s' プロパティー�使用��る値: %s\n"
 
-#: ../clients/cli/connections.c:6974 ../clients/cli/connections.c:7363
-#: ../clients/cli/connections.c:7422
+#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
+#: ../clients/cli/connections.c:7492
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "'%s' 値を入力������: "
 
-#: ../clients/cli/connections.c:6988 ../clients/cli/connections.c:7001
-#: ../clients/cli/connections.c:7367 ../clients/cli/connections.c:7433
+#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
+#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "エラー: '%s' プロパティー�設定�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:6997
+#: ../clients/cli/connections.c:7057
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "'%s' 値�編集: "
 
-#: ../clients/cli/connections.c:7015 ../clients/cli/settings.c:414
+#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../clients/cli/connections.c:7034
+#: ../clients/cli/connections.c:7099
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "�明�コマンド引数: '%s'\n"
 
-#: ../clients/cli/connections.c:7125
+#: ../clients/cli/connections.c:7190
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "使用�能�設定: %s\n"
 
-#: ../clients/cli/connections.c:7137
+#: ../clients/cli/connections.c:7202
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "エラー: 無効�設定�; %s\n"
 
-#: ../clients/cli/connections.c:7155
+#: ../clients/cli/connections.c:7220
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "利用�能�プロパティー: %s\n"
 
-#: ../clients/cli/connections.c:7163
+#: ../clients/cli/connections.c:7228
 #, c-format
 msgid "Error: property %s\n"
 msgstr "エラー: プロパティー %s\n"
 
-#: ../clients/cli/connections.c:7208
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
 "Do you still want to save? %s"
-msgstr ""
-"'autoconnect=yes' ���接続を�存�����。�れ�より直��接続�アクティベート�れる�能性��り��。\n"
+msgstr "'autoconnect=yes' ���接続を�存�����。�れ�より直��接続�アクティベート�れる�能性��り��。\n"
 "本当��存����? %s"
 
-#: ../clients/cli/connections.c:7293
+#: ../clients/cli/connections.c:7358
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "次�設定を変更�る�������: %s\n"
 
-#: ../clients/cli/connections.c:7324
+#: ../clients/cli/connections.c:7389
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr "��接続プロファイル�別�クライアント�ら�削除�れ����。'save' �入力�る�元�戻��������。\n"
 
-#: ../clients/cli/connections.c:7371 ../clients/cli/connections.c:7625
-#: ../clients/cli/connections.c:7657
+#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
+#: ../clients/cli/connections.c:7741
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "エラー: 設定��択�れ����ん。有効�設定� [%s] ��り��\n"
 
-#: ../clients/cli/connections.c:7372
+#: ../clients/cli/connections.c:7442
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "��先� 'goto <setting>' を使用�る��'set <setting>.<property>' を使用������。\n"
 
-#: ../clients/cli/connections.c:7387 ../clients/cli/connections.c:7557
-#: ../clients/cli/connections.c:7647
+#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
+#: ../clients/cli/connections.c:7731
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "エラー: 無効�設定引数 %s ��。[%s] �有効�引数��り��\n"
 
-#: ../clients/cli/connections.c:7396
+#: ../clients/cli/connections.c:7466
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "エラー: '%s' プロパティー用�設定��り��ん\n"
 
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7473
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "エラー: 無効�プロパティー: %s\n"
 
-#: ../clients/cli/connections.c:7465
+#: ../clients/cli/connections.c:7537
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "エラー: �明�設定 '%s'\n"
 
-#: ../clients/cli/connections.c:7490
+#: ../clients/cli/connections.c:7562
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "変更��る��次�プロパティー��り��: %s\n"
 
-#: ../clients/cli/connections.c:7530 ../clients/cli/connections.c:7580
+#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "エラー: '%s' �値�削除�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7535
+#: ../clients/cli/connections.c:7612
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "エラー: 引数�指定�れ����ん。[%s] �有効�引数��り��\n"
 
-#: ../clients/cli/connections.c:7554
+#: ../clients/cli/connections.c:7631
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "��接続���設定 '%s' ��り��ん。\n"
 
-#: ../clients/cli/connections.c:7601
+#: ../clients/cli/connections.c:7685
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "エラー: %s プロパティー�設定��も�り��ん。\n"
 
-#: ../clients/cli/connections.c:7626 ../clients/cli/connections.c:7658
+#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
-msgstr ""
-"��先� 'goto <setting>' を使用�る��'describe <setting>.<property>' を使用������\n"
+msgstr "��先� 'goto <setting>' を使用�る��'describe <setting>.<property>' を使用������\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:7765
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "エラー: 無効�プロパティー: %s�有効�設定��も�り��ん。\n"
 
-#: ../clients/cli/connections.c:7711
+#: ../clients/cli/connections.c:7795
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "エラー: �明�設定: '%s'\n"
 
-#: ../clients/cli/connections.c:7716
+#: ../clients/cli/connections.c:7800
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "エラー: ��接続���設定 '%s' ��り��ん。\n"
 
-#: ../clients/cli/connections.c:7747
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "エラー: 無効�プロパティー: %s%s\n"
 
-#: ../clients/cli/connections.c:7749
+#: ../clients/cli/connections.c:7833
 msgid ", neither a valid setting name"
 msgstr "有効�設定��も�り��ん。"
 
-#: ../clients/cli/connections.c:7765
+#: ../clients/cli/connections.c:7849
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "無効�検証オプション: %s\n"
 
-#: ../clients/cli/connections.c:7773
+#: ../clients/cli/connections.c:7858
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "設定 '%s' �確�: %s\n"
 
-#: ../clients/cli/connections.c:7788
+#: ../clients/cli/connections.c:7874
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "接続�確�: %s\n"
 
-#: ../clients/cli/connections.c:7791
+#: ../clients/cli/connections.c:7877
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "エラーを自動的�修正����ん。\n"
 
-#: ../clients/cli/connections.c:7812
+#: ../clients/cli/connections.c:7897
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "エラー: 無効�引数 '%s'\n"
 
-#: ../clients/cli/connections.c:7862
+#: ../clients/cli/connections.c:7947
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続��存�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7868
+#: ../clients/cli/connections.c:7953
 #, c-format
 msgid "Error: Timeout saving '%s' (%s) connection\n"
 msgstr "エラー: %s' (%s) 接続��存�失敗����\n"
 
-#: ../clients/cli/connections.c:7873
+#: ../clients/cli/connections.c:7958
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "接続 '%s' (%s) �正常��存�れ���。\n"
 
-#: ../clients/cli/connections.c:7874
+#: ../clients/cli/connections.c:7959
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "接続 '%s' (%s) �正常�更新�れ���。\n"
 
-#: ../clients/cli/connections.c:7907
+#: ../clients/cli/connections.c:7992
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "エラー: 接続�確��失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7908
+#: ../clients/cli/connections.c:7993
 msgid "(unknown error)"
 msgstr "(�明�エラー)"
 
-#: ../clients/cli/connections.c:7909
+#: ../clients/cli/connections.c:7994
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "エラーを修正�る��� 'verify fix' �実行を試行����。\n"
 
-#: ../clients/cli/connections.c:7931
+#. TRANSLATORS: do not translate 'save', leave it as it is
+#: ../clients/cli/connections.c:8017
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "エラー: 接続��存�れ����ん。�� 'save' �入力���。\n"
 
-#: ../clients/cli/connections.c:7935
+#: ../clients/cli/connections.c:8021
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "エラー: 接続�無効��: %s\n"
 
-#: ../clients/cli/connections.c:7945
+#: ../clients/cli/connections.c:8031
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "エラー: 接続をアクティベート����ん: %s。\n"
 
-#: ../clients/cli/connections.c:7954
+#: ../clients/cli/connections.c:8040
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "エラー: '%s' (%s) 接続�アクティベート�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:7961
+#: ../clients/cli/connections.c:8047
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "モニタリング接続�アクティベート (��れ��キーを押��続行�る)\n"
 
-#: ../clients/cli/connections.c:7997
+#: ../clients/cli/connections.c:8083
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "エラー: status-line: %s\n"
 
-#: ../clients/cli/connections.c:8005
+#: ../clients/cli/connections.c:8091
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "エラー: save-confirmation: %s\n"
 
-#: ../clients/cli/connections.c:8013
+#: ../clients/cli/connections.c:8099
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "エラー: show-secrets: %s\n"
 
-#: ../clients/cli/connections.c:8020
+#: ../clients/cli/connections.c:8106
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "�在� nmcli 設定:\n"
 
-#: ../clients/cli/connections.c:8028
+#: ../clients/cli/connections.c:8114
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "無効�設定オプション '%s'; [%s] �指定����\n"
 
-#: ../clients/cli/connections.c:8249
+#: ../clients/cli/connections.c:8335
 #, c-format
 msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
 msgstr "エラー: 指定��る���'id'�'filename'�uuid���� 'path' ���れ� 1 ���り��。"
 
-#: ../clients/cli/connections.c:8263 ../clients/cli/connections.c:8424
+#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "エラー: �明�接続 '%s' ��。"
 
-#: ../clients/cli/connections.c:8279
+#: ../clients/cli/connections.c:8365
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告: 既存�接続 '%s' を編集�����。'type' 引数�無視�れ��\n"
 
-#: ../clients/cli/connections.c:8282
+#: ../clients/cli/connections.c:8368
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告: 既存�接続 '%s' を編集�����。'con-name' 引数�無視�れ��\n"
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:8395
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有効�接続タイプ: %s\n"
 
-#: ../clients/cli/connections.c:8311
+#: ../clients/cli/connections.c:8397
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "エラー: 無効�接続タイプ; %s\n"
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:8433
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli インテラクティブ接続エディター |==="
 
-#: ../clients/cli/connections.c:8350
+#: ../clients/cli/connections.c:8436
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "既存� '%s' 接続を編集中: '%s'"
 
-#: ../clients/cli/connections.c:8352
+#: ../clients/cli/connections.c:8438
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "新�� '%s' 接続を追加中"
 
-#: ../clients/cli/connections.c:8354
+#. TRANSLATORS: do not translate 'help', leave it as it is
+#: ../clients/cli/connections.c:8441
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "使用��るコマンドを表示�る�� 'help' ��� '?' を入力���。"
 
-#: ../clients/cli/connections.c:8356
+#. TRANSLATORS: do not translate 'print', leave it as it is
+#: ../clients/cli/connections.c:8444
 #, c-format
 msgid "Type 'print' to show all the connection properties."
 msgstr "����接続プロパティーを表示�る�� 'print' �タイプ���。"
 
-#: ../clients/cli/connections.c:8358
+#. TRANSLATORS: do not translate 'describe', leave it as it is
+#: ../clients/cli/connections.c:8447
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr "プロパティー詳細を表示�る���'describe [<setting>.<prop>]' を入力���。"
 
-#: ../clients/cli/connections.c:8386
+#: ../clients/cli/connections.c:8475
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "エラー: 接続 '%s' �変更�失敗����: %s"
 
-#: ../clients/cli/connections.c:8392
+#: ../clients/cli/connections.c:8481
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "接続 '%s' (%s) �正常�変更�れ���。\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8549
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) � %s (%s) ���クローン�れ���。\n"
 
-#: ../clients/cli/connections.c:8519
+#: ../clients/cli/connections.c:8608
 msgid "New connection name: "
-msgstr "新��接続�:"
+msgstr "新��接続�: "
 
-#: ../clients/cli/connections.c:8521
+#: ../clients/cli/connections.c:8610
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "エラー: <new name> 引数��り��ん。"
 
-#: ../clients/cli/connections.c:8526 ../clients/cli/connections.c:9005
+#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "エラー: �明�追加�引数: '%s'。"
 
-#: ../clients/cli/connections.c:8559
+#: ../clients/cli/connections.c:8648
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "エラー: 一部�接続�削除�れ����ん。"
 
-#: ../clients/cli/connections.c:8560
+#: ../clients/cli/connections.c:8649
 #, c-format
 msgid "Error: Connection deletion failed: %s\n"
 msgstr "エラー: 接続�削除�失敗����: %s\n"
 
-#: ../clients/cli/connections.c:8616 ../clients/cli/connections.c:8737
+#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
 #, c-format
 msgid "Error: %s.\n"
 msgstr "エラー: %s。\n"
 
-#: ../clients/cli/connections.c:8617 ../clients/cli/connections.c:8738
+#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
 #, c-format
 msgid "Error: not all connections found."
 msgstr "エラー: 一部�接続�見��り��ん。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8668
+#: ../clients/cli/connections.c:8757
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "エラー: �明�接続を削除����ん: %s。"
 
-#: ../clients/cli/connections.c:8678
+#: ../clients/cli/connections.c:8767
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s: 接続プロファイル�変更�れ���\n"
 
-#: ../clients/cli/connections.c:8704
+#: ../clients/cli/connections.c:8793
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s: 接続プロファイル�作��れ���\n"
 
-#: ../clients/cli/connections.c:8713
+#: ../clients/cli/connections.c:8802
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s: 接続プロファイル�削除�れ���\n"
 
-#: ../clients/cli/connections.c:8776
+#: ../clients/cli/connections.c:8873
 #, c-format
 msgid "Error: failed to reload connections: %s."
-msgstr "エラー: 接続�リロード�失敗����: %s。"
+msgstr "エラー: 接続��ロード�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8809
+#: ../clients/cli/connections.c:8905
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "エラー: 接続�ロード�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8817
+#: ../clients/cli/connections.c:8913
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "'%s' ファイルを読�込���ん���。\n"
 
-#: ../clients/cli/connections.c:8824
+#: ../clients/cli/connections.c:8920
 msgid "File to import: "
-msgstr "イン�ート�るファイル:"
+msgstr "イン�ート�るファイル: "
 
-#: ../clients/cli/connections.c:8857
+#: ../clients/cli/connections.c:8953
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "エラー: 引数��り��ん。"
 
-#: ../clients/cli/connections.c:8888
+#: ../clients/cli/connections.c:8984
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告: 'type' ����指定�れ����。追加�も��無視�れ��。\n"
 
-#: ../clients/cli/connections.c:8902
+#: ../clients/cli/connections.c:8998
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告: 'file' ����指定�れ����。追加�も��無視�れ��。\n"
 
-#: ../clients/cli/connections.c:8904
-#, c-format
-msgid "Unknown parameter: %s"
-msgstr "�明�パラメーター: %s"
-
-#: ../clients/cli/connections.c:8915
+#: ../clients/cli/connections.c:9011
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "エラー: 'type' 引数�必���。"
 
-#: ../clients/cli/connections.c:8919
+#: ../clients/cli/connections.c:9015
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "エラー: 'file' 引数�必���。"
 
-#: ../clients/cli/connections.c:8928
+#: ../clients/cli/connections.c:9024
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "エラー: %s 用� VPN プラグイン�見��り��ん。"
 
-#: ../clients/cli/connections.c:8935 ../clients/cli/connections.c:9026
+#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "エラー: VPN プラグイン�ロード�失敗����: %s。"
 
-#: ../clients/cli/connections.c:8944
+#: ../clients/cli/connections.c:9040
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "エラー: '%s' �イン�ート�失敗����: %s。"
 
-#: ../clients/cli/connections.c:9012
+#: ../clients/cli/connections.c:9108
 msgid "Output file name: "
-msgstr "出力ファイル�:"
+msgstr "出力ファイル�: "
 
-#: ../clients/cli/connections.c:9017
+#: ../clients/cli/connections.c:9113
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "エラー: 接続� VPN ���り��ん。"
 
-#: ../clients/cli/connections.c:9039
+#: ../clients/cli/connections.c:9135
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "エラー: 一時ファイル %s �作��失敗����。"
 
-#: ../clients/cli/connections.c:9047
+#: ../clients/cli/connections.c:9143
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "エラー: '%s' �エクス�ート�失敗����: %s。"
 
-#: ../clients/cli/connections.c:9059
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "エラー: 一時ファイル '%s' �読��り�失敗����: %s。"
 
 #. define some prompts
-#: ../clients/cli/devices.c:37
+#: ../clients/cli/devices.c:23
 msgid "Interface: "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:38
+#: ../clients/cli/devices.c:24
 msgid "Interface(s): "
 msgstr "インターフェース: "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1234
+#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
 msgid "(none)"
 msgstr "（��）"
 
-#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
+#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
 msgid "(unknown)"
 msgstr "(�明)"
 
-#: ../clients/cli/devices.c:333
+#: ../clients/cli/devices.c:322
 #, c-format
 msgid "<invisible> | %s"
 msgstr "<invisible> | %s"
 
-#: ../clients/cli/devices.c:334
+#: ../clients/cli/devices.c:323
 msgid "<invisible>"
 msgstr "<invisible>"
 
-#: ../clients/cli/devices.c:435
+#: ../clients/cli/devices.c:424
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:693
+#: ../clients/cli/devices.c:725
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2332,13 +2299,13 @@ msgid ""
 "\n"
 "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
+"  wifi show-password [ifname <ifname>]\n"
+"\n"
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
-msgstr ""
-"使�方: nmcli device { COMMAND | help }\n"
+msgstr "使�方: nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | set | connect | reapply | modify | disconnect | "
-"delete | monitor | wifi | lldp }\n"
+"コマンド := { status | show | set | connect | reapply | modify | disconnect | delete | monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
@@ -2360,20 +2327,19 @@ msgstr ""
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
 "\n"
-"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no] "
-"[hidden yes|no]\n"
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n"
 "\n"
-"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
-"[channel <channel>] [password <password>]\n"
+"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] [channel <channel>] [password <password>]\n"
 "\n"
 "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
+"  wifi show-password [ifname <ifname>]\n"
+"\n"
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
-#: ../clients/cli/devices.c:716
+#: ../clients/cli/devices.c:749
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2384,11 +2350,12 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device status { help }\n"
+msgstr "使�方: nmcli device status { help }\n"
 "\n"
 "全デ�イス�状態を表示���。\n"
 "デフォルト���次�項目�表示�れ��。\n"
@@ -2397,11 +2364,10 @@ msgstr ""
 " 状態      - デ�イス�状態\n"
 " 接続 - デ�イス上�アクティブ����る接続��れ��れを表示\n"
 "'--fields' グロー�ルオプションを使用�る��表示��る項目を変更�る�������。\n"
-"'status' �デフォルト�コマンド��'nmcli device' を実行�る� 'nmcli device status' "
-"を実行������り��。\n"
+"'status' �デフォルト�コマンド��'nmcli device' を実行�る� 'nmcli device status' を実行������り��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:731
+#: ../clients/cli/devices.c:764
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2411,8 +2377,7 @@ msgid ""
 "Show details of device(s).\n"
 "The command lists details for all devices, or for a given device.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device show { 引数 | help }\n"
+msgstr "使�方: nmcli device show { 引数 | help }\n"
 "\n"
 "引数 := [<ifname>]\n"
 "\n"
@@ -2420,7 +2385,7 @@ msgstr ""
 "��コマンド�����デ�イス���指定デ�イス�詳細を表示����。\n"
 "\n"
 
-#: ../clients/cli/devices.c:742
+#: ../clients/cli/devices.c:775
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2428,12 +2393,11 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device connect { 引数 | help }\n"
+msgstr "使�方: nmcli device connect { 引数 | help }\n"
 "\n"
 "引数 := <ifname>\n"
 "\n"
@@ -2442,7 +2406,7 @@ msgstr ""
 "auto-connect �設定�れ����接続����も考慮�れ��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:787
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2452,8 +2416,7 @@ msgid ""
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
-msgstr ""
-"使�方: n nmcli device reapply { 引数 | help }\n"
+msgstr "使�方: n nmcli device reapply { 引数 | help }\n"
 "\n"
 "引数 := <ifname>\n"
 "\n"
@@ -2461,7 +2424,7 @@ msgstr ""
 "行��変更��デ�イス�更新を試行���。\n"
 "\n"
 
-#: ../clients/cli/devices.c:765
+#: ../clients/cli/devices.c:798
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2476,13 +2439,12 @@ msgid ""
 "The '-' sign allows removing selected items instead of the whole value.\n"
 "\n"
 "Examples:\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-msgstr ""
-"使�方: nmcli device modify { 引数 | --help }\n"
+msgstr "使�方: nmcli device modify { 引数 | --help }\n"
 "\n"
 "引数 := <ifname> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
@@ -2494,13 +2456,12 @@ msgstr ""
 "'-' 記�を使用�る��値全体������択�れ�アイテムを削除����。\n"
 "\n"
 "例:\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
 "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:785
+#: ../clients/cli/devices.c:818
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2511,8 +2472,7 @@ msgid ""
 "The command disconnects the device and prevents it from auto-activating\n"
 "further connections without user/manual intervention.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device disconnect { 引数 | help }\n"
+msgstr "使�方: nmcli device disconnect { 引数 | help }\n"
 "\n"
 "引数 := <ifname> ...\n"
 "\n"
@@ -2521,7 +2481,7 @@ msgstr ""
 "�れ以��接続�自動アクティベート�れる������り��。\n"
 "\n"
 
-#: ../clients/cli/devices.c:797
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2533,8 +2493,7 @@ msgid ""
 "(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
 "command.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device delete { 引数 | help }\n"
+msgstr "使�方: nmcli device delete { 引数 | help }\n"
 "\n"
 "引数 := <ifname> ...\n"
 "\n"
@@ -2544,7 +2503,7 @@ msgstr ""
 "コマンド�削除����ん。\n"
 "\n"
 
-#: ../clients/cli/devices.c:810
+#: ../clients/cli/devices.c:843
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2556,8 +2515,7 @@ msgid ""
 "\n"
 "Modify device properties.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device set { ARGUMENTS | help }\n"
+msgstr "使�方: nmcli device set { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := DEVICE { PROPERTY [ PROPERTY ... ] }\n"
 "DEVICE    := [ifname] <ifname> \n"
@@ -2567,7 +2525,7 @@ msgstr ""
 "デ�イスプロパティーを変更���。\n"
 "\n"
 
-#: ../clients/cli/devices.c:823
+#: ../clients/cli/devices.c:856
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2578,8 +2536,7 @@ msgid ""
 "This command prints a line whenever the specified devices change state.\n"
 "Monitors all devices in case no interface is specified.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device monitor { 引数 | help }\n"
+msgstr "使�方: nmcli device monitor { 引数 | help }\n"
 "\n"
 "引数 := [<ifname>] ...\n"
 "\n"
@@ -2588,21 +2545,22 @@ msgstr ""
 "インターフェース�指定�れ��場�������デ�イスを監視���。\n"
 "\n"
 
-#: ../clients/cli/devices.c:835
+#: ../clients/cli/devices.c:868
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Perform operation on Wi-Fi devices.\n"
 "\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
+"auto]]\n"
 "\n"
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID. The\n"
 "--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
 "                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -2629,33 +2587,31 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
 "given. Note that this command does not show the APs,\n"
 "use 'nmcli device wifi list' for that.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device wifi { ARGUMENTS | help }\n"
+msgstr "使�方: nmcli device wifi { 引数 | help }\n"
 "\n"
 "Wi-Fi デ�イス上�演算を実行���。\n"
 "\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
+"引数 := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
 "\n"
 "使用�能� Wi-Fi アクセス�イントを一覧表示���。'ifname' オプション� 'bssid' \n"
 "オプションを使用�る��特定�インターフェース用� AP����特定� BSSID を\n"
 "�� AP を一覧表示�る�������。新�� Wi-Fi スキャンをトリガー����\n"
 "����--rescan フラグ�通知���。\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-"                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
-"yes|no]\n"
+"引数 := connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n"
+"                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n"
 "\n"
-"SSID ��� BSSID �指定�� Wi-Fi "
-"�ットワーク�接続���。コマンド�一致�る接続を探������新��接続を作���デ�イス上�アクティベート���。\n"
+"SSID ��� BSSID �指定�� Wi-Fi �ットワーク�接続���。コマンド�一致�る接続を探������新��接続を作���デ�イス上�アクティベート���。\n"
 "�れ��GUI クライアント� SSID をクリック��場����コマンドライン�動作\n"
 "��り��。�ットワーク用�接続����存在�る場���\n"
 "「nmcli con up id <name>�を使��既存�プロファイルを有効��る����能��。\n"
@@ -2663,7 +2619,7 @@ msgstr ""
 "ワーク���サ�ート�れ��る点�注�������。���IP 設定� DHCP �\n"
 "�得�る�������り��。\n"
 "\n"
-"ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
+"引数 := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
 "                     [band a|bg] [channel <channel>] [password <password>]\n"
 "\n"
 "Wi-Fi ホットス�ットを作����。'connection down' ��� 'device disconnect' �\n"
@@ -2676,7 +2632,7 @@ msgstr ""
 "channel - Wi-Fi channel to use\n"
 "password - password to use for the hotspot\n"
 "\n"
-"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
+"引数 := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
 "NetworkManager �直��利用�能�アクセス�イントを�スキャン�る��をリクエ\n"
 "スト���。NetworkManager �定期的� Wi-Fi �ットワークをスキャン�����\n"
@@ -2684,19 +2640,20 @@ msgstr ""
 "SSID をスキャン�る�������表示 SSID � AP �便利��。'ssid' パラメー\n"
 "ター�複数使用����。��コマンド� AP を表示������留�������。\n"
 "表示�る���コマンド� 'nmcli device wifi list' ��。\n"
+"\n"
 
-#: ../clients/cli/devices.c:882
+#: ../clients/cli/devices.c:915
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can "
+"be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
-msgstr ""
-"使�方: nmcli device lldp { 引数 | help }\n"
+msgstr "使�方: nmcli device lldp { 引数 | help }\n"
 "\n"
 "引数 := [list [ifname <ifname>]]\n"
 "\n"
@@ -2704,445 +2661,464 @@ msgstr ""
 "特定�インターフェース�近接デ�イスを一覧表示����。\n"
 "\n"
 
-#: ../clients/cli/devices.c:980
+#: ../clients/cli/devices.c:1013
 #, c-format
 msgid "Error: No interface specified."
 msgstr "エラー: インターフェース�指定�れ����ん。"
 
-#: ../clients/cli/devices.c:1003
+#: ../clients/cli/devices.c:1036
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告: 引数 '%s' ��複�����。\n"
 
-#: ../clients/cli/devices.c:1006
+#: ../clients/cli/devices.c:1039
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "エラー: デ�イス'%s' �見��り��ん。\n"
 
-#: ../clients/cli/devices.c:1007
+#: ../clients/cli/devices.c:1040
 #, c-format
 msgid "Error: not all devices found."
 msgstr "エラー: 一部�デ�イス�見��り��ん。"
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:1071
 msgid "No interface specified"
 msgstr "インターフェース�指定�れ����ん"
 
-#: ../clients/cli/devices.c:1057
+#: ../clients/cli/devices.c:1090
 #, c-format
 msgid "Device '%s' not found"
 msgstr "デ�イス'%s' �見��り��ん"
 
-#: ../clients/cli/devices.c:1153
+#: ../clients/cli/devices.c:1186
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1154
+#: ../clients/cli/devices.c:1187
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1193
+#: ../clients/cli/devices.c:1226
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../clients/cli/devices.c:1194
+#: ../clients/cli/devices.c:1227
 msgid "Infra"
 msgstr "インフラ"
 
-#: ../clients/cli/devices.c:1195 ../src/devices/wifi/nm-device-olpc-mesh.c:133
+#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: ../clients/cli/devices.c:1196
+#: ../clients/cli/devices.c:1229
 msgid "N/A"
 msgstr "��"
 
-#: ../clients/cli/devices.c:1391
+#: ../clients/cli/devices.c:1424
 msgid "Device details"
 msgstr "デ�イス�詳細"
 
-#: ../clients/cli/devices.c:1402
+#: ../clients/cli/devices.c:1435
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "エラー: 'device show': %s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1747
 msgid "Status of devices"
 msgstr "デ�イス�状態"
 
-#: ../clients/cli/devices.c:1704
+#: ../clients/cli/devices.c:1751
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "エラー: 'device status': %s"
 
-#: ../clients/cli/devices.c:1731 ../clients/cli/devices.c:2171
-#: ../clients/cli/devices.c:4145
-#, c-format
-msgid "Error: invalid extra argument '%s'."
-msgstr "エラー:  '%s' �無効�追加引数��。"
-
-#: ../clients/cli/devices.c:1767 ../clients/cli/general.c:519
+#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制�時間� %d 秒�経�"
 
-#: ../clients/cli/devices.c:1816
+#: ../clients/cli/devices.c:1886
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "デ�イス '%s' � '%s' �正常�アクティベート�れ���。\n"
 
-#: ../clients/cli/devices.c:1822
+#: ../clients/cli/devices.c:1891
+#, c-format
+msgid ""
+"Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
+msgstr "ヒント: \"nmcli dev wifi show-password\" ��Wi-Fi ��パスワードを表示���。\n"
+
+#: ../clients/cli/devices.c:1895
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "エラー: 接続�アクティベーション�失敗����: (%d) %s.\n"
 
-#: ../clients/cli/devices.c:1861
+#: ../clients/cli/devices.c:1925
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "エラー: Wi-Fi hotspot �設定�失敗����: %s"
 
-#: ../clients/cli/devices.c:1864
+#: ../clients/cli/devices.c:1928
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "エラー: 新�接続�追加���アクティベート�失敗����: %s"
 
-#: ../clients/cli/devices.c:1867
+#: ../clients/cli/devices.c:1931
 #, c-format
 msgid "Error: Failed to activate connection: %s"
 msgstr "エラー: 接続�アクティベート�失敗����: %s"
 
-#: ../clients/cli/devices.c:1936
+#: ../clients/cli/devices.c:1996
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "エラー: デ�イス�アクティベート�失敗����: %s"
 
-#: ../clients/cli/devices.c:1945
-#, c-format
-msgid "Error: Device activation failed: device was disconnected"
-msgstr "エラー: デ�イス�アクティベート�失敗����: デ�イス�切断�れ���"
-
-#: ../clients/cli/devices.c:1998
+#: ../clients/cli/devices.c:2046
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "エラー: 追加�引数�許��れ����ん: '%s'。"
 
-#: ../clients/cli/devices.c:2071 ../clients/cli/devices.c:2086
-#: ../clients/cli/devices.c:2323
+#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
+#: ../clients/cli/devices.c:2368
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "デ�イス '%s' �正常�切断�れ���。\n"
 
-#: ../clients/cli/devices.c:2074 ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "デ�イス '%s' �正常�削除�れ���。\n"
 
-#: ../clients/cli/devices.c:2136 ../clients/cli/devices.c:2206
+#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "エラー: デ�イス '%s' (%s) ��接続���用�失敗����: %s"
 
-#: ../clients/cli/devices.c:2146 ../clients/cli/devices.c:2215
+#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "接続�デ�イス '%s' �正常���用�れ���。\n"
 
-#: ../clients/cli/devices.c:2240
+#: ../clients/cli/devices.c:2285
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr "エラー: デ�イス '%s' (%s) �ら��用済�接続�読��り�失敗����: %s"
 
-#: ../clients/cli/devices.c:2307
+#: ../clients/cli/devices.c:2352
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "エラー: 一部�デ�イス�切断�れ��ん���。"
 
-#: ../clients/cli/devices.c:2308
+#: ../clients/cli/devices.c:2353
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "エラー: デ�イス '%s' (%s) �切断�失敗����: %s\n"
 
-#: ../clients/cli/devices.c:2388
+#: ../clients/cli/devices.c:2433
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "エラー: 一部�デ�イス�削除�れ��ん���。"
 
-#: ../clients/cli/devices.c:2389
+#: ../clients/cli/devices.c:2434
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "エラー: デ�イス '%s' (%s) �削除�失敗����: %s\n"
 
-#: ../clients/cli/devices.c:2471
+#: ../clients/cli/devices.c:2516
 #, c-format
 msgid "Error: No property specified."
 msgstr "エラー: プロパティー�指定�れ����ん。"
 
-#: ../clients/cli/devices.c:2486 ../clients/cli/devices.c:2503
-#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
+#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
+#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "エラー: '%s' 引数��り��ん。"
 
-#: ../clients/cli/devices.c:2492
+#: ../clients/cli/devices.c:2537
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "エラー: 'managed': %s。"
 
-#: ../clients/cli/devices.c:2509
+#: ../clients/cli/devices.c:2554
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "エラー: '自動接続': %s。"
 
-#: ../clients/cli/devices.c:2517 ../clients/cli/general.c:718
+#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "エラー: プロパティー '%s' ��明��。"
 
-#: ../clients/cli/devices.c:2566
+#: ../clients/cli/devices.c:2611
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s: 接続 '%s' を使用中\n"
 
-#: ../clients/cli/devices.c:2592
+#: ../clients/cli/devices.c:2637
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s: デ�イス�作��れ���\n"
 
-#: ../clients/cli/devices.c:2599
+#: ../clients/cli/devices.c:2644
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s: デ�イス�削除�れ���\n"
 
-#: ../clients/cli/devices.c:2779
+#: ../clients/cli/devices.c:2824
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi スキャン一覧"
 
-#: ../clients/cli/devices.c:2866
+#: ../clients/cli/devices.c:2911
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "エラー: bssid '%s' �アクセス�イント�見��り��ん。"
 
-#: ../clients/cli/devices.c:3022
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../clients/cli/devices.c:3040
+#: ../clients/cli/devices.c:3087
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
 msgstr "エラー: 無効��スキャン引数��: '%s' � [auto�no�yes] ���り��ん"
 
-#: ../clients/cli/devices.c:3047
+#: ../clients/cli/devices.c:3094
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "エラー: デ�イス'%s' �見��り��ん"
 
-#: ../clients/cli/devices.c:3058
+#: ../clients/cli/devices.c:3105
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
-msgstr ""
-"エラー: デ�イス '%s' � Wi-Fi デ�イス����識�れ��ん���。NetworkManager Wi-Fi "
-"プラグインを確�������。"
+msgstr "エラー: デ�イス '%s' � Wi-Fi デ�イス����識�れ��ん���。NetworkManager Wi-Fi プラグインを確�������。"
 
-#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3322
-#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3983
+#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
+#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
+#: ../clients/cli/devices.c:4266
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "エラー: デ�イス '%s' � Wi-Fi デ�イス���り��ん。"
 
-#: ../clients/cli/devices.c:3171
+#: ../clients/cli/devices.c:3277
 msgid "SSID or BSSID: "
 msgstr "SSID ��� BSSID: "
 
-#: ../clients/cli/devices.c:3176
+#: ../clients/cli/devices.c:3282
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "エラー: SSID ��� BSSID ��り��ん。"
 
-#: ../clients/cli/devices.c:3213
+#: ../clients/cli/devices.c:3319
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "エラー: bssid �引数値 '%s' ��有効� BSSID ���り��ん。"
 
-#: ../clients/cli/devices.c:3243
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr "エラー: wep-key-type �引数値 '%s' �無効��。'key' ��� 'phrase' を使用������。"
 
-#: ../clients/cli/devices.c:3270 ../clients/cli/devices.c:3288
+#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
 #, c-format
 msgid "Error: %s: %s."
 msgstr "エラー: %s: %s。"
 
-#: ../clients/cli/devices.c:3305
+#: ../clients/cli/devices.c:3413
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "エラー: (%s) �接続先��る BSSID ��bssid 引数 (%s) �より異�り��。"
 
-#: ../clients/cli/devices.c:3311
+#: ../clients/cli/devices.c:3419
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "エラー: パラメーター '%s' ��SSID�BSSID ���れ�も�り��ん。"
 
-#: ../clients/cli/devices.c:3324 ../clients/cli/devices.c:3825
-#: ../clients/cli/devices.c:3985
+#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
+#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "エラー: Wi-Fi デ�イス�見��り��ん���。"
 
-#: ../clients/cli/devices.c:3344
+#: ../clients/cli/devices.c:3452
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "エラー: �表示� SSID �スキャン�失敗����: %s。"
 
-#: ../clients/cli/devices.c:3371
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "エラー: SSID � '%s' ��ットワーク�見��り��ん���。"
 
-#: ../clients/cli/devices.c:3373
+#: ../clients/cli/devices.c:3481
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "エラー: BSSID � '%s' �アクセス�イント�見��り��ん���。"
 
-#: ../clients/cli/devices.c:3401
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Connection '%s' exists but properties don't match."
 msgstr "エラー: 接続 '%s' �存在�����プロパティー�一致���ん。"
 
-#: ../clients/cli/devices.c:3444
+#: ../clients/cli/devices.c:3551
 #, 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:3481
+#: ../clients/cli/devices.c:3588
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../clients/cli/devices.c:3644
+#: ../clients/cli/devices.c:3729
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "'%s' �有効� WPA PSK ���り��ん"
 
-#: ../clients/cli/devices.c:3661
+#: ../clients/cli/devices.c:3746
 #, 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:3677
+#: ../clients/cli/devices.c:3762
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "ホットス�ット�パスワード: %s\n"
 
-#: ../clients/cli/devices.c:3748
+#: ../clients/cli/devices.c:3927
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "エラー: ssid �長����。"
 
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3942
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr "エラー: �ンド引数値 '%s' �無効��。'a' ��� 'bg' を使用������。"
 
-#: ../clients/cli/devices.c:3787
-#, c-format
-msgid "Error: Unknown parameter %s."
-msgstr "エラー: �明�パラメータ %s ��。"
-
-#: ../clients/cli/devices.c:3807
+#: ../clients/cli/devices.c:3989
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "エラー: �ャ�ル���ンドも必���。"
 
-#: ../clients/cli/devices.c:3812
+#: ../clients/cli/devices.c:3994
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "エラー: �ャン�ル '%s' ���ンド '%s' �対��有効���り��ん。"
 
-#: ../clients/cli/devices.c:3836
+#: ../clients/cli/devices.c:4019
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "エラー: デ�イス '%s' ��AP ���アドホックモード���れもサ�ート���ん。"
 
-#: ../clients/cli/devices.c:3870
+#: ../clients/cli/devices.c:4041
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "エラー: 無効�パスワード: %s。"
 
-#: ../clients/cli/devices.c:3946
+#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "エラー: '%s' を繰り返��������ん。"
 
+#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
+#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
+msgid "Security"
+msgstr "セキュリティー"
+
+#: ../clients/cli/devices.c:4227
+msgid "None"
+msgstr "��"
+
+#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:333
+#: ../clients/common/nm-secret-agent-simple.c:366
+#: ../clients/common/nm-secret-agent-simple.c:903
+#: ../clients/common/nm-secret-agent-simple.c:938
+#: ../clients/common/nm-secret-agent-simple.c:961
+#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:114
+#: ../clients/common/nm-vpn-helpers.c:120
+#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
+#: ../clients/tui/nmt-page-wifi.c:330
+msgid "Password"
+msgstr "パスワード"
+
+#: ../clients/cli/devices.c:4355
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #. Main header name
-#: ../clients/cli/devices.c:4051
+#: ../clients/cli/devices.c:4411
 msgid "Device LLDP neighbors"
 msgstr "LLDP 近接デ�イス"
 
-#: ../clients/cli/devices.c:4161
+#: ../clients/cli/devices.c:4521
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "エラー: 'device lldp list': %s"
 
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:27
 msgid "asleep"
 msgstr "休止中"
 
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:28
 msgid "connecting"
 msgstr "接続中"
 
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:29
 msgid "connected (local only)"
 msgstr "接続完了 (ローカル��)"
 
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:30
 msgid "connected (site only)"
 msgstr "接続完了 (サイト��)"
 
-#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
+#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr "接続済�"
 
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:32
 msgid "disconnecting"
 msgstr "切断中"
 
-#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
+#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr "切断済�"
 
-#: ../clients/cli/general.c:138
+#: ../clients/cli/general.c:124
 msgid "auth"
 msgstr "�証"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:152
 msgid "running"
 msgstr "実行中"
 
-#: ../clients/cli/general.c:180
+#: ../clients/cli/general.c:166
 msgid "starting"
 msgstr "起動中"
 
-#: ../clients/cli/general.c:180
+#: ../clients/cli/general.c:166
 msgid "started"
 msgstr "起動����"
 
-#: ../clients/cli/general.c:214
+#: ../clients/cli/general.c:200
 msgid "enabled"
 msgstr "有効"
 
-#: ../clients/cli/general.c:214
+#: ../clients/cli/general.c:200
 msgid "disabled"
 msgstr "無効"
 
-#: ../clients/cli/general.c:332
+#: ../clients/cli/general.c:318
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3157,8 +3133,7 @@ msgid ""
 "\n"
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
-msgstr ""
-"使�方: nmcli general { コマンド | help }\n"
+msgstr "使�方: nmcli general { コマンド | help }\n"
 "\n"
 "コマンド := { status | hostname | permissions | logging }\n"
 "\n"
@@ -3171,7 +3146,7 @@ msgstr ""
 "  logging [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
 
-#: ../clients/cli/general.c:343
+#: ../clients/cli/general.c:329
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3180,14 +3155,13 @@ msgid ""
 "'status' is the default action, which means 'nmcli gen' calls 'nmcli gen "
 "status'\n"
 "\n"
-msgstr ""
-"使�方: nmcli general status { help }\n"
+msgstr "使�方: nmcli general status { help }\n"
 "\n"
 "NetworkManager �全般情報を表示���。\n"
 "'status' �デフォルト�動作��る���'nmcli gen' を実行�る� 'nmcli gen status' を実行������り��。\n"
 "\n"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:338
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3196,11 +3170,10 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
 "\n"
-"\n"
-msgstr ""
-"使�方: nmcli general hostname { 引数 | help }\n"
+msgstr "使�方: nmcli general hostname { 引数 | help }\n"
 "\n"
 "引数 := [<ホスト�>]\n"
 "\n"
@@ -3209,20 +3182,77 @@ msgstr ""
 "渡�����ホスト�をシステム�永続的�ホスト����新��設定���。\n"
 "\n"
 
-#: ../clients/cli/general.c:364
+#: ../clients/cli/general.c:350
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
 "\n"
 "Show caller permissions for authenticated operations.\n"
 "\n"
-msgstr ""
-"使�方: nmcli general permissions { help }\n"
+msgstr "使�方: nmcli general permissions { help }\n"
 "\n"
 "�証�れ��る�作�対�る呼�出���パーミッションを表示���。\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:358
+#, c-format
+msgid ""
+"Usage: nmcli general reload { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<flag>[,<flag>...]]\n"
+"\n"
+"Reload NetworkManager's configuration and perform certain updates, like\n"
+"flushing caches or rewriting external state to disk. This is similar to\n"
+"sending SIGHUP to NetworkManager but it allows for more fine-grained\n"
+"control over what to reload through the flags argument. It also allows\n"
+"non-root access via PolicyKit and contrary to signals it is synchronous.\n"
+"\n"
+"Available flags are:\n"
+"\n"
+"  'conf'        Reload the NetworkManager.conf configuration from\n"
+"                disk. Note that this does not include connections, which\n"
+"                can be reloaded through 'nmcli connection reload' instead.\n"
+"\n"
+"  'dns-rc'      Update DNS configuration, which usually involves writing\n"
+"                /etc/resolv.conf anew.\n"
+"\n"
+"  'dns-full'    Restart the DNS plugin. This is for example useful when\n"
+"                using dnsmasq plugin, which uses additional configuration\n"
+"                in /etc/NetworkManager/dnsmasq.d. If you edit those files,\n"
+"                you can restart the DNS plugin. This action shortly\n"
+"                interrupts name resolution.\n"
+"\n"
+"With no flags, everything that is supported is reloaded, which is\n"
+"identical to sending a SIGHUP.\n"
+msgstr "使�方: nmcli general reload { 引数 | help }\n"
+"\n"
+"引数 := [<flag>[,<flag>...]]\n"
+"\n"
+"NetworkManager �設定を�ロード��キャッシュ�フラッシュ���ディスク��\n"
+"外部状態�書������特定�更新を実行���。�れ� SIGHUP を NetworkManager \n"
+"��信�る���似������フラグ引数を介��何を�ロード�る�をより��細��\n"
+"制御����。���PolicyKit を介���ルートアクセスを許���\n"
+"信����対��期���。\n"
+"\n"
+"利用�能�フラグ�以下���り��:\n"
+"\n"
+"  'conf'        ディスク�ら NetworkManager.conf 設定を\n"
+"                �ロード���。�れ��接続���れ�����注�������。\n"
+"                代�り� 'nmcli connection reload' を使用���ロード����。\n"
+"\n"
+"  'dns-rc'      DNS 構�を更新���。�れ��通常�/etc/resolv.conf \n"
+"                �新��書�込����れ��。\n"
+"\n"
+"  'dns-full'    DNS プラグインを�起動���。�れ������\n"
+"                /etc/NetworkManager/dnsmasq.d �追加設定を使用�る\n"
+"                dnsmasq プラグインを使用�る場��便利��。�れら�\n"
+"                ファイルを編集��ら�DNS プラグインを�起動����。\n"
+"                ��アクション�������解決を中断���。\n"
+"\n"
+"フラグ�����サ�ート�れ��るも������ロード�れ��。�れ��\n"
+"SIGHUP を�信�る�������。\n"
+
+#: ../clients/cli/general.c:390
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3236,8 +3266,7 @@ msgid ""
 "page\n"
 "for the list of possible logging domains.\n"
 "\n"
-msgstr ""
-"使�方: nmcli general logging { 引数 | help }\n"
+msgstr "使�方: nmcli general logging { 引数 | help }\n"
 "\n"
 "引数 := [level <ログレベル>] [domains <ログドメイン>]\n"
 "\n"
@@ -3247,7 +3276,7 @@ msgstr ""
 "使用��るログ記録�ドメイン一覧����� man ページを�照������。\n"
 "\n"
 
-#: ../clients/cli/general.c:385
+#: ../clients/cli/general.c:403
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3260,8 +3289,7 @@ msgid ""
 "\n"
 "  connectivity [check]\n"
 "\n"
-msgstr ""
-"使�方: nmcli networking { コマンド | help }\n"
+msgstr "使�方: nmcli networking { コマンド | help }\n"
 "\n"
 "コマンド := { [ on | off | connectivity ] }\n"
 "\n"
@@ -3272,9 +3300,10 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:395
+#: ../clients/cli/general.c:413
 #, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
@@ -3283,9 +3312,10 @@ msgstr "使�方: nmcli networking on { help }\n"
 "�ットワークをオン�切り替���。\n"
 "\n"
 
-#: ../clients/cli/general.c:403
+#: ../clients/cli/general.c:421
 #, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
@@ -3294,7 +3324,7 @@ msgstr "使�方: nmcli networking off { help }\n"
 "�ットワークをオフ�切り替���。\n"
 "\n"
 
-#: ../clients/cli/general.c:411
+#: ../clients/cli/general.c:429
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3302,18 +3332,18 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
 "\n"
-msgstr ""
-"使�方: nmcli networking connectivity { 引数 | help }\n"
+msgstr "使�方: nmcli networking connectivity { 引数 | help }\n"
 "\n"
 "引数�種類 := [check]\n"
 "\n"
 "�ットワーク�接続状態を�得���。\n"
 "オプション� 'check' 引数を付�る�接続を��ェック���。\n"
+"\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3322,15 +3352,14 @@ msgid ""
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
-msgstr ""
-"使�方: nmcli radio { コマンド | help }\n"
+msgstr "使�方: nmcli radio { コマンド | help }\n"
 "\n"
 "コマンド := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:432
+#: ../clients/cli/general.c:450
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3339,15 +3368,14 @@ msgid ""
 "\n"
 "Get status of all radio switches, or turn them on/off.\n"
 "\n"
-msgstr ""
-"使�方: nmcli radio all { 引数 | help }\n"
+msgstr "使�方: nmcli radio all { 引数 | help }\n"
 "\n"
 "引数�種類 := [on | off]\n"
 "\n"
 "����ラジオスイッ��状態を�得����オン�オフ����。\n"
 "\n"
 
-#: ../clients/cli/general.c:442
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3356,15 +3384,14 @@ msgid ""
 "\n"
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
-msgstr ""
-"使�方: nmcli radio wifi { 引数 | help }\n"
+msgstr "使�方: nmcli radio wifi { 引数 | help }\n"
 "\n"
 "引数 := [on | off]\n"
 "\n"
 "Wi-Fi ラジオスイッ��状態を�得����オン�オフ����。\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:470
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3373,15 +3400,14 @@ msgid ""
 "\n"
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
-msgstr ""
-"使�方: nmcli radio wwan { 引数 | help }\n"
+msgstr "使�方: nmcli radio wwan { 引数 | help }\n"
 "\n"
 "引数 := [on | off]\n"
 "\n"
 "モ�イルブロード�ンド�ラジオスイッ��状態を�得����オン�オフ����。\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:480
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3389,185 +3415,223 @@ msgid ""
 "Monitor NetworkManager changes.\n"
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
-msgstr ""
-"使�方: nmcli monitor\n"
+msgstr "使�方: nmcli monitor\n"
 "\n"
 "NetworkManager �変更を監視���。\n"
 "NetworkManager �変更�行�れる���行を出力���。\n"
 "\n"
 
-#: ../clients/cli/general.c:492
+#: ../clients/cli/general.c:510
 msgid "NetworkManager status"
 msgstr "NetworkManager �ステータス"
 
-#: ../clients/cli/general.c:496
+#: ../clients/cli/general.c:514
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "エラー: 使用��る��次�フィールド����: %s"
 
-#: ../clients/cli/general.c:549
+#: ../clients/cli/general.c:567
 msgid "NetworkManager permissions"
 msgstr "NetworkManager �パーミッション"
 
-#: ../clients/cli/general.c:553
+#: ../clients/cli/general.c:571
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "エラー: 'general permissions': %s"
 
-#: ../clients/cli/general.c:642
+#: ../clients/cli/general.c:664
+#, c-format
+msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
+msgstr "エラー: �ロードフラグ '%s' �無効��。許��れ�フラグ�以下���り��: %s"
+
+#: ../clients/cli/general.c:674
+#, c-format
+msgid "Error: extra argument '%s'"
+msgstr "エラー: 追加�引数 '%s'"
+
+#: ../clients/cli/general.c:688
+#, c-format
+msgid "Error: failed to reload: %s"
+msgstr "エラー: �ロード�失敗����: %s"
+
+#: ../clients/cli/general.c:727
 msgid "NetworkManager logging"
 msgstr "NetworkManager �ロギング"
 
-#: ../clients/cli/general.c:646
+#: ../clients/cli/general.c:731
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "エラー: 'general logging': %s"
 
-#: ../clients/cli/general.c:728
+#: ../clients/cli/general.c:813
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "エラー: ロギング�設定�失敗����: %s"
 
-#: ../clients/cli/general.c:745
+#: ../clients/cli/general.c:830
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "エラー: ホスト��設定�失敗����: %s"
 
-#: ../clients/cli/general.c:814
+#: ../clients/cli/general.c:900
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "エラー: '--fields' �値 '%s' �����無効�� (使用��るフィールド: %s)"
 
-#: ../clients/cli/general.c:839
+#: ../clients/cli/general.c:925
 #, 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:887 ../clients/cli/general.c:899
+#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
 msgid "Connectivity"
 msgstr "接続性"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:988
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "エラー: 'networking' �コマンド '%s' ��有効�コマンド���り��ん。"
 
-#: ../clients/cli/general.c:916
+#: ../clients/cli/general.c:1002
 msgid "Networking"
 msgstr "�ットワーキング"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:951
+#: ../clients/cli/general.c:1037
 msgid "Radio switches"
 msgstr "ラジオスイッ�"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:981
+#: ../clients/cli/general.c:1067
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi ラジオスイッ�"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1008
+#: ../clients/cli/general.c:1094
 msgid "WWAN radio switch"
 msgstr "WWAN ラジオスイッ�"
 
-#: ../clients/cli/general.c:1056
+#: ../clients/cli/general.c:1142
 msgid "NetworkManager has started"
 msgstr "NetworkManager  �起動�れ���"
 
-#: ../clients/cli/general.c:1056
+#: ../clients/cli/general.c:1142
 msgid "NetworkManager has stopped"
 msgstr "NetworkManager ��止����"
 
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1153
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "ホスト�� '%s' �設定�れ���\n"
 
-#: ../clients/cli/general.c:1082
+#: ../clients/cli/general.c:1168
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "'%s' �プライマリー接続��\n"
 
-#: ../clients/cli/general.c:1084
+#: ../clients/cli/general.c:1170
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "プライマリー接続��り��ん\n"
 
-#: ../clients/cli/general.c:1096
+#: ../clients/cli/general.c:1182
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "接続性� '%s' ��\n"
 
-#: ../clients/cli/general.c:1110
+#: ../clients/cli/general.c:1196
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "Networkmanager �状態� '%s' ��\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1216
 msgid "connection available"
 msgstr "接続�利用�能"
 
-#: ../clients/cli/general.c:1132
+#: ../clients/cli/general.c:1218
 msgid "connections available"
 msgstr "接続�利用�能"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1236
 msgid "autoconnect"
 msgstr "自動接続"
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1238
 msgid "fw missing"
 msgstr "fw ��り��ん"
 
-#: ../clients/cli/general.c:1157
+#: ../clients/cli/general.c:1243
 msgid "plugin missing"
 msgstr "プラグイン��り��ん"
 
-#: ../clients/cli/general.c:1162
+#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
+msgid "sw disabled"
+msgstr "sw �無効化�れ���"
+
+#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
+msgid "hw disabled"
+msgstr "hw �無効化�れ���"
+
+#: ../clients/cli/general.c:1283
 msgid "sw"
 msgstr "sw"
 
-#: ../clients/cli/general.c:1164
+#: ../clients/cli/general.c:1285
 msgid "hw"
 msgstr "hw"
 
-#: ../clients/cli/general.c:1169
+#: ../clients/cli/general.c:1290
 msgid "iface"
 msgstr "iface"
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1293
 msgid "port"
 msgstr "�ート"
 
-#: ../clients/cli/general.c:1175
+#: ../clients/cli/general.c:1296
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1313
 msgid "master"
 msgstr "マスター"
 
-#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:247
-#: ../clients/tui/nmt-connect-connection-list.c:406
+#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
+#: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1198
+#: ../clients/cli/general.c:1319
 msgid "ip4 default"
 msgstr "ip4 デフォルト"
 
-#: ../clients/cli/general.c:1200
+#: ../clients/cli/general.c:1321
 msgid "ip6 default"
 msgstr "ip6 デフォルト"
 
-#: ../clients/cli/general.c:1282
+#: ../clients/cli/general.c:1403
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN 接続"
 
-#: ../clients/cli/general.c:1350
+#. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
+#. * "<interface-name>: <device-state> to <connection-id>"
+#: ../clients/cli/general.c:1423
+#, c-format
+msgctxt "nmcli-overview"
+msgid "%s: %s to %s"
+msgstr "%s: %s �ら %s"
+
+#. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
+#. * "<interface-name>: <device-state>"
+#: ../clients/cli/general.c:1430
+#, c-format
+msgctxt "nmcli-overview"
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../clients/cli/general.c:1480
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3576,22 +3640,21 @@ msgid ""
 "\n"
 "Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
-msgstr ""
-"既知�デ�イス�関�る情報を�得�る���\"nmcli device show\" を使用���。\n"
+msgstr "既知�デ�イス�関�る情報を�得�る���\"nmcli device show\" を使用���。\n"
 "アクティブ�接続プロファイル�概�を�得�る���\"nmcli connection show\" を使用���。\n"
 "\n"
 "使用方法�詳細情報������nmcli(1) � nmcli-examples(7) � man ページを�照������。\n"
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1501
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "エラー: 'monitor' コマンド '%s' �有効���り��ん。"
 
-#: ../clients/cli/general.c:1383
+#: ../clients/cli/general.c:1513
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "Networkmanager �実行�れ����ん (待機中)\n"
 
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:230
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -3622,14 +3685,12 @@ msgid ""
 "  a[gent]         NetworkManager secret agent or polkit agent\n"
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
-msgstr ""
-"使�方: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
+msgstr "使�方: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -a, --ask                                ask for missing parameters\n"
 "  -c, --colors auto|yes|no                 whether to use colors in output\n"
-"  -e, --escape yes|no                      escape columns separators in "
-"values\n"
+"  -e, --escape yes|no                      escape columns separators in values\n"
 "  -f, --fields <field,...>|all|common      specify fields to output\n"
 "  -g, --get-values <field,...>|all|common  shortcut for -m tabular -t -f\n"
 "  -h, --help                               print this help\n"
@@ -3639,8 +3700,7 @@ msgstr ""
 "  -s, --show-secrets                       allow displaying passwords\n"
 "  -t, --terse                              terse output\n"
 "  -v, --version                            show program version\n"
-"  -w, --wait <seconds>                     set timeout waiting for finishing "
-"operations\n"
+"  -w, --wait <seconds>                     set timeout waiting for finishing operations\n"
 "\n"
 "OBJECT\n"
 "  g[eneral]       NetworkManager's general status and operations\n"
@@ -3652,855 +3712,853 @@ msgstr ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:324
+#: ../clients/cli/nmcli.c:310
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用�引数��り��ん。"
 
-#: ../clients/cli/nmcli.c:625
+#: ../clients/cli/nmcli.c:618
 #, c-format
 msgid "Unexpected end of file following '%s'\n"
 msgstr "'%s' �続��予期��ファイル�終了\n"
 
-#: ../clients/cli/nmcli.c:633
+#: ../clients/cli/nmcli.c:626
 #, c-format
 msgid "Expected whitespace following '%s'\n"
 msgstr "'%s' �続��必��ホワイトスペース\n"
 
-#: ../clients/cli/nmcli.c:645
+#: ../clients/cli/nmcli.c:638
 #, c-format
 msgid "Expected a value for '%s'\n"
 msgstr "'%s' ��値�必���\n"
 
-#: ../clients/cli/nmcli.c:659
+#: ../clients/cli/nmcli.c:652
 #, c-format
 msgid "Expected a line break following '%s'\n"
 msgstr "'%s' �続�改行�必���\n"
 
-#: ../clients/cli/nmcli.c:748
+#: ../clients/cli/nmcli.c:741
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "エラー: オプション '--terse' �二度指定�れ����。"
 
-#: ../clients/cli/nmcli.c:753
+#: ../clients/cli/nmcli.c:746
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "エラー: オプション '--terse' � '--pretty' �相互�排他的��。"
 
-#: ../clients/cli/nmcli.c:761
+#: ../clients/cli/nmcli.c:754
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "エラー: オプション '--pretty' �二度指定�れ����。"
 
-#: ../clients/cli/nmcli.c:766
+#: ../clients/cli/nmcli.c:759
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "エラー: オプション '--pretty' � '--terse' �相互�排他的��。"
 
-#: ../clients/cli/nmcli.c:781
+#: ../clients/cli/nmcli.c:774
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "エラー: '%s' ��'%s' オプション�有効�引数���り��ん。"
 
-#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
+#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' ��'%s' オプション用�有効�引数���り��ん。"
 
-#: ../clients/cli/nmcli.c:831
+#: ../clients/cli/nmcli.c:824
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "エラー: '%s' �有効�タイムアウト���り��ん。"
 
-#: ../clients/cli/nmcli.c:838
+#: ../clients/cli/nmcli.c:831
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール��ージョン %s\n"
 
-#: ../clients/cli/nmcli.c:846
+#: ../clients/cli/nmcli.c:839
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "エラー: オプション '%s' ��明��。'nmcli -help' �確�������。"
 
-#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
+#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "エラー: nmcli �シグナル %s (%d) �終了����"
 
-#: ../clients/cli/nmcli.c:975
+#: ../clients/cli/nmcli.c:968
 msgid "Success"
 msgstr "�功"
 
-#: ../clients/cli/polkit-agent.c:68
+#: ../clients/cli/polkit-agent.c:54
 #, c-format
 msgid "Authentication message: %s\n"
 msgstr "�証メッセージ: %s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:62
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "�証エラー: %s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:122
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告: polkit エージェント��期化�失敗����: %s\n"
 
-#: ../clients/cli/settings.c:46
+#: ../clients/cli/settings.c:32
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "'%s' を '%s' �設定����? [yes]: "
 
-#: ../clients/cli/settings.c:48
+#: ../clients/cli/settings.c:34
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "'%s' も消去����? [yes]: "
 
-#: ../clients/cli/settings.c:243
+#: ../clients/cli/settings.c:229
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr "警告: %s.%s � '%s' �設定�れ�����インフラストラク�ャモード��無視�れる����り��\n"
 
-#: ../clients/cli/settings.c:262
+#: ../clients/cli/settings.c:248
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr "警告: %s.%s を設定�る���ipv4 � ipv6 �設定を削除�る必���り��\n"
 
-#: ../clients/cli/settings.c:264
+#: ../clients/cli/settings.c:250
 msgid "Do you want to remove them? [yes] "
 msgstr "削除����? [yes] "
 
-#: ../clients/cli/settings.c:352
+#: ../clients/cli/settings.c:338
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "警告: %s �既存�接続プロファイル� UUID ���り��ん\n"
 
-#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
+#: ../clients/cli/settings.c:343 ../clients/cli/settings.c:356
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "'%s' � VPN 接続プロファイル���り��ん"
 
-#: ../clients/cli/settings.c:364
+#: ../clients/cli/settings.c:350
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "'%s' �既存�プロファイル������り��ん"
 
-#: ../clients/cli/settings.c:408
+#: ../clients/cli/settings.c:394
 #, c-format
 msgid "Warning: %s\n"
 msgstr "警告: %s\n"
 
-#: ../clients/cli/settings.c:411
+#: ../clients/cli/settings.c:397
 #, c-format
 msgid "Info: %s\n"
 msgstr "情報: %s\n"
 
-#: ../clients/cli/settings.c:504
+#: ../clients/cli/settings.c:490
 msgid "don't know how to get the property value"
 msgstr "プロパティー値��得方法���り��ん"
 
-#: ../clients/cli/settings.c:593
+#: ../clients/cli/settings.c:580
 msgid "the property can't be changed"
 msgstr "��プロパティー�変更����ん"
 
-#: ../clients/cli/settings.c:671
+#: ../clients/cli/settings.c:658
 msgid "[NM property description]"
 msgstr "[NM プロパティー�詳細]"
 
-#: ../clients/cli/settings.c:681
+#: ../clients/cli/settings.c:668
 msgid "[nmcli specific description]"
 msgstr "[nmcli 固有�詳細]"
 
-#: ../clients/cli/utils.c:318
+#: ../clients/cli/utils.c:304
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "エラー: 引数 '%s' �必�����'%s' �指定�れ���。"
 
-#: ../clients/cli/utils.c:321
+#: ../clients/cli/utils.c:307
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "エラー: 予期���引数 '%s' ��"
 
-#: ../clients/cli/utils.c:709
+#: ../clients/cli/utils.c:695
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "無効�フィールド '%s%s%s'。��よ��フィールド��り��ん"
 
-#: ../clients/cli/utils.c:713
+#: ../clients/cli/utils.c:699
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "無効�フィールド '%s%s%s'。使用��るフィールド: [%s]"
 
-#: ../clients/cli/utils.c:809
+#: ../clients/cli/utils.c:795
 #, c-format
 msgid "failure to select field"
 msgstr "フィールド��択�失敗����"
 
-#: ../clients/cli/utils.c:1438
+#: ../clients/cli/utils.c:1424
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "nmcli 出力�読�込�中�エラー�発生����: %s\n"
 
-#: ../clients/cli/utils.c:1443
+#: ../clients/cli/utils.c:1429
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "nmcli 出力�書�込�中�エラー�発生����: %s\n"
 
-#: ../clients/cli/utils.c:1469
+#: ../clients/cli/utils.c:1455
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "ページャーパイプ�作��失敗����: %s\n"
 
-#: ../clients/cli/utils.c:1478
+#: ../clients/cli/utils.c:1464
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "ページャー�フォーク�失敗����: %s\n"
 
-#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
+#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "ページャーパイプ�複製�失敗����: %s\n"
 
-#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4123
+#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
 msgid "on"
 msgstr "オン"
 
-#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4125
+#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
 msgid "off"
 msgstr "オフ"
 
-#: ../clients/cli/utils.h:329
+#: ../clients/cli/utils.h:323
 #, c-format
 msgid "%lld (%s)"
 msgstr "%lld (%s)"
 
-#: ../clients/cli/utils.h:336
+#: ../clients/cli/utils.h:330
 #, 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:121
-#: ../clients/common/nm-client-utils.c:152
+#.
+#: ../clients/common/nm-client-utils.c:107
+#: ../clients/common/nm-client-utils.c:138
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "'%s' ��明瞭�� (%s)"
 
-#: ../clients/common/nm-client-utils.c:131
+#: ../clients/common/nm-client-utils.c:117
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' �無効��。[%s] � [%s] を使用������"
 
-#: ../clients/common/nm-client-utils.c:164
+#: ../clients/common/nm-client-utils.c:150
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "'%s' �無効��。[%s]�[%s]���� [%s] を使用������"
 
-#: ../clients/common/nm-client-utils.c:213
+#: ../clients/common/nm-client-utils.c:199
 #, c-format
 msgid "'%s' is ambiguous: %s"
 msgstr "'%s' ��明瞭��: %s"
 
-#: ../clients/common/nm-client-utils.c:223
+#: ../clients/common/nm-client-utils.c:209
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "����り��ん�[%s] ������れ��試��������"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:251
 msgid "unmanaged"
 msgstr "管�無�"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:252
 msgid "unavailable"
 msgstr "利用��"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:254
 msgid "connecting (prepare)"
 msgstr "接続中 (準備)"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:255
 msgid "connecting (configuring)"
 msgstr "接続中 (設定中)"
 
-#: ../clients/common/nm-client-utils.c:270
+#: ../clients/common/nm-client-utils.c:256
 msgid "connecting (need authentication)"
 msgstr "接続中 (�証�必�)"
 
-#: ../clients/common/nm-client-utils.c:271
+#: ../clients/common/nm-client-utils.c:257
 msgid "connecting (getting IP configuration)"
 msgstr "接続中 (IP 設定を�得中)"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:258
 msgid "connecting (checking IP connectivity)"
 msgstr "接続中 (IP �接続性�ェック)"
 
-#: ../clients/common/nm-client-utils.c:273
+#: ../clients/common/nm-client-utils.c:259
 msgid "connecting (starting secondary connections)"
 msgstr "接続中 (セカンダリー接続を開始)"
 
-#: ../clients/common/nm-client-utils.c:276
+#: ../clients/common/nm-client-utils.c:262
 msgid "connection failed"
 msgstr "接続�失敗"
 
-#: ../clients/common/nm-client-utils.c:284
+#: ../clients/common/nm-client-utils.c:270
 msgid "yes (guessed)"
 msgstr "�� (推測)"
 
-#: ../clients/common/nm-client-utils.c:285
+#: ../clients/common/nm-client-utils.c:271
 msgid "no (guessed)"
 msgstr "��� (推測)"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:291
-#: ../clients/common/nm-client-utils.c:364 ../libnm/nm-device.c:1438
+#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
 msgid "Unknown"
 msgstr "�明"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:278
 msgid "No reason given"
 msgstr "原因�明"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:280
 msgid "Device is now managed"
 msgstr "デ�イス�管�下�置�れ���"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:281
 msgid "Device is now unmanaged"
 msgstr "デ�イス�管�下�ら外れ���"
 
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:282
 msgid "The device could not be readied for configuration"
 msgstr "デ�イス�設定準備�����ん���"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:283
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr "IP 設定を確�����ん��� (利用�能�アドレス����タイムアウト��)"
 
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:284
 msgid "The IP configuration is no longer valid"
 msgstr "�� IP 設定�無効��り���"
 
-#: ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-client-utils.c:285
 msgid "Secrets were required, but not provided"
 msgstr "シークレット�必�����入力�れ��ん���"
 
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:286
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X サプリカント�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:287
 msgid "802.1X supplicant configuration failed"
 msgstr "802.1X サプリカント�設定�失敗����"
 
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:288
 msgid "802.1X supplicant failed"
 msgstr "802.1X サプリカント�失敗����"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:289
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X サプリカント��証�時間���り�����"
 
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:290
 msgid "PPP service failed to start"
 msgstr "PPP サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:291
 msgid "PPP service disconnected"
 msgstr "PPP サービス�接続�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:292
 msgid "PPP failed"
 msgstr "PPP �失敗"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:293
 msgid "DHCP client failed to start"
 msgstr "DHCP クライアント�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:294
 msgid "DHCP client error"
 msgstr "DHCP クライアントエラー"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:295
 msgid "DHCP client failed"
 msgstr "DHCP クライアント�失敗"
 
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:296
 msgid "Shared connection service failed to start"
 msgstr "共有接続サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:297
 msgid "Shared connection service failed"
 msgstr "共有接続サービス�失敗"
 
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:298
 msgid "AutoIP service failed to start"
 msgstr "AutoIP サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:299
 msgid "AutoIP service error"
 msgstr "AutoIP サービスエラー"
 
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:300
 msgid "AutoIP service failed"
 msgstr "AutoIP サービス�失敗"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:301
 msgid "The line is busy"
 msgstr "回線�使用中��"
 
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:302
 msgid "No dial tone"
 msgstr "ダイアル音��り��ん"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:303
 msgid "No carrier could be established"
 msgstr "確立��るキャリア��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:304
 msgid "The dialing request timed out"
 msgstr "ダイアル�求�タイムアウト����"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:305
 msgid "The dialing attempt failed"
 msgstr "ダイアル�試行�失敗����"
 
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:306
 msgid "Modem initialization failed"
 msgstr "モデム��期化�失敗����"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:307
 msgid "Failed to select the specified APN"
 msgstr "指定�れ� APN ��択�失敗����"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:308
 msgid "Not searching for networks"
 msgstr "�ットワーク検索を�����ん"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:309
 msgid "Network registration denied"
 msgstr "�ットワーク�登録�拒��れ���"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:310
 msgid "Network registration timed out"
 msgstr "�ットワーク�登録�タイムアウト��り���"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:311
 msgid "Failed to register with the requested network"
 msgstr "�求�れ��ットワーク��登録�失敗����"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:312
 msgid "PIN check failed"
 msgstr "PIN 確��失敗����"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:313
 msgid "Necessary firmware for the device may be missing"
 msgstr "��デ�イス�必��ファームウェア����能性��り��"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:314
 msgid "The device was removed"
 msgstr "��デ�イス�削除�れ���"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:315
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager �スリープ状態�入り���"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:316
 msgid "The device's active connection disappeared"
 msgstr "��デ�イス�アクティブ�接続�消滅����"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:317
 msgid "Device disconnected by user or client"
 msgstr "ユーザー���クライアント�よりデ�イス�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:318
 msgid "Carrier/link changed"
 msgstr "キャリア/リンク�変更�れ���"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:319
 msgid "The device's existing connection was assumed"
 msgstr "デ�イス�既存�接続����れ���"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:320
 msgid "The supplicant is now available"
 msgstr "サプリカント�使用��るよ���り���"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:321
 msgid "The modem could not be found"
 msgstr "モデム�見��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:322
 msgid "The Bluetooth connection failed or timed out"
 msgstr "Bluetooth 接続�失敗���タイムアウト����"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:323
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM モデム� SIM カード�挿入�れ����ん"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:324
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM モデム� SIM PIN �必���"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:325
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM モデム� SIM PUK �必���"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:326
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM モデム� SIM �間������"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:327
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand デ�イス��接続モード�対応�����ん"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:328
 msgid "A dependency of the connection failed"
 msgstr "接続�存性�失敗"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:329
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "ADSL ブリッジ経由� RFC 2684 Ethernet ��題�発生����"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:330
 msgid "ModemManager is unavailable"
 msgstr "ModemManager �使用����ん"
 
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:331
 msgid "The Wi-Fi network could not be found"
 msgstr "Wi-Fi �ットワーク�見��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:332
 msgid "A secondary connection of the base connection failed"
 msgstr "ベース接続�セカンダリー接続�失敗����"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:333
 msgid "DCB or FCoE setup failed"
 msgstr "DCB ��� FCoE �セットアップ�失敗����"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:334
 msgid "teamd control failed"
 msgstr "teamd �制御�失敗����"
 
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:335
 msgid "Modem failed or no longer available"
 msgstr "モデム�障害�発生����モデム�利用�����り���"
 
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:336
 msgid "Modem now ready and available"
 msgstr "モデム�準備�れ�����利用�能��"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:337
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN �間������"
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:338
 msgid "New connection activation was enqueued"
 msgstr "新�接続アクティベーション�キュー�格��れ���"
 
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:339
 msgid "The device's parent changed"
 msgstr "デ�イス�親�変更�れ���"
 
-#: ../clients/common/nm-client-utils.c:354
+#: ../clients/common/nm-client-utils.c:340
 msgid "The device parent's management changed"
 msgstr "デ�イス�親�管��変更�れ���"
 
-#: ../clients/common/nm-client-utils.c:355
+#: ../clients/common/nm-client-utils.c:341
 msgid "Open vSwitch database connection failed"
 msgstr "Open vSwitch データベース�接続�失敗����"
 
-#: ../clients/common/nm-client-utils.c:356
+#: ../clients/common/nm-client-utils.c:342
 msgid "A duplicate IP address was detected"
 msgstr "複製�れ� IP アドレス�検出�れ���"
 
-#: ../clients/common/nm-client-utils.c:357
+#: ../clients/common/nm-client-utils.c:343
 msgid "The selected IP method is not supported"
 msgstr "�択�れ� IP メソッド��対応�����ん"
 
-#: ../clients/common/nm-client-utils.c:358
+#: ../clients/common/nm-client-utils.c:344
 msgid "Failed to configure SR-IOV parameters"
 msgstr "SR-IOV パラメーター�設定�失敗����"
 
-#: ../clients/common/nm-client-utils.c:359
+#: ../clients/common/nm-client-utils.c:345
 msgid "The Wi-Fi P2P peer could not be found"
 msgstr "Wi-Fi P2P ピア�見��り��ん���"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:351
 msgid "Unknown reason"
 msgstr "�明��由"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:352
 msgid "The connection was disconnected"
 msgstr "接続�切断�れ���"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:353
 msgid "Disconnected by user"
 msgstr "ユーザー�より切断"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:354
 msgid "The base network connection was interrupted"
 msgstr "基本�ットワーク接続�中断�れ���。"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:355
 msgid "The VPN service stopped unexpectedly"
 msgstr "VPN サービス�予期���止����"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:356
 msgid "The VPN service returned invalid configuration"
 msgstr "VPN サービス�無効�設定を返����"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:357
 msgid "The connection attempt timed out"
 msgstr "接続試行�タイムアウト����"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:358
 msgid "The VPN service did not start in time"
 msgstr "VPN サービス�時間内�開始���ん���"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:359
 msgid "The VPN service failed to start"
 msgstr "VPN サービス�開始�失敗����"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:360
 msgid "No valid secrets"
 msgstr "有効�シークレット��り��ん"
 
-#: ../clients/common/nm-client-utils.c:375
+#: ../clients/common/nm-client-utils.c:361
 msgid "Invalid secrets"
 msgstr "無効�シークレット"
 
-#: ../clients/common/nm-client-utils.c:376
+#: ../clients/common/nm-client-utils.c:362
 msgid "The connection was removed"
 msgstr "接続�削除�れ���"
 
-#: ../clients/common/nm-client-utils.c:377
+#: ../clients/common/nm-client-utils.c:363
 msgid "Master connection failed"
 msgstr "マスター接続�失敗����"
 
-#: ../clients/common/nm-client-utils.c:378
+#: ../clients/common/nm-client-utils.c:364
 msgid "Could not create a software link"
 msgstr "ソフトウェアリンクを作�����ん���"
 
-#: ../clients/common/nm-client-utils.c:379
+#: ../clients/common/nm-client-utils.c:365
 msgid "The device disappeared"
 msgstr "デ�イス�消滅����"
 
-#: ../clients/common/nm-meta-setting-access.c:510
+#: ../clients/common/nm-meta-setting-access.c:496
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "フィールド '%s' �孤立�る必���り��"
 
-#: ../clients/common/nm-meta-setting-access.c:525
+#: ../clients/common/nm-meta-setting-access.c:511
 #, 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:311
-#: ../clients/common/nm-meta-setting-desc.c:372
+#: ../clients/common/nm-meta-setting-desc.c:297
+#: ../clients/common/nm-meta-setting-desc.c:358
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "無効�プレフィックス '%s'; <1-%d> 許�"
 
-#: ../clients/common/nm-meta-setting-desc.c:319
+#: ../clients/common/nm-meta-setting-desc.c:305
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "無効� IP アドレス: %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:344
+#: ../clients/common/nm-meta-setting-desc.c:330
 msgid ""
-"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
-"[,ip[/prefix] ...]'"
-msgstr ""
-"有効�構文�以下�よ���り��: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/"
-"prefix] ...]'"
+"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
+"ip[/prefix] ...]'"
+msgstr "有効�構文�以下�よ���り��: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:383
+#: ../clients/common/nm-meta-setting-desc.c:369
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "次�ホップ ('%s') ��回��る必���り��"
 
-#: ../clients/common/nm-meta-setting-desc.c:389
+#: ../clients/common/nm-meta-setting-desc.c:375
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "メトリック ('%s') �属性����る必���り��"
 
-#: ../clients/common/nm-meta-setting-desc.c:437
+#: ../clients/common/nm-meta-setting-desc.c:423
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "無効�ルート: %s. %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:503
+#: ../clients/common/nm-meta-setting-desc.c:489
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "ファイル '%s' �ら pac-script を読�込���ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:510
+#: ../clients/common/nm-meta-setting-desc.c:496
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "ファイル '%s' ��無効� utf-8 ���れ����"
 
-#: ../clients/common/nm-meta-setting-desc.c:523
+#: ../clients/common/nm-meta-setting-desc.c:509
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "'%s' ��有効� PAC スクリプト���れ����ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:526
+#: ../clients/common/nm-meta-setting-desc.c:512
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "有効� PAC スクリプト���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:579
+#: ../clients/common/nm-meta-setting-desc.c:565
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "ファイル '%s' �ら�ーム設定を読�込���ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:586
+#: ../clients/common/nm-meta-setting-desc.c:572
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "�ーム設定ファイル '%s' ��無効� utf-8 ���れ����"
 
-#: ../clients/common/nm-meta-setting-desc.c:1034
+#: ../clients/common/nm-meta-setting-desc.c:1029
 msgid "auto"
 msgstr "自動"
 
-#: ../clients/common/nm-meta-setting-desc.c:1186
+#: ../clients/common/nm-meta-setting-desc.c:1181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
-#: ../clients/common/nm-meta-setting-desc.c:1338
+#: ../clients/common/nm-meta-setting-desc.c:1329
+#: ../clients/common/nm-meta-setting-desc.c:1333
 msgid "'%s' is out of range [%"
 msgstr "'%s' � [% �範囲外��"
 
-#: ../clients/common/nm-meta-setting-desc.c:1343
+#: ../clients/common/nm-meta-setting-desc.c:1338
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "'%s' �有効�数値���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:1400
+#: ../clients/common/nm-meta-setting-desc.c:1395
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "'%s' ��[0, %u] �範囲外��"
 
-#: ../clients/common/nm-meta-setting-desc.c:1446
+#: ../clients/common/nm-meta-setting-desc.c:1441
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' �有効� Ethernet MAC ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:1554
+#: ../clients/common/nm-meta-setting-desc.c:1567
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "無効�オプション '%s' ��。[%s] �組����を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1559 ../libnm-core/nm-keyfile.c:930
+#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "無効�オプション '%s' ��。[%s] ���れ�を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1678
+#: ../clients/common/nm-meta-setting-desc.c:1691
 #, c-format
 msgid "%d (key)"
 msgstr "%d (key)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1693
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d (パスフレーズ)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1683
+#: ../clients/common/nm-meta-setting-desc.c:1696
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (�明)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1696
+#: ../clients/common/nm-meta-setting-desc.c:1709
 msgid "0 (NONE)"
 msgstr "0 (��)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1702
+#: ../clients/common/nm-meta-setting-desc.c:1715
 msgid "REORDER_HEADERS, "
-msgstr "ヘッダー�順�変更�"
+msgstr "ヘッダー�順�変更� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1704
+#: ../clients/common/nm-meta-setting-desc.c:1717
 msgid "GVRP, "
-msgstr "GVRP�"
+msgstr "GVRP� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1719
 msgid "LOOSE_BINDING, "
-msgstr "ルース�インディング�"
+msgstr "ルース�インディング� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1708
+#: ../clients/common/nm-meta-setting-desc.c:1721
 msgid "MVRP, "
-msgstr "MVRP�"
+msgstr "MVRP� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1729
+#: ../clients/common/nm-meta-setting-desc.c:1742
 msgid "0 (none)"
 msgstr "0 (��)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1735
+#: ../clients/common/nm-meta-setting-desc.c:1748
 msgid "agent-owned, "
 msgstr "エージェント所有� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1737
+#: ../clients/common/nm-meta-setting-desc.c:1750
 msgid "not saved, "
 msgstr "未�存� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1739
+#: ../clients/common/nm-meta-setting-desc.c:1752
 msgid "not required, "
 msgstr "�必�� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1957
+#: ../clients/common/nm-meta-setting-desc.c:1970
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' �無効��; <option>=<value> を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:1967
+#: ../clients/common/nm-meta-setting-desc.c:1980
 #, c-format
 msgid "cannot set empty \"%s\" option"
 msgstr "空� \"%s\" オプションを設定����ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2026
+#: ../clients/common/nm-meta-setting-desc.c:2039
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "'%u' フラグ�有効���り��ん。%s �組����を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:2043
+#: ../clients/common/nm-meta-setting-desc.c:2056
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' �有効�数字���り��ん (���範囲外��り��)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2064
-#: ../clients/common/nm-meta-setting-desc.c:4039
-#: ../libnm-core/nm-setting-ovs-bridge.c:197 ../src/nm-config.c:564
+#: ../clients/common/nm-meta-setting-desc.c:2077
+#: ../clients/common/nm-meta-setting-desc.c:4052
+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' �無効��"
 
-#: ../clients/common/nm-meta-setting-desc.c:2161
+#: ../clients/common/nm-meta-setting-desc.c:2174
 msgid "not a valid hex-string"
 msgstr "有効� 16 進数�文字列���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2177
+#: ../clients/common/nm-meta-setting-desc.c:2190
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' �有効� 16 進文字���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2256
+#: ../clients/common/nm-meta-setting-desc.c:2269
 msgid ""
 "too many arguments. Please only specify a private key file and optionally a "
 "password"
 msgstr "引数�多����。プライベート�キーファイル��を指定������。オプション�パスワードを指定���"
 
-#: ../clients/common/nm-meta-setting-desc.c:2363
+#: ../clients/common/nm-meta-setting-desc.c:2376
 #, c-format
 msgid "failed to set bond option \"%s\""
 msgstr "ボンドオプション \"%s\" �設定�失敗����"
 
-#: ../clients/common/nm-meta-setting-desc.c:2380
+#: ../clients/common/nm-meta-setting-desc.c:2393
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4516,8 +4574,7 @@ msgid ""
 "balance-alb   = 6\n"
 "\n"
 "Example: mode=2,miimon=120\n"
-msgstr ""
-"次�よ��形��ボンド�オプション一覧を入力������。\n"
+msgstr "次�よ��形��ボンド�オプション一覧を入力������。\n"
 "  オプション = <value>, オプション = <value>,... \n"
 "有効�オプション: %s\n"
 "'mode' �モード����数値�指定����。\n"
@@ -4538,219 +4595,216 @@ 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:2445
+#: ../clients/common/nm-meta-setting-desc.c:2458
 #, c-format
 msgid "Can not change the connection type"
 msgstr "接続タイプを変更����ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2530
+#: ../clients/common/nm-meta-setting-desc.c:2543
 #, c-format
 msgid "invalid permission \"%s\""
 msgstr "無効�パーミッション \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2567
+#: ../clients/common/nm-meta-setting-desc.c:2580
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "'%s' � 有効�マスター���り��ん: ifname ��接続 UUID を使用������。"
 
-#: ../clients/common/nm-meta-setting-desc.c:2648
+#: ../clients/common/nm-meta-setting-desc.c:2661
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "値 '%s' �有効� UUID ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2719
+#: ../clients/common/nm-meta-setting-desc.c:2732
 msgid "0 (disabled)"
 msgstr "0 (無効)"
 
-#: ../clients/common/nm-meta-setting-desc.c:2725
+#: ../clients/common/nm-meta-setting-desc.c:2738
 msgid "enabled, "
-msgstr "有効�"
+msgstr "有効� "
 
-#: ../clients/common/nm-meta-setting-desc.c:2727
+#: ../clients/common/nm-meta-setting-desc.c:2740
 msgid "advertise, "
-msgstr "公表�"
+msgstr "公表� "
 
-#: ../clients/common/nm-meta-setting-desc.c:2729
+#: ../clients/common/nm-meta-setting-desc.c:2742
 msgid "willing, "
-msgstr "用���る�"
+msgstr "用���る� "
 
-#: ../clients/common/nm-meta-setting-desc.c:2818
+#: ../clients/common/nm-meta-setting-desc.c:2831
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' �有効� DCB フラグ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2845
+#: ../clients/common/nm-meta-setting-desc.c:2858
 msgid "must contain 8 comma-separated numbers"
 msgstr "コンマ�区切�� 8 ��番�を��������"
 
-#: ../clients/common/nm-meta-setting-desc.c:2859
+#: ../clients/common/nm-meta-setting-desc.c:2872
 #, 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:2862
+#: ../clients/common/nm-meta-setting-desc.c:2875
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' � 0 � %u (�む) �間�数���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2883
+#: ../clients/common/nm-meta-setting-desc.c:2896
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "変更��'%s' � 1 (有効) ���れる��効果��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2913
+#: ../clients/common/nm-meta-setting-desc.c:2926
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "帯域幅�パーセンテージ��計� 100%% ��ら��れ��り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:2984
-#: ../clients/common/nm-meta-setting-desc.c:2990
+#: ../clients/common/nm-meta-setting-desc.c:2997
+#: ../clients/common/nm-meta-setting-desc.c:3003
 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:3014
+#: ../clients/common/nm-meta-setting-desc.c:3027
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' �有効� IBoIP P_Key ���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3037
+#: ../clients/common/nm-meta-setting-desc.c:3050
 msgid "default"
 msgstr "デフォルト"
 
-#: ../clients/common/nm-meta-setting-desc.c:3201
+#: ../clients/common/nm-meta-setting-desc.c:3214
 #, c-format
 msgid "invalid IPv%c address '%s'"
 msgstr "無効� IPv%c アドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3328
+#: ../clients/common/nm-meta-setting-desc.c:3341
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "無効�ゲートウェイアドレス '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3478
+#: ../clients/common/nm-meta-setting-desc.c:3491
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' �有効��ャン�ル���り��ん。<1-13> を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:3558
-msgid ""
-"The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
+#: ../clients/common/nm-meta-setting-desc.c:3571
+msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
 msgstr "有効�構文�以下�よ���り��: vf [attribute=value]... [,vf [attribute=value]...]"
 
-#: ../clients/common/nm-meta-setting-desc.c:3582
-#: ../clients/common/nm-meta-setting-desc.c:3662
+#: ../clients/common/nm-meta-setting-desc.c:3595
+#: ../clients/common/nm-meta-setting-desc.c:3675
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
 msgstr "有効�構文: '[root | parent <handle>] [handle <handle>] <kind>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3607
+#: ../clients/common/nm-meta-setting-desc.c:3620
 msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
 msgstr "有効�構文: '<vid>[-<vid>] [pvid] [untagged]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3803
+#: ../clients/common/nm-meta-setting-desc.c:3816
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "無効�優先度マップ '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3891
+#: ../clients/common/nm-meta-setting-desc.c:3904
 #, 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:3930
+#: ../clients/common/nm-meta-setting-desc.c:3943
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
 "  option = <value>, option = <value>,...\n"
 "Valid options are: %s\n"
-msgstr ""
-"S/390 �オプション一覧を次�形��入力���。\n"
+msgstr "S/390 �オプション一覧を次�形��入力���。\n"
 "  option = <value>, option = <value>,...\n"
 "次�有効�オプション��り��: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3965
+#: ../clients/common/nm-meta-setting-desc.c:3978
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' �有効��ャン�ル���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3971
+#: ../clients/common/nm-meta-setting-desc.c:3984
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' �有効��ャン�ル���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:3988
-#: ../libnm-core/nm-setting-sriov.c:442 ../libnm-core/nm-setting-wired.c:772
-#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:838
-#: ../libnm-core/nm-setting-wired.c:881 ../libnm-core/nm-setting-wireless.c:893
-#: ../libnm-core/nm-setting-wireless.c:909
+#: ../clients/common/nm-meta-setting-desc.c:4001
+#: ../libnm-core/nm-setting-sriov.c:434 ../libnm-core/nm-setting-wired.c:758
+#: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
+#: ../libnm-core/nm-setting-wireless.c:892
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' �有効� MAC アドレス���り��ん"
 
-#: ../clients/common/nm-meta-setting-desc.c:4048
+#: ../clients/common/nm-meta-setting-desc.c:4061
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr "'%s' � %s '%s' �互�性��り��ん。キーを変更�る���切� %s を最��設定������。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4058
+#: ../clients/common/nm-meta-setting-desc.c:4071
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "WEP キー� '%s' ��る�仮定�����"
 
-#: ../clients/common/nm-meta-setting-desc.c:4063
+#: ../clients/common/nm-meta-setting-desc.c:4076
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "WEP キーインデックス� '%d' �設定�れ��"
 
-#: ../clients/common/nm-meta-setting-desc.c:4102
+#: ../clients/common/nm-meta-setting-desc.c:4115
 #, c-format
-msgid ""
-"'%s' is not compatible with '%s' type, please change or delete the key."
+msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr "'%s' � '%s' タイプ�互�性��り��ん。キーを変更�る��削除������。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4159
+#: ../clients/common/nm-meta-setting-desc.c:4172
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr "'%s' �無効��; 'on'�'off'���� 'ignore' を使用������"
 
-#: ../clients/common/nm-meta-setting-desc.c:4219
+#: ../clients/common/nm-meta-setting-desc.c:4232
 msgid "Bonding primary interface [none]"
 msgstr "ボンド�プライマリインターフェース [none]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4226
+#: ../clients/common/nm-meta-setting-desc.c:4239
 msgid "Bonding monitoring mode"
 msgstr "ボンディングモニタリングモード"
 
-#: ../clients/common/nm-meta-setting-desc.c:4235
+#: ../clients/common/nm-meta-setting-desc.c:4248
 msgid "Bonding miimon [100]"
 msgstr "ボンド� miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4243
+#: ../clients/common/nm-meta-setting-desc.c:4256
 msgid "Bonding downdelay [0]"
 msgstr "ボンド� downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4251
+#: ../clients/common/nm-meta-setting-desc.c:4264
 msgid "Bonding updelay [0]"
 msgstr "ボンド� updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4259
+#: ../clients/common/nm-meta-setting-desc.c:4272
 msgid "Bonding arp-interval [0]"
 msgstr "ボンド� arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4267
+#: ../clients/common/nm-meta-setting-desc.c:4280
 msgid "Bonding arp-ip-target [none]"
 msgstr "ボンド� arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4275
+#: ../clients/common/nm-meta-setting-desc.c:4288
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP レート ('slow' ��� 'fast') [slow]"
 
 #. 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:4440
+#: ../clients/common/nm-meta-setting-desc.c:4455
 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 "
@@ -4759,15 +4813,12 @@ msgid ""
 "Examples: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
-msgstr ""
-"nmcli ���JSON "
-"設定データ��も���設定を�むファイル����両方を���る�������。設定を�むファイル���を指定��場�����ファイル�読�込�れ�コンテンツ���プロパティー�置�れ��。\n"
+msgstr "nmcli ���JSON 設定データ��も���設定を�むファイル����両方を���る�������。設定を�むファイル���を指定��場�����ファイル�読�込�れ�コンテンツ���プロパティー�置�れ��。\n"
 "\n"
-"例: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
-"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\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:4448
+#: ../clients/common/nm-meta-setting-desc.c:4463
 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 "
@@ -4789,13 +4840,9 @@ msgid ""
 "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 ""
-"キー� teamd �プロパティー�����るディクショナリー�形���リンクウォッ�ャー�一覧を入力���。ディクショナリー�ペア�書�� key="
-"value ��り�区切る時��角スペースを使用���。ディクショナリーを区切る時�コンマ ',' "
-"を使用���。ディクショナリー�利用��るキー���必��キー��リンクウォッ�ャー�タイプ�よ��異�り��。����リンクウォッ�ャー�共通��\"�る唯一�プロパティー� "
-"'name'* ���れ�指定�るリンクウォッ�ャーを定義���。\n"
+"   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"
@@ -4809,38 +4856,35 @@ msgstr ""
 "'*' ����プロパティー�必須��。\n"
 "\n"
 "例:\n"
-"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name="
-"ethtool delay-up=3\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:4481
+#: ../clients/common/nm-meta-setting-desc.c:4496
 msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
 msgstr "IEEE 802.15.4 (WPAN) 親デ�イス���接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:4514
+#: ../clients/common/nm-meta-setting-desc.c:4532
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/cacert.crt\n"
-msgstr ""
-"CA 証明書��ファイルパスを入力��� (オプション� file:// を先頭�指定����)。\n"
+msgstr "CA 証明書��ファイルパスを入力��� (オプション� file:// を先頭�指定����)。\n"
 "  [file://]<ファイルパス>\n"
 "nmcli ���証明書を�生� blob データ���指定�������注�������。\n"
 "例: /home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4553
+#: ../clients/common/nm-meta-setting-desc.c:4571
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara.crt\n"
-msgstr ""
-"クライアント証明書��ファイルパスを入力��� (オプション� file:// を先頭�指定����)。\n"
+msgstr "クライアント証明書��ファイルパスを入力��� (オプション� file:// を先頭�指定����)。\n"
 "  [file://]<ファイルパス>\n"
 "nmcli ���証明書を�生� blob データ���指定�������注�������。\n"
 "例: /home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4610
+#: ../clients/common/nm-meta-setting-desc.c:4628
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4848,14 +4892,13 @@ msgid ""
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
-msgstr ""
-"内部�証���� CA 証明書��ファイルパスを入力��� (オプション� file:// を\n"
+msgstr "内部�証���� CA 証明書��ファイルパスを入力��� (オプション� file:// を\n"
 "先頭�指定����)。\n"
 "  [file://]<ファイルパス>\n"
 "nmcli ���証明書を�生� blob データ���指定�������注�������。\n"
 "例: /home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4650
+#: ../clients/common/nm-meta-setting-desc.c:4668
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4863,25 +4906,24 @@ msgid ""
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
-msgstr ""
-"内部�証����クライアント証明書��ファイルパスを入力��� (オプション� file:// を\n"
+msgstr "内部�証����クライアント証明書��ファイルパスを入力��� (オプション� file:// を\n"
 "先頭�指定����)。\n"
 "  [file://]<ファイルパス>\n"
 "nmcli ���証明書を生� blob データ���指定�������注�������。\n"
 "例: /home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4677
+#: ../clients/common/nm-meta-setting-desc.c:4695
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
 "Examples: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
-msgstr ""
-"16 進値�一覧��イトを入力������。\n"
+msgstr "16 進値�一覧��イトを入力������。\n"
 "入力��る形�� 2 種類�り��。\n"
 "(a) 16 進�数字�ら�る列�2 �� 1 �イト\n"
 "(b) 空白�区切�� 16 進�数字�並� (オプション� 0x/0X プレフィックス��よ�先行� 0 を使用�能)\n"
@@ -4889,113 +4931,113 @@ msgstr ""
 "例: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4694
 #: ../clients/common/nm-meta-setting-desc.c:4712
+#: ../clients/common/nm-meta-setting-desc.c:4730
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
 "Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
-msgstr ""
-"プライベートキー��パス�キーパスワード (��設定�����場�) を入力������:\n"
+msgstr "プライベートキー��パス�キーパスワード (��設定�����場�) を入力������:\n"
 "  [file://]<ファイルパス> [<パスワード>]\n"
 "nmcli ���プライベートキーを�生� blob データ���指定�������注�������。\n"
 "例: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4751
-#: ../clients/common/nm-secret-agent-simple.c:280
-#: ../clients/common/nm-secret-agent-simple.c:368
-#: ../clients/tui/nmt-page-dsl.c:65 ../clients/tui/nmt-page-wifi.c:331
+#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-secret-agent-simple.c:268
+#: ../clients/common/nm-secret-agent-simple.c:356
+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
 msgid "Username"
 msgstr "ユーザー�"
 
-#: ../clients/common/nm-meta-setting-desc.c:4757
-#: ../clients/common/nm-meta-setting-desc.c:4972
-#: ../clients/common/nm-meta-setting-desc.c:5365
-#: ../clients/common/nm-meta-setting-desc.c:6286
+#: ../clients/common/nm-meta-setting-desc.c:4775
+#: ../clients/common/nm-meta-setting-desc.c:4990
+#: ../clients/common/nm-meta-setting-desc.c:5385
+#: ../clients/common/nm-meta-setting-desc.c:6328
 msgid "Password [none]"
 msgstr "パスワード [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4803
+#: ../clients/common/nm-meta-setting-desc.c:4821
 msgid "Bluetooth device address"
 msgstr "Bluetooth デ�イスアドレス"
 
-#: ../clients/common/nm-meta-setting-desc.c:4851
-#: ../clients/common/nm-meta-setting-desc.c:5418
-#: ../clients/common/nm-meta-setting-desc.c:6982
-#: ../clients/common/nm-meta-setting-desc.c:7020
-#: ../clients/common/nm-meta-setting-desc.c:7202
-#: ../clients/common/nm-meta-setting-desc.c:7432
+#: ../clients/common/nm-meta-setting-desc.c:4869
+#: ../clients/common/nm-meta-setting-desc.c:5438
+#: ../clients/common/nm-meta-setting-desc.c:7024
+#: ../clients/common/nm-meta-setting-desc.c:7062
+#: ../clients/common/nm-meta-setting-desc.c:7244
+#: ../clients/common/nm-meta-setting-desc.c:7474
 msgid "MAC [none]"
 msgstr "MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4857
+#: ../clients/common/nm-meta-setting-desc.c:4875
 msgid "Enable STP [no]"
 msgstr "STP �有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4863
+#: ../clients/common/nm-meta-setting-desc.c:4881
 msgid "STP priority [32768]"
 msgstr "STP �優先度 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4869
+#: ../clients/common/nm-meta-setting-desc.c:4887
 msgid "Forward delay [15]"
 msgstr "フォワード�延 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4875
+#: ../clients/common/nm-meta-setting-desc.c:4893
 msgid "Hello time [2]"
 msgstr "Hello タイム [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4881
+#: ../clients/common/nm-meta-setting-desc.c:4899
 msgid "Max age [20]"
 msgstr "最大エイジ [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4905
 msgid "MAC address ageing time [300]"
 msgstr "MAC アドレス�エージングタイム [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:4911
 msgid "Group forward mask [0]"
 msgstr "グループ��方マスク [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4917
 msgid "Enable IGMP snooping [no]"
 msgstr "IGMP スヌーピング�有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4928
+#: ../clients/common/nm-meta-setting-desc.c:4946
 msgid "Bridge port priority [32]"
 msgstr "ブリッジ�ート�優先度 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4934
+#: ../clients/common/nm-meta-setting-desc.c:4952
 msgid "Bridge port STP path cost [100]"
 msgstr "ブリッジ�ート� STP パスコスト [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4940
+#: ../clients/common/nm-meta-setting-desc.c:4958
 msgid "Hairpin [no]"
 msgstr "ヘアピン [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4966
-#: ../clients/common/nm-meta-setting-desc.c:5359
-#: ../clients/common/nm-meta-setting-desc.c:6840
+#: ../clients/common/nm-meta-setting-desc.c:4984
+#: ../clients/common/nm-meta-setting-desc.c:5379
+#: ../clients/common/nm-meta-setting-desc.c:6882
 msgid "Username [none]"
 msgstr "ユーザー� [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5069
+#: ../clients/common/nm-meta-setting-desc.c:5086
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: alice bob charlie\n"
-msgstr ""
-"ユーザー�パーミッション一覧を入力���。ユーザー��一覧��\n"
+msgstr "ユーザー�パーミッション一覧を入力���。ユーザー��一覧��\n"
 " [user:]<user name 1>, [user:]<user name 2>,... �よ��形�を�り��。\n"
 "コンマ�空白�区切る���複数�アイテムを記載����。\n"
 "\n"
 "例: alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5121
+#: ../clients/common/nm-meta-setting-desc.c:5138
 msgid ""
-"Enter secondary connections that should be activated when this connection is\n"
+"Enter secondary connections that should be activated when this connection "
+"is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -5003,8 +5045,7 @@ msgid ""
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-msgstr ""
-"��接続�アクティベート�れ����アクティベート�る必���る\n"
+msgstr "��接続�アクティベート�れ����アクティベート�る必���る\n"
 "セカンダリー接続を入力������。接続� UUID ��� ID (��) ���れ��指定����。nmcli\n"
 "���を��的� UUID �変����。NetworkManager ��時点�� VPN をセカンダリー接続\n"
 "�����サ�ート���。\n"
@@ -5012,39 +5053,38 @@ msgstr ""
 "\n"
 "例: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5144
+#: ../clients/common/nm-meta-setting-desc.c:5161
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
 "'true','yes','on' to set the connection as metered\n"
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
-msgstr ""
-"接続�データクォータ�使用コスト����他�制��基������を\n"
+msgstr "接続�データクォータ�使用コスト����他�制��基������を\n"
 "示�値を入力���。使用��るオプション:\n"
 "接続を測定対象���設定�る場�� 'true'�'yes'�'on'\n"
 "接続を�測定���設定�る場�� 'false'�'no'�'off'\n"
 "NetworkManager �ヒューリスティックを使用��値を�択��るよ���る場�� 'unknown'\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5375
+#: ../clients/common/nm-meta-setting-desc.c:5395
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5427
-#: ../clients/common/nm-meta-setting-desc.c:7051
-#: ../clients/common/nm-meta-setting-desc.c:7242
+#: ../clients/common/nm-meta-setting-desc.c:5447
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7284
 msgid "MTU [auto]"
 msgstr "MTU [auto]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5446
+#: ../clients/common/nm-meta-setting-desc.c:5466
 msgid "P_KEY [none]"
 msgstr "P_KEY [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5455
+#: ../clients/common/nm-meta-setting-desc.c:5475
 msgid "Parent interface [none]"
 msgstr "親インターフェース [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5482
+#: ../clients/common/nm-meta-setting-desc.c:5502
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5053,29 +5093,28 @@ msgstr "DNS サーãƒ�ーã�® IPv4 アドレス一覧を入力ã�—ã�¦ã��ã� ã�•ã�„ã€
 "\n"
 "例: 8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5530
+#: ../clients/common/nm-meta-setting-desc.c:5550
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5532
+#: ../clients/common/nm-meta-setting-desc.c:5552
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 32.\n"
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
-msgstr ""
-"次�よ��形�� IPv4 アドレス�一覧を入力������。\n"
+msgstr "次�よ��形�� IPv4 アドレス�一覧を入力������。\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "prefix �指定�れ��場��プレフィックス� 32 �見��れ��。\n"
 "\n"
 "例: 192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5551
+#: ../clients/common/nm-meta-setting-desc.c:5571
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5559
+#: ../clients/common/nm-meta-setting-desc.c:5579
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5086,8 +5125,7 @@ msgid ""
 "\n"
 "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
-msgstr ""
-"IPv4 ルート�一覧を次�形��入力���。\n"
+msgstr "IPv4 ルート�一覧を次�形��入力���。\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
 "\n"
 "prefix �指定�れ��場��プレフィックス� 32 �見��れ��。\n"
@@ -5097,17 +5135,16 @@ 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:5599
+#: ../clients/common/nm-meta-setting-desc.c:5619
 msgid ""
 "Enter a list of IPv4 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
-msgstr ""
-"次�よ��形�� IPv4 ルーティングルール�一覧を入力������:\n"
+msgstr "次�よ��形�� IPv4 ルーティングルール�一覧を入力������:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5690
+#: ../clients/common/nm-meta-setting-desc.c:5721
 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 "
@@ -5117,37 +5154,32 @@ msgid ""
 "DNS servers for this connection.\n"
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-msgstr ""
-"DNS サー�ー� IPv6 アドレス一覧を入力���。IPv6 設定方法� 'auto' �場���自動設定�返�れるアドレス� "
-"DNSサー�ー�追加�れ��。 'shared' ��� 'link-local' � IPv6  設定方法�� DNS "
-"サー�ー�使用����ん。アップストリーム��ットワーク�������。他����� IPv6 設定方法���DNS サー�ー���接続用� DNS "
-"サー�ー�����使用�れ��。\n"
+msgstr "DNS サー�ー� IPv6 アドレス一覧を入力���。IPv6 設定方法� 'auto' �場���自動設定�返�れるアドレス� DNSサー�ー�追加�れ��。 'shared' ��� 'link-local' � IPv6  設定方法�� DNS サー�ー�使用����ん。アップストリーム��ットワーク�������。他����� IPv6 設定方法���DNS サー�ー���接続用� DNS サー�ー�����使用�れ��。\n"
 "\n"
 "例: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5744
+#: ../clients/common/nm-meta-setting-desc.c:5775
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 アドレス (IP[/plen]) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5746
+#: ../clients/common/nm-meta-setting-desc.c:5777
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 128.\n"
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-msgstr ""
-"次�よ��形�� IPv6 アドレス�一覧を入力������。\n"
+msgstr "次�よ��形�� IPv6 アドレス�一覧を入力������。\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "prefix �指定�れ��場��プレフィックス� 128 �見��れ��。\n"
 "\n"
 "例: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5765
+#: ../clients/common/nm-meta-setting-desc.c:5796
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 ゲートウェイ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5773
+#: ../clients/common/nm-meta-setting-desc.c:5804
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5159,188 +5191,185 @@ msgid ""
 "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
-msgstr ""
-"IPv6 ルート�一覧を次�形��入力���。\n"
+msgstr "IPv6 ルート�一覧を次�形��入力���。\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
 "\n"
 "prefix �指定�れ��場��プレフィックス� 128 �見��れ��。\n"
 "next-hop �指定�れ��場���\"::\" �見��れ��。\n"
 "metric �指定�れ��場���デフォルト値�見��れ�� (NM/カー�ル�デフォルト値を設定���)。\n"
 "\n"
-"例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef:"
-":3 2\n"
+"例: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
 "          abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5813
+#: ../clients/common/nm-meta-setting-desc.c:5844
 msgid ""
 "Enter a list of IPv6 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
-msgstr ""
-"次�よ��形�� IPv6 ルーティングルール�一覧を入力������:\n"
+msgstr "次�よ��形�� IPv6 ルーティングルール�一覧を入力������:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5901
-#: ../clients/common/nm-meta-setting-desc.c:6881
+#: ../clients/common/nm-meta-setting-desc.c:5943
+#: ../clients/common/nm-meta-setting-desc.c:6923
 msgid "Parent device [none]"
 msgstr "親デ�イス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5907
+#: ../clients/common/nm-meta-setting-desc.c:5949
 msgid "Local endpoint [none]"
 msgstr "ローカルエンド�イント [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5914
-#: ../clients/common/nm-meta-setting-desc.c:6901
+#: ../clients/common/nm-meta-setting-desc.c:5956
+#: ../clients/common/nm-meta-setting-desc.c:6943
 msgid "Remote"
 msgstr "リモート"
 
-#: ../clients/common/nm-meta-setting-desc.c:5959
+#: ../clients/common/nm-meta-setting-desc.c:6001
 msgid "MACsec parent device or connection UUID"
 msgstr "MACsec 親デ�イス���接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:5980
+#: ../clients/common/nm-meta-setting-desc.c:6022
 msgid "Enable encryption [yes]"
 msgstr "暗�化�有効化 [yes]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5986
-#: ../clients/common/nm-secret-agent-simple.c:929
+#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:5996
+#: ../clients/common/nm-meta-setting-desc.c:6038
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6002
+#: ../clients/common/nm-meta-setting-desc.c:6044
 msgid "SCI port [1]"
 msgstr "SCI �ート [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6070
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 親デ�イス���接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6049
+#: ../clients/common/nm-meta-setting-desc.c:6091
 msgid "Tap [no]"
 msgstr "Tap [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6084
-#: ../clients/common/nm-meta-setting-desc.c:7156
-#: ../clients/tui/nmt-page-wifi.c:223
+#: ../clients/common/nm-meta-setting-desc.c:6126
+#: ../clients/common/nm-meta-setting-desc.c:7198
+#: ../clients/tui/nmt-page-wifi.c:212
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6093
+#: ../clients/common/nm-meta-setting-desc.c:6135
 msgid "OLPC Mesh channel [1]"
 msgstr "OLPC メッシュ�ャン�ル [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6102
+#: ../clients/common/nm-meta-setting-desc.c:6144
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP anycast MAC アドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6267
+#: ../clients/common/nm-meta-setting-desc.c:6309
 msgid "PPPoE parent device"
 msgstr "PPPoE 親デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:6273
+#: ../clients/common/nm-meta-setting-desc.c:6315
 msgid "Service [none]"
 msgstr "サービス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6280
+#: ../clients/common/nm-meta-setting-desc.c:6322
 msgid "PPPoE username"
 msgstr "PPPoE ユーザー�"
 
-#: ../clients/common/nm-meta-setting-desc.c:6316
+#: ../clients/common/nm-meta-setting-desc.c:6358
 msgid "Browser only [no]"
 msgstr "ブラウザー専用 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6322
+#: ../clients/common/nm-meta-setting-desc.c:6364
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:6370
 msgid "PAC script"
 msgstr "PAC スクリプト"
 
-#: ../clients/common/nm-meta-setting-desc.c:6452
-#: ../clients/common/nm-meta-setting-desc.c:6640
+#: ../clients/common/nm-meta-setting-desc.c:6494
+#: ../clients/common/nm-meta-setting-desc.c:6682
 msgid "Team JSON configuration [none]"
 msgstr "team  JSON 設定 [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6743
+#: ../clients/common/nm-meta-setting-desc.c:6785
 msgid "User ID [none]"
 msgstr "ユーザー ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6749
+#: ../clients/common/nm-meta-setting-desc.c:6791
 msgid "Group ID [none]"
 msgstr "グループ ID [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6755
+#: ../clients/common/nm-meta-setting-desc.c:6797
 msgid "Enable PI [no]"
 msgstr "PI �有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6761
+#: ../clients/common/nm-meta-setting-desc.c:6803
 msgid "Enable VNET header [no]"
 msgstr "VNET ヘッダー �有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6767
+#: ../clients/common/nm-meta-setting-desc.c:6809
 msgid "Enable multi queue [no]"
 msgstr "複数�キュー�有効化 [no]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6780
+#: ../clients/common/nm-meta-setting-desc.c:6822
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 親デ�イス���接続 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6787
+#: ../clients/common/nm-meta-setting-desc.c:6829
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID (<0-4094>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:6793
+#: ../clients/common/nm-meta-setting-desc.c:6835
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN フラグ (<0-7>) [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6802
+#: ../clients/common/nm-meta-setting-desc.c:6844
 msgid "Ingress priority maps [none]"
 msgstr "イングレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6812
+#: ../clients/common/nm-meta-setting-desc.c:6854
 msgid "Egress priority maps [none]"
 msgstr "イーグレス優先度マップ [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6888
+#: ../clients/common/nm-meta-setting-desc.c:6930
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6894
+#: ../clients/common/nm-meta-setting-desc.c:6936
 msgid "Local address [none]"
 msgstr "ローカルアドレス [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6907
+#: ../clients/common/nm-meta-setting-desc.c:6949
 msgid "Minimum source port [0]"
 msgstr "最�ソース�ート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6913
+#: ../clients/common/nm-meta-setting-desc.c:6955
 msgid "Maximum source port [0]"
 msgstr "最大ソース�ート数 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6919
+#: ../clients/common/nm-meta-setting-desc.c:6961
 msgid "Destination port [8472]"
 msgstr "接続先�ート [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6959
+#: ../clients/common/nm-meta-setting-desc.c:7001
 msgid "Peer"
 msgstr "ピア"
 
-#: ../clients/common/nm-meta-setting-desc.c:6989
+#: ../clients/common/nm-meta-setting-desc.c:7031
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP �"
 
-#: ../clients/common/nm-meta-setting-desc.c:7026
-#: ../clients/common/nm-meta-setting-desc.c:7207
+#: ../clients/common/nm-meta-setting-desc.c:7068
+#: ../clients/common/nm-meta-setting-desc.c:7249
 msgid "Cloned MAC [none]"
 msgstr "クローン�� MAC [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7059
+#: ../clients/common/nm-meta-setting-desc.c:7101
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5349,429 +5378,412 @@ msgstr "サブãƒ�ャãƒ�ルã�®ä¸€è¦§ã‚’入力ã�—ã�¾ã�™ (コンマã�¾ã�Ÿã�¯ã‚¹ãƒšã
 "\n"
 "例: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7381
+#: ../clients/common/nm-meta-setting-desc.c:7423
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
-msgstr ""
-"WEP キー�タイプを入力���。使用��る値��0 ��� unknown�1 ��� key�2 ��� passphrase ��。\n"
+msgstr "WEP キー�タイプを入力���。使用��る値��0 ��� unknown�1 ��� key�2 ��� passphrase ��。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7440
+#: ../clients/common/nm-meta-setting-desc.c:7482
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "ショートアドレス (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7456
+#: ../clients/common/nm-meta-setting-desc.c:7498
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "PAN 識別� (<0x0000-0xffff>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7471
+#: ../clients/common/nm-meta-setting-desc.c:7513
 msgid "Page (<default|0-31>)"
 msgstr "ページ (<default|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7485
+#: ../clients/common/nm-meta-setting-desc.c:7527
 msgid "Channel (<default|0-26>)"
 msgstr "�ャン�ル (<default|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7620
+#: ../clients/common/nm-meta-setting-desc.c:7662
 msgid "6LOWPAN settings"
 msgstr "6LOWPAN 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7621
+#: ../clients/common/nm-meta-setting-desc.c:7663
 msgid "802-1x settings"
 msgstr "802-1x 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7622
-#: ../src/devices/adsl/nm-device-adsl.c:131
+#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "ADSL 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7623
+#: ../clients/common/nm-meta-setting-desc.c:7665
 msgid "bluetooth connection"
 msgstr "bluetooth 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7624
+#: ../clients/common/nm-meta-setting-desc.c:7666
 msgid "Bond device"
 msgstr "Bond デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7625
+#: ../clients/common/nm-meta-setting-desc.c:7667
 msgid "Bridge device"
 msgstr "ブリッジデ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7626
+#: ../clients/common/nm-meta-setting-desc.c:7668
 msgid "Bridge port"
 msgstr "ブリッジ�ート"
 
-#: ../clients/common/nm-meta-setting-desc.c:7627
+#: ../clients/common/nm-meta-setting-desc.c:7669
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA モ�イルブロード�ンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7628
+#: ../clients/common/nm-meta-setting-desc.c:7670
 msgid "General settings"
 msgstr "一般設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7629
+#: ../clients/common/nm-meta-setting-desc.c:7671
 msgid "DCB settings"
 msgstr "DCB 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7630
+#: ../clients/common/nm-meta-setting-desc.c:7672
 msgid "Dummy settings"
 msgstr "ダミー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7631
+#: ../clients/common/nm-meta-setting-desc.c:7673
 msgid "Ethtool settings"
 msgstr "Ethtool 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7632
+#: ../clients/common/nm-meta-setting-desc.c:7674
 msgid "Generic settings"
 msgstr "汎用設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7633
+#: ../clients/common/nm-meta-setting-desc.c:7675
 msgid "GSM mobile broadband connection"
 msgstr "GSM モ�イルブロード�ンド接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7634
-#: ../src/devices/nm-device-infiniband.c:175
+#: ../clients/common/nm-meta-setting-desc.c:7676
+#: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "InfiniBand 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7635
+#: ../clients/common/nm-meta-setting-desc.c:7677
 msgid "IPv4 protocol"
 msgstr "IPv4 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:7636
+#: ../clients/common/nm-meta-setting-desc.c:7678
 msgid "IPv6 protocol"
 msgstr "IPv6 プロトコル"
 
-#: ../clients/common/nm-meta-setting-desc.c:7637
+#: ../clients/common/nm-meta-setting-desc.c:7679
 msgid "IP-tunnel settings"
 msgstr "IP トン�ル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7638
+#: ../clients/common/nm-meta-setting-desc.c:7680
 msgid "MACsec connection"
 msgstr "MACsec 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7639
+#: ../clients/common/nm-meta-setting-desc.c:7681
 msgid "macvlan connection"
 msgstr "macvlan 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7640
+#: ../clients/common/nm-meta-setting-desc.c:7682
 msgid "Match"
 msgstr "一致"
 
-#: ../clients/common/nm-meta-setting-desc.c:7641
+#: ../clients/common/nm-meta-setting-desc.c:7683
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7642
+#: ../clients/common/nm-meta-setting-desc.c:7684
 msgid "Open vSwitch bridge settings"
 msgstr "Open vSwitch ブリッジ設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7643
+#: ../clients/common/nm-meta-setting-desc.c:7685
 msgid "Open vSwitch DPDK interface settings"
 msgstr "Open vSwitch DPDK インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7644
+#: ../clients/common/nm-meta-setting-desc.c:7686
 msgid "Open vSwitch interface settings"
 msgstr "Open vSwitch インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7645
+#: ../clients/common/nm-meta-setting-desc.c:7687
 msgid "Open vSwitch patch interface settings"
 msgstr "Open vSwitch パッ�インターフェース設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7646
+#: ../clients/common/nm-meta-setting-desc.c:7688
 msgid "Open vSwitch port settings"
 msgstr "Open vSwitch �ート設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7647
+#: ../clients/common/nm-meta-setting-desc.c:7689
 msgid "PPP settings"
 msgstr "PPP 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7648
+#: ../clients/common/nm-meta-setting-desc.c:7690
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7649
+#: ../clients/common/nm-meta-setting-desc.c:7691
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: ../clients/common/nm-meta-setting-desc.c:7650
+#: ../clients/common/nm-meta-setting-desc.c:7692
 msgid "Serial settings"
 msgstr "シリアル設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7651
+#: ../clients/common/nm-meta-setting-desc.c:7693
 msgid "SR-IOV settings"
 msgstr "SR-IOV 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7652
+#: ../clients/common/nm-meta-setting-desc.c:7694
 msgid "Traffic controls"
 msgstr "トラフィックコントロール"
 
-#: ../clients/common/nm-meta-setting-desc.c:7653
+#: ../clients/common/nm-meta-setting-desc.c:7695
 msgid "Team device"
 msgstr "Team デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7654
+#: ../clients/common/nm-meta-setting-desc.c:7696
 msgid "Team port"
 msgstr "Team �ート"
 
-#: ../clients/common/nm-meta-setting-desc.c:7655
+#: ../clients/common/nm-meta-setting-desc.c:7697
 msgid "Tun device"
 msgstr "TUN デ�イス"
 
-#: ../clients/common/nm-meta-setting-desc.c:7656
+#: ../clients/common/nm-meta-setting-desc.c:7698
 msgid "User settings"
 msgstr "ユーザー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7657
-#: ../src/devices/nm-device-vlan.c:399
+#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "VLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7658 ../src/nm-manager.c:5568
+#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
 msgid "VPN connection"
 msgstr "VPN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7659
-#: ../src/devices/nm-device-vxlan.c:368
+#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "VXLAN 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7660
+#: ../clients/common/nm-meta-setting-desc.c:7702
 msgid "Wi-Fi P2P connection"
 msgstr "Wi-Fi P2P 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7661
+#: ../clients/common/nm-meta-setting-desc.c:7703
 msgid "WiMAX connection"
 msgstr "WiMAX 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7662
+#: ../clients/common/nm-meta-setting-desc.c:7704
 msgid "Wired Ethernet"
 msgstr "有線 Ethernet"
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7705
 msgid "WireGuard VPN settings"
 msgstr "WireGuard VPN 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../clients/common/nm-meta-setting-desc.c:7706
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 接続"
 
-#: ../clients/common/nm-meta-setting-desc.c:7665
+#: ../clients/common/nm-meta-setting-desc.c:7707
 msgid "Wi-Fi security settings"
 msgstr "Wi-Fi セキュリティー設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:7666
+#: ../clients/common/nm-meta-setting-desc.c:7708
 msgid "WPAN settings"
 msgstr "WPAN 設定"
 
-#: ../clients/common/nm-meta-setting-desc.c:8031
+#: ../clients/common/nm-meta-setting-desc.c:8074
 msgid "name"
 msgstr "��"
 
-#: ../clients/common/nm-polkit-listener.c:237
+#: ../clients/common/nm-polkit-listener.c:225
 msgid "An authentication session is already underway."
 msgstr "�証セッション����実行�れ����。"
 
-#: ../clients/common/nm-secret-agent-simple.c:229
+#: ../clients/common/nm-secret-agent-simple.c:217
 #, c-format
 msgid "Preshared-key for %s"
 msgstr "%s �共有��キー"
 
-#: ../clients/common/nm-secret-agent-simple.c:285
-#: ../clients/common/nm-secret-agent-simple.c:322
-#: ../clients/common/nm-secret-agent-simple.c:345
-#: ../clients/common/nm-secret-agent-simple.c:378
-#: ../clients/common/nm-secret-agent-simple.c:915
-#: ../clients/common/nm-secret-agent-simple.c:950
-#: ../clients/common/nm-secret-agent-simple.c:973
-#: ../clients/common/nm-vpn-helpers.c:122
-#: ../clients/common/nm-vpn-helpers.c:126
-#: ../clients/common/nm-vpn-helpers.c:132
-#: ../clients/common/nm-vpn-helpers.c:137 ../clients/tui/nmt-page-dsl.c:74
-#: ../clients/tui/nmt-page-wifi.c:276 ../clients/tui/nmt-page-wifi.c:307
-#: ../clients/tui/nmt-page-wifi.c:340
-msgid "Password"
-msgstr "パスワード"
-
-#: ../clients/common/nm-secret-agent-simple.c:294
+#: ../clients/common/nm-secret-agent-simple.c:282
 msgid "Identity"
 msgstr "ID"
 
-#: ../clients/common/nm-secret-agent-simple.c:299
+#: ../clients/common/nm-secret-agent-simple.c:287
 msgid "Private key password"
 msgstr "プライベートキー�パスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:335
-#: ../clients/tui/nmt-page-wifi.c:288
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/tui/nmt-page-wifi.c:278
 msgid "Key"
 msgstr "キー"
 
-#: ../clients/common/nm-secret-agent-simple.c:373
-#: ../clients/tui/nmt-page-dsl.c:77
+#: ../clients/common/nm-secret-agent-simple.c:361
+#: ../clients/tui/nmt-page-dsl.c:65
 msgid "Service"
 msgstr "サービス"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:473
 msgid "WireGuard private-key"
 msgstr "WireGuard プライベートキー"
 
-#: ../clients/common/nm-secret-agent-simple.c:526
+#: ../clients/common/nm-secret-agent-simple.c:514
 #, c-format
 msgid "Secrets are required to connect WireGuard VPN '%s'"
 msgstr "WireGuard VPN '%s' �接続��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:627
-#: ../clients/common/nm-secret-agent-simple.c:911
-#: ../clients/common/nm-secret-agent-simple.c:946
-#: ../clients/common/nm-secret-agent-simple.c:969
-#: ../clients/common/nm-secret-agent-simple.c:988
+#: ../clients/common/nm-secret-agent-simple.c:615
+#: ../clients/common/nm-secret-agent-simple.c:899
+#: ../clients/common/nm-secret-agent-simple.c:934
+#: ../clients/common/nm-secret-agent-simple.c:957
+#: ../clients/common/nm-secret-agent-simple.c:976
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ��接続��パスワード�必���。"
 
-#: ../clients/common/nm-secret-agent-simple.c:878
+#: ../clients/common/nm-secret-agent-simple.c:866
 msgid "Authentication required by wireless network"
 msgstr "ワイヤレス�ットワーク�必���れる�証"
 
-#: ../clients/common/nm-secret-agent-simple.c:879
+#: ../clients/common/nm-secret-agent-simple.c:867
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr "ワイヤレス�ットワーク '%s' ��アクセス���パスワード���暗�キー�必���。"
 
-#: ../clients/common/nm-secret-agent-simple.c:884
+#: ../clients/common/nm-secret-agent-simple.c:872
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X ��証"
 
-#: ../clients/common/nm-secret-agent-simple.c:885
+#: ../clients/common/nm-secret-agent-simple.c:873
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "有線�ットワーク '%s' ��アクセス��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:891
+#: ../clients/common/nm-secret-agent-simple.c:879
 msgid "DSL authentication"
 msgstr "DSL �証"
 
-#: ../clients/common/nm-secret-agent-simple.c:892
+#: ../clients/common/nm-secret-agent-simple.c:880
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "DSL 接続 '%s' ��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:901
+#: ../clients/common/nm-secret-agent-simple.c:889
 msgid "PIN code required"
 msgstr "PIN コード�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:902
+#: ../clients/common/nm-secret-agent-simple.c:890
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モ�イルブロード�ンド�デ�イス�� PIN コード�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:905
+#: ../clients/common/nm-secret-agent-simple.c:893
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:910
-#: ../clients/common/nm-secret-agent-simple.c:945
-#: ../clients/common/nm-secret-agent-simple.c:968
+#: ../clients/common/nm-secret-agent-simple.c:898
+#: ../clients/common/nm-secret-agent-simple.c:933
+#: ../clients/common/nm-secret-agent-simple.c:956
 msgid "Mobile broadband network password"
 msgstr "モ�イルブロード�ンド��ットワークパスワード"
 
-#: ../clients/common/nm-secret-agent-simple.c:923
+#: ../clients/common/nm-secret-agent-simple.c:911
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "MACsec �ットワーク '%s' ��アクセス��シークレット�必���"
 
-#: ../clients/common/nm-secret-agent-simple.c:927
+#: ../clients/common/nm-secret-agent-simple.c:915
 msgid "MACsec PSK authentication"
 msgstr "MACsec PSK �証"
 
-#: ../clients/common/nm-secret-agent-simple.c:934
+#: ../clients/common/nm-secret-agent-simple.c:922
 msgid "MACsec EAP authentication"
 msgstr "MACsec EAP �証"
 
-#: ../clients/common/nm-secret-agent-simple.c:939
+#: ../clients/common/nm-secret-agent-simple.c:927
 msgid "WireGuard VPN secret"
 msgstr "WireGuard VPN シークレット"
 
-#: ../clients/common/nm-secret-agent-simple.c:978
+#: ../clients/common/nm-secret-agent-simple.c:966
 msgid "VPN password required"
 msgstr "VPN パスワード�必���"
 
-#: ../clients/common/nm-vpn-helpers.c:51
+#: ../clients/common/nm-vpn-helpers.c:39
 #, c-format
 msgid "unknown VPN plugin \"%s\""
 msgstr "�明� VPN プラグイン '%s'"
 
-#: ../clients/common/nm-vpn-helpers.c:62
+#: ../clients/common/nm-vpn-helpers.c:50
 #, c-format
 msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
 msgstr "'%s' ��レガシー専用 VPN プラグイン '%s' を読�込���ん"
 
-#: ../clients/common/nm-vpn-helpers.c:67
+#: ../clients/common/nm-vpn-helpers.c:55
 #, c-format
 msgid ""
 "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
 msgstr "'%s' ����� VPN プラグイン '%s' を読�込���ん。クライアントプラグイン��り��ん�?"
 
-#: ../clients/common/nm-vpn-helpers.c:72
+#: ../clients/common/nm-vpn-helpers.c:60
 #, c-format
 msgid "failed to load VPN plugin \"%s\": %s"
 msgstr "VPN プラグイン '%s' �読�込��失敗����: %s"
 
-#: ../clients/common/nm-vpn-helpers.c:127
+#: ../clients/common/nm-vpn-helpers.c:115
 msgid "Certificate password"
 msgstr "証明書�パスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:116
 msgid "HTTP proxy password"
 msgstr "HTTP プロキシ�パスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:133
-#: ../clients/common/nm-vpn-helpers.c:138
+#: ../clients/common/nm-vpn-helpers.c:121
+#: ../clients/common/nm-vpn-helpers.c:126
 msgid "Group password"
 msgstr "グループパスワード"
 
-#: ../clients/common/nm-vpn-helpers.c:142 ../clients/tui/nmt-page-ip4.c:142
-#: ../clients/tui/nmt-page-ip6.c:143
+#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
+#: ../clients/tui/nmt-page-ip6.c:131
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../clients/common/nm-vpn-helpers.c:143
+#: ../clients/common/nm-vpn-helpers.c:131
 msgid "Cookie"
 msgstr "クッキー"
 
-#: ../clients/common/nm-vpn-helpers.c:144
+#: ../clients/common/nm-vpn-helpers.c:132
 msgid "Gateway certificate hash"
 msgstr "ゲートウェイ証明書�ッシュ"
 
-#: ../clients/common/nm-vpn-helpers.c:269
+#: ../clients/common/nm-vpn-helpers.c:257
 #, c-format
 msgid "Invalid peer starting at %s:%zu: %s"
 msgstr "%s:%zu �始�る無効�ピア: %s"
 
-#: ../clients/common/nm-vpn-helpers.c:389
+#: ../clients/common/nm-vpn-helpers.c:377
 msgid ""
-"The WireGuard config file must be a valid interface name followed by \"."
-"conf\""
+"The WireGuard config file must be a valid interface name followed by \".conf"
+"\""
 msgstr "WireGuard 設定ファイル��\".conf\" ����続�有効�インターフェース����れ��り��ん"
 
-#: ../clients/common/nm-vpn-helpers.c:677
+#: ../clients/common/nm-vpn-helpers.c:666
 #, c-format
 msgid "unrecognized line at %s:%zu"
 msgstr "%s:%zu �未�識�行��り��"
 
-#: ../clients/common/nm-vpn-helpers.c:682
+#: ../clients/common/nm-vpn-helpers.c:671
 #, c-format
 msgid "invalid value for '%s' at %s:%zu"
 msgstr "%s:%zu ���る '%s' �値�無効��"
 
-#: ../clients/common/nm-vpn-helpers.c:687
+#: ../clients/common/nm-vpn-helpers.c:676
 #, c-format
 msgid "invalid secret '%s' at %s:%zu"
 msgstr "%s:%zu �シークレット '%s' �無効��"
 
-#: ../clients/common/nm-vpn-helpers.c:800
+#: ../clients/common/nm-vpn-helpers.c:789
 #, c-format
 msgid "Failed to create WireGuard connection: %s"
 msgstr "WireGuard 接続�作��失敗����: %s"
@@ -5792,9 +5804,7 @@ 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 "
 "request."
-msgstr ""
-"DHCP � IP アドレスを�求��時�使用�れるエニーキャスト DHCP MAC "
-"アドレス��。使用�れ�エニーキャストアドレス��リクエスト�応答�る DHCP サー�ークラスを判別���。"
+msgstr "DHCP � IP アドレスを�求��時�使用�れるエニーキャスト DHCP MAC アドレス��。使用�れ�エニーキャストアドレス��リクエスト�応答�る DHCP サー�ークラスを判別���。"
 
 #: ../clients/common/settings-docs.h.in:6
 msgid "SSID of the mesh network to join."
@@ -5802,17 +5812,13 @@ msgstr "�加�るメッシュ�ットワーク� SSID。"
 
 #: ../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 the specific band, i.e. if \"a\" is specified, the device will not "
-"associate with the same network in the 2.4GHz band even if the network's "
-"settings are compatible.  This setting depends on specific driver capability "
-"and may not work with all drivers."
-msgstr ""
-"�ットワーク� 802.11 周波数帯域。\"a\" (5GHz 802.11a �場�) ��� \"bg\" (2.4GHz 802.11 �場�) "
-"���れ���り��。�れ�より�Wi-Fi �ットワーク�関連付�を特定�帯域�固定���。��り�\"a\" "
-"を指定�る���ットワーク設定�互�性�������も�デ�イス��2.4GHz "
-"帯域�����ットワーク�関連付�を行���ん。��設定��特定�ドライ�ー機能��存������ドライ�ー�利用��る�����り��ん。"
+"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 "
+"the specific band, i.e. if \"a\" is specified, the device will not associate "
+"with the same network in the 2.4GHz band even if the network's settings are "
+"compatible.  This setting depends on specific driver capability and may not "
+"work with all drivers."
+msgstr "�ットワーク� 802.11 周波数帯域。\"a\" (5GHz 802.11a �場�) ��� \"bg\" (2.4GHz 802.11 �場�) ���れ���り��。�れ�より�Wi-Fi �ットワーク�関連付�を特定�帯域�固定���。��り�\"a\" を指定�る���ットワーク設定�互�性�������も�デ�イス��2.4GHz 帯域�����ットワーク�関連付�を行���ん。��設定��特定�ドライ�ー機能��存������ドライ�ー�利用��る�����り��ん。"
 
 #: ../clients/common/settings-docs.h.in:8
 msgid ""
@@ -5820,9 +5826,7 @@ msgid ""
 "point.  This capability is highly driver dependent and not supported by all "
 "devices.  Note: this property does not control the BSSID used when creating "
 "an Ad-Hoc network and is unlikely to in the future."
-msgstr ""
-"指定�る��デ�イス��指定��アクセス�イント���関連付�られ��。��機能�ドライ�ー�大���存������デ�イス�サ�ート�れる�����り��ん。注記:"
-" ��プロパティー��Ad-Hoc �ットワーク�作�時�使用�れる BSSID を制御���今後も��ら�制御�れ��ん。"
+msgstr "指定�る��デ�イス��指定��アクセス�イント���関連付�られ��。��機能�ドライ�ー�大���存������デ�イス�サ�ート�れる�����り��ん。注記: ��プロパティー��Ad-Hoc �ットワーク�作�時�使用�れる BSSID を制御���今後も��ら�制御�れ��ん。"
 
 #: ../clients/common/settings-docs.h.in:9
 msgid ""
@@ -5830,9 +5834,7 @@ msgid ""
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
 "Because channel numbers overlap between bands, this property also requires "
 "the \"band\" property to be set."
-msgstr ""
-"Wi-Fi 接続�使用�るワイアレス�ャン�ル。デ�イス��指定���ャン�ル� Wi-Fi �ットワーク��を�加 (��� Ad-Hoc "
-"�ットワーク�作�)���。�ャン�ル数��ンド間��複�る�����プロパティー��も� \"band\" プロパティーを設定�る必���り��。"
+msgstr "Wi-Fi 接続�使用�るワイアレス�ャン�ル。デ�イス��指定���ャン�ル� Wi-Fi �ットワーク��を�加 (��� Ad-Hoc �ットワーク�作�)���。�ャン�ル数��ンド間��複�る�����プロパティー��も� \"band\" プロパティーを設定�る必���り��。"
 
 #: ../clients/common/settings-docs.h.in:10
 msgid ""
@@ -5848,19 +5850,10 @@ msgid ""
 "defaults to \"preserve\" (older versions of NetworkManager may use a "
 "different default value). On D-Bus, this field is expressed as \"assigned-"
 "mac-address\" or the deprecated \"cloned-mac-address\"."
-msgstr ""
-"�れを指定��場���デ�イス����永続化 MAC アドレス�代�り��� MAC アドレスを使用�る必���り��。�れ��MAC "
-"クローニング���スプーフィング���知られ����。明示的� MAC "
-"アドレスを指定�る以外��\"preserve\"�\"permanent\"�\"random\"�\"stable\" "
-"�値�サ�ート�れ��。\"preserve\" ���アクティベーション時� MAC アドレスを変更���ん。\"permanent\" "
-"���デ�イス�永続化�ードウェアアドレスを使用���。\"random\" ����接続�ランダム� MAC "
-"アドレスを作����。\"stable\" ���connection.stable-id �機種�存キー�基�����ッシュ化�� MAC "
-"アドレスを作����。指定���場����値�グロー�ル�デフォルト�より上書��れ��。NetworkManager.conf "
-"を�照������。�れ�も指定���場���デフォルト� \"permanent\" �設定�れ��。D-Bus �������フィールド� "
-"\"assigned-mac-address\" ���廃止予定� \"cloned-mac-address\" ���表示�れ��。"
+msgstr "�れを指定��場���デ�イス����永続化 MAC アドレス�代�り��� MAC アドレスを使用�る必���り��。�れ��MAC クローニング���スプーフィング���知られ����。明示的� MAC アドレスを指定�る以外��\"preserve\"�\"permanent\"�\"random\"�\"stable\" �値�サ�ート�れ��。\"preserve\" ���アクティベーション時� MAC アドレスを変更���ん。\"permanent\" ���デ�イス�永続化�ードウェアアドレスを使用���。\"random\" ����接続�ランダム� MAC アドレスを作����。\"stable\" ���connection.stable-id �機種�存キー�基�����ッシュ化�� MAC アドレスを作����。指定���場����値�グロー�ル�デフォルト�より上書��れ��。NetworkManager.conf を�照������。�れ�も指定���場���デフォルト� \"permanent\" �設定�れ��。D-Bus �������フィールド� \"assigned-mac-address\" ���廃止予定� \"cloned-mac-address\" ���表示�れ��。"
 
 #: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -5878,28 +5871,14 @@ msgid ""
 "address after the mask, this address is used instead of the current MAC "
 "address to fill the bits that shall not be randomized. For example, a value "
 "of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC "
-"address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:"
-"00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-"
-"administered, burned-in MAC address. If the value contains more than one "
-"additional MAC addresses, one of them is chosen randomly. For example, \"02:"
-"00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully "
-"scrambled MAC address, randomly locally or globally administered."
-msgstr ""
-"\"cloned-mac-address\" を \"random\" ��� \"stable\" �設定�る��デフォルト�� MAC "
-"アドレス�����ビット�暗�化�れ�ローカル�管��れ�ユニキャスト� MAC "
-"アドレス�作��れ��。��プロパティー�より�特定�ビットを固定�るよ��指定����。ユニキャスト� MAC アドレスを作��る����最�� "
-"MAC アドレス�最下�ビット�常�設定�れ�������注�������。��プロパティーを NULL "
-"��る��デフォルト�接続設定�より上書��望����り��。��値を NULL "
-"�����る�空��る��デフォルト��ローカル�管��れ��るユニキャスト MAC アドレスを作����。��値� MAC "
-"アドレスを��る����アドレス�マスク���使用�れ��。マスク�設定�れ��るビット��デ�イス��在� MAC "
-"アドレスを満����。設定�れ����ビット�ランダム化�るよ���り��。\"FE:FF:FF:00:00:00\" �設定��場����在� MAC "
-"アドレス� OUI を�存��\"random\" アルゴリズム��� \"stable\" アルゴリズムを使用��下� 3 "
-"ビット��をランダム化���。��値�マスク��MAC アドレス� 1 �追加�れる����アドレス��在� MAC "
-"アドレス�代�り�使用�れ�ランダム化�れ��ビットを満����。�����\"FE:FF:FF:00:00:00 68:F7:28:00:00:"
-"00\" �値��MAC アドレス� OUI を 68:F7:28 �設定��下�ビットをランダム化���。\"02:00:00:00:00:00 00:"
-"00:00:00:00:00\" �値��完全�暗�化�れ�グロー�ル管����ーンイン�れ� MAC アドレス��。��値��MAC アドレスを 1 "
-"�以上追加�る������� 1 ��ランダム��択�れ��。�����\"02:00:00:00:00:00 00:00:00:00:00:00 02:"
-"00:00:00:00:00\" �完全�暗�化�れ� MAC アドレスを作���ランダム�ローカル���グロー�ル�管��れ��。"
+"address to 68:F7:28, while the lower bits are randomized. A value of "
+"\"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled "
+"globally-administered, burned-in MAC address. If the value contains more "
+"than one additional MAC addresses, one of them is chosen randomly. For "
+"example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will "
+"create a fully scrambled MAC address, randomly locally or globally "
+"administered."
+msgstr "\"cloned-mac-address\" を \"random\" ��� \"stable\" �設定�る��デフォルト�� MAC アドレス�����ビット�暗�化�れ�ローカル�管��れ�ユニキャスト� MAC アドレス�作��れ��。��プロパティー�より�特定�ビットを固定�るよ��指定����。ユニキャスト� MAC アドレスを作��る����最�� MAC アドレス�最下�ビット�常�設定�れ�������注�������。��プロパティーを NULL ��る��デフォルト�接続設定�より上書��望����り��。��値を NULL �����る�空��る��デフォルト��ローカル�管��れ��るユニキャスト MAC アドレスを作����。��値� MAC アドレスを��る����アドレス�マスク���使用�れ��。マスク�設定�れ��るビット��デ�イス��在� MAC アドレスを満����。設定�れ����ビット�ランダム化�るよ���り��。\"FE:FF:FF:00:00:00\" �設定��場����在� MAC アドレス� OUI を�存��\"random\" アルゴリズム��� \"stable\" アルゴリズムを使用��下� 3 ビット��をランダム化���。��値�マスク��MAC アドレス� 1 �追加�れる����アドレス��在� MAC アドレス�代�り�使用�れ�ランダム化�れ��ビットを満����。�����\"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" �値��MAC アドレス� OUI を 68:F7:28 �設定��下�ビットをランダム化���。\"02:00:00:00:00:00 00:00:00:00:00:00\" �値��完全�暗�化�れ�グロー�ル管����ーンイン�れ� MAC アドレス��。��値��MAC アドレスを 1 �以上追加�る������� 1 ��ランダム��択�れ��。�����\"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" �完全�暗�化�れ� MAC アドレスを作���ランダム�ローカル���グロー�ル�管��れ��。"
 
 #: ../clients/common/settings-docs.h.in:12
 msgid ""
@@ -5912,30 +5891,21 @@ msgid ""
 "not broadcast its SSID. Note that marking the network as hidden may be a "
 "privacy issue for you (in infrastructure mode) or client stations (in AP "
 "mode), as the explicit probe-scans are distinctly recognizable on the air."
-msgstr ""
-"TRUE �場�����ットワーク���� SSID "
-"を�表示��る�ブロードキャスト��ットワーク��る��を示�����。��場���信頼性�より高��ットワーク検出� SSID "
-"をプローブスキャン�る���様々�回�策を�択����。�����れら�回�策���表示� SSID "
-"�ットワークを使用��継承�れ��安定を公開�る����表示� SSID "
-"�ットワークを使用�る際�注��必���。明示的�プローブスキャン��ブロードキャスト�際����り��識��る�能性��る����ットワークを�表示�マーキング�る����プライ�シー��題��り得る���注�������。"
+msgstr "TRUE �場�����ットワーク���� SSID を�表示��る�ブロードキャスト��ットワーク��る��を示�����。��場���信頼性�より高��ットワーク検出� SSID をプローブスキャン�る���様々�回�策を�択����。�����れら�回�策���表示� SSID �ットワークを使用��継承�れ��安定を公開�る����表示� SSID �ットワークを使用�る際�注��必���。明示的�プローブスキャン��ブロードキャスト�際����り��識��る�能性��る����ットワークを�表示�マーキング�る����プライ�シー��題��り得る���注�������。"
 
 #: ../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 "
 "of the device (i.e. MAC spoofing)."
-msgstr ""
-"指定�る����接続�永続的� MAC アドレス�一致�る Wi-Fi デ�イス����用�れ��。��プロパティー�デ�イス� MAC "
-"アドレスを変更���ん (MAC スプーフィング)。"
+msgstr "指定�る����接続�永続的� MAC アドレス�一致�る Wi-Fi デ�イス����用�れ��。��プロパティー�デ�イス� MAC アドレスを変更���ん (MAC スプーフィング)。"
 
 #: ../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-"
 "digits-and-colons notation (eg \"00:11:22:33:44:55\")."
-msgstr ""
-"��接続を�用���も��� Wi-Fi デ�イス�永続化 MAC アドレス�一覧。� MAC アドレス��標準� 16 進数�コロン (\"00:11:"
-"22:33:44:55\" ��) �指定�る必���り��。"
+msgstr "��接続を�用���も��� Wi-Fi デ�イス�永続化 MAC アドレス�一覧。� MAC アドレス��標準� 16 進数�コロン (\"00:11:22:33:44:55\" ��) �指定�る必���り��。"
 
 #: ../clients/common/settings-docs.h.in:15
 msgid ""
@@ -5945,23 +5915,16 @@ msgid ""
 "MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize "
 "the MAC address). This property is deprecated for 'cloned-mac-address'. "
 "Deprecated: 1"
-msgstr ""
-"NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) "
-"(グロー�ルデフォルトをランダム化�設定��サプリカント�ランダム化をサ�ート�る場�を除���ランダム化�れる����り��ん)�NM_SETTING_MAC_RANDOMIZATION_NEVER "
-"(1) (MAC アドレス�ランダム化�れる����り��ん)���� NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) "
-"(MAC アドレス�常�ランダム化�れ��) ���れ���り��。��プロパティー� 'cloned-mac-address' "
-"��推奨��り��。�推奨: 1"
+msgstr "NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (グロー�ルデフォルトをランダム化�設定��サプリカント�ランダム化をサ�ート�る場�を除���ランダム化�れる����り��ん)�NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (MAC アドレス�ランダム化�れる����り��ん)���� NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (MAC アドレス�常�ランダム化�れ��) ���れ���り��。��プロパティー� 'cloned-mac-address' ��推奨��り��。�推奨: 1"
 
 #: ../clients/common/settings-docs.h.in:16
 msgid ""
-"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\"."
-"  If blank, infrastructure is assumed."
-msgstr ""
-"Wi-Fi �ットワークモード; \"infrastructure\"�\"mesh\"�\"adhoc\"���� \"ap\" "
-"���れ���り��。空白��る��インフラストラク�ャー�推測�れ��。"
+"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap"
+"\".  If blank, infrastructure is assumed."
+msgstr "Wi-Fi �ットワークモード; \"infrastructure\"�\"mesh\"�\"adhoc\"���� \"ap\" ���れ���り��。空白��る��インフラストラク�ャー�推測�れ��。"
 
 #: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
@@ -5974,12 +5937,7 @@ msgid ""
 "saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently "
 "configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
 "globally configured value). All other values are reserved."
-msgstr ""
-"NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (Wi-Fi "
-"�電力を無効化)�NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (Wi-Fi "
-"�電力を有効化)�NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (�在設定�れ��る内容�変更���)���� "
-"NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (グロー�ル�設定��値を使用) "
-"���れ���り��。��他�����値�予約�れ��。"
+msgstr "NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (Wi-Fi �電力を無効化)�NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (Wi-Fi �電力を有効化)�NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (�在設定�れ��る内容�変更���)���� NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (グロー�ル�設定��値を使用) ���れ���り��。��他�����値�予約�れ��。"
 
 #: ../clients/common/settings-docs.h.in:19
 msgid ""
@@ -5987,22 +5945,16 @@ msgid ""
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
 "s.  This property is highly driver dependent and not all devices support "
 "setting a static bitrate."
-msgstr ""
-"ゼロ以外��デ�イス��アクセス�イント�接続�る���指定��ビットレート��を使用�るよ��命令���。��� Kb/s���り 5500 = 5."
-"5 Mbit/s ��。��プロパティー��ドライ�ー�高��存���的�ビットレート�設定を����デ�イス�サ�ート�る�����り��ん。"
+msgstr "ゼロ以外��デ�イス��アクセス�イント�接続�る���指定��ビットレート��を使用�るよ��命令���。��� Kb/s���り 5500 = 5.5 Mbit/s ��。��プロパティー��ドライ�ー�高��存���的�ビットレート�設定を����デ�イス�サ�ート�る�����り��ん。"
 
 #: ../clients/common/settings-docs.h.in:20
 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 network.  "
-"NetworkManager internally tracks previously seen BSSIDs. The property is "
-"only meant for reading and reflects the BSSID list of NetworkManager. The "
-"changes you make to this property will not be preserved."
-msgstr ""
-"Wi-Fi �ットワーク�一部���検出�� BSSID (BSSID � \"00:11:22:33:44:55\" ��� MAC アドレス�形�) "
-"�一覧。NetworkManager ��以�表示�れ��� BSSID "
-"を内部�監視���。��プロパティー�読��り�使用�れ�NetworkManager � BSSID "
-"一覧を�映���。��変更�より�プロパティー��存�れ���り��。"
+"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 "
+"network.  NetworkManager internally tracks previously seen BSSIDs. The "
+"property is only meant for reading and reflects the BSSID list of "
+"NetworkManager. The changes you make to this property will not be preserved."
+msgstr "Wi-Fi �ットワーク�一部���検出�� BSSID (BSSID � \"00:11:22:33:44:55\" ��� MAC アドレス�形�) �一覧。NetworkManager ��以�表示�れ��� BSSID を内部�監視���。��プロパティー�読��り�使用�れ�NetworkManager � BSSID 一覧を�映���。��変更�より�プロパティー��存�れ���り��。"
 
 #: ../clients/common/settings-docs.h.in:21
 msgid "SSID of the Wi-Fi network. Must be specified."
@@ -6013,9 +5965,7 @@ 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 "
 "support setting a static transmit power."
-msgstr ""
-"ゼロ以外��指定���信電力を使用�るよ��デ�イス�命令���。��� dBm "
-"��。��プロパティー��ドライ�ー�大���存���り�����デ�イス��的�信電力をサ�ート���る���り��ん。"
+msgstr "ゼロ以外��指定���信電力を使用�るよ��デ�イス�命令���。��� dBm ��。��プロパティー��ドライ�ー�大���存���り�����デ�イス��的�信電力をサ�ート���る���り��ん。"
 
 #: ../clients/common/settings-docs.h.in:23
 msgid ""
@@ -6031,33 +5981,17 @@ msgid ""
 "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 �管�を無効) �ら組����る�������。"
+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:24
 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\" for "
-"Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When "
-"using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the "
-"\"leap-username\" and \"leap-password\" properties must be specified."
-msgstr ""
-"WEP を使用���る場� (��り key-mgmt = \"none\" ��� \"ieee8021x\") ���� AP ��求�れる 802."
-"11 �証アルゴリズムを示�����。\"open\" (Open System �場�)�\"shared\" (Shared Key "
-"�場�)�\"leap\" (Cisco LEAP �場�) ���れ���り��。Cisco LEAP (��り key-mgmt = "
-"\"ieee8021x\" �よ� auth-alg = \"leap\") を使用���る場���\"leap-username\" プロパティー� "
-"\"leap-password\" プロパティーを指定�る必���り��。"
+"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
+"802.11 authentication algorithm required by the AP here.  One of \"open\" "
+"for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  "
+"When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
+"the \"leap-username\" and \"leap-password\" properties must be specified."
+msgstr "WEP を使用���る場� (��り key-mgmt = \"none\" ��� \"ieee8021x\") ���� AP ��求�れる 802.11 �証アルゴリズムを示�����。\"open\" (Open System �場�)�\"shared\" (Shared Key �場�)�\"leap\" (Cisco LEAP �場�) ���れ���り��。Cisco LEAP (��り key-mgmt = \"ieee8021x\" �よ� auth-alg = \"leap\") を使用���る場���\"leap-username\" プロパティー� \"leap-password\" プロパティーを指定�る必���り��。"
 
 #: ../clients/common/settings-docs.h.in:25
 msgid ""
@@ -6069,16 +6003,7 @@ msgid ""
 "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 �任��有効��り��。"
+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:26
 msgid ""
@@ -6086,28 +6011,21 @@ msgid ""
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
 "For maximum compatibility leave this property empty.  Each list element may "
 "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
-msgstr ""
-"グループ/ブロードキャスト�暗�化アルゴリズム�リスト。��リスト�挙�られ����アルゴリズムを使用��� Wi-Fi "
-"�ットワーク��接続を阻止���。互�性を最大��る�����プロパティーを空����。リストエレメント���れ�れ "
-"\"wep40\"�\"wep104\"�\"tkip\"���� \"ccmp\" ���れ���る�������。"
+msgstr "グループ/ブロードキャスト�暗�化アルゴリズム�リスト。��リスト�挙�られ����アルゴリズムを使用��� Wi-Fi �ットワーク��接続を阻止���。互�性を最大��る�����プロパティーを空����。リストエレメント���れ�れ \"wep40\"�\"wep104\"�\"tkip\"���� \"ccmp\" ���れ���る�������。"
 
 #: ../clients/common/settings-docs.h.in:27
 msgid ""
-"Key management used for the connection.  One of \"none\" (WEP), "
-"\"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" "
-"(infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). "
-"This property must be set for any Wi-Fi connection that uses security."
-msgstr ""
-"接続�使用�るキー管�。\"none\" (WEP)�\"ieee8021x\" (Dynamic WEP)�\"wpa-none\" (Ad-Hoc "
-"WPA-PSK)�\"wpa-psk\" (インフラストラク�ャー WPA-PSK)�\"sae\" (SAE) ��� \"wpa-eap\" "
-"(WPA-Enterprise) ���れ���り��。��プロパティー��セキュリティーを使用�る���� Wi-Fi 接続�設定�る必���り��。"
+"Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or "
+"\"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi "
+"connection that uses security."
+msgstr "接続�使用�れるキー管�。\"none\" (WEP)�\"ieee8021x\" (Dynamic WEP)�\"wpa-psk\" (infrastructure WPA-PSK)�\"sae\" (SAE)���� \"wpa-eap\" (WPA-Enterprise) ���れ���り��。��プロパティー��セキュリティーを使用�る Wi-Fi 接続�対��設定�る必���り��。"
 
 #: ../clients/common/settings-docs.h.in:28
 msgid ""
 "The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
-msgstr ""
-"レガシー LEAP 接続�ログインパスワード (key-mgmt = \"ieee8021x\" �よ� auth-alg = \"leap\")。"
+msgstr "レガシー LEAP 接続�ログインパスワード (key-mgmt = \"ieee8021x\" �よ� auth-alg = \"leap\")。"
 
 #: ../clients/common/settings-docs.h.in:29
 msgid "Flags indicating how to handle the \"leap-password\" property."
@@ -6117,8 +6035,7 @@ msgstr "\"leap-password\" プロパティー�処�方法を示�フラグ。
 msgid ""
 "The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" "
 "and auth-alg = \"leap\")."
-msgstr ""
-"レガシー LEAP 接続�ログインユーザー� (key-mgmt = \"ieee8021x\" �よ� auth-alg = \"leap\")。"
+msgstr "レガシー LEAP 接続�ログインユーザー� (key-mgmt = \"ieee8021x\" �よ� auth-alg = \"leap\")。"
 
 #: ../clients/common/settings-docs.h.in:31
 msgid ""
@@ -6126,10 +6043,7 @@ msgid ""
 "networks that do not utilize one of the algorithms in the list. For maximum "
 "compatibility leave this property empty.  Each list element may be one of "
 "\"tkip\" or \"ccmp\"."
-msgstr ""
-"ペア暗�化アルゴリズム�リスト。��リスト�挙�られ����アルゴリズムを使用�る Wi-Fi "
-"�ットワーク��接続を阻止���。互�性を最大��る�����プロパティーを空����。リストエレメント��れ�れ \"tkip\" ��� "
-"\"ccmp\" �����。"
+msgstr "ペア暗�化アルゴリズム�リスト。��リスト�挙�られ����アルゴリズムを使用�る Wi-Fi �ットワーク��接続を阻止���。互�性を最大��る�����プロパティーを空����。リストエレメント��れ�れ \"tkip\" ��� \"ccmp\" �����。"
 
 #: ../clients/common/settings-docs.h.in:32
 msgid ""
@@ -6141,24 +6055,14 @@ msgid ""
 "NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not "
 "supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
 "global default is set, PMF will be optionally enabled."
-msgstr ""
-"�護付�管�フレーム (802.11w) を有効��る必���り��。NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT "
-"(0) (グロー�ル�デフォルト値を使用�る)�NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (PMF "
-"を無効�る)�NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) "
-"(サプリカント�よ�アクセス�イント�よ��サ�ート�れ��る場�� PMF "
-"を有効��る)�NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (PMF "
-"を有効���サ�ート�れ����場��失敗�る) "
-"���れ�を有効����。NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) "
-"を設定��グロー�ルデフォルト�設定�れ����場���PMF �任��有効��り��。"
+msgstr "�護付�管�フレーム (802.11w) を有効��る必���り��。NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) (グロー�ル�デフォルト値を使用�る)�NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1) (PMF を無効�る)�NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2) (サプリカント�よ�アクセス�イント�よ��サ�ート�れ��る場�� PMF を有効��る)�NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (PMF を有効���サ�ート�れ����場��失敗�る) ���れ�を有効����。NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) を設定��グロー�ルデフォルト�設定�れ����場���PMF �任��有効��り��。"
 
 #: ../clients/common/settings-docs.h.in:33
 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 "
 "specified, both WPA and RSN connections are allowed."
-msgstr ""
-"利用�能� WPA プロトコル��ージョンを指定�る文字列�リスト。�素� \"wpa\" (WPA を許�) ��� \"rsn\" (WPA2/"
-"RSN を許�) ��り��。指定�������WPA 接続� RSN 接続�両方�許��れ��。"
+msgstr "利用�能� WPA プロトコル��ージョンを指定�る文字列�リスト。�素� \"wpa\" (WPA を許�) ��� \"rsn\" (WPA2/RSN を許�) ��り��。指定�������WPA 接続� RSN 接続�両方�許��れ��。"
 
 #: ../clients/common/settings-docs.h.in:34
 msgid ""
@@ -6167,10 +6071,7 @@ msgid ""
 "standard) hashed to derive the actual key, or the key in form of 64 "
 "hexadecimal character. The WPA3-Personal networks use a passphrase of any "
 "length for SAE authentication."
-msgstr ""
-"WPA �ットワーク�共有��キー。WPA-PSK ���実際�キーを�得�る��� (802.11i 仕様�指定�れ��るよ��) �ッシュ化�れ� "
-"8 文字�ら 63 文字� ASCII パスフレーズ��16 進数�文字形��キー���れ���り��。WPA3-Personal "
-"�ットワーク��SAE ��証�文字数�制����パスフレーズを使用���。"
+msgstr "WPA �ットワーク�共有��キー。WPA-PSK ���実際�キーを�得�る��� (802.11i 仕様�指定�れ��るよ��) �ッシュ化�れ� 8 文字�ら 63 文字� ASCII パスフレーズ��16 進数�文字形��キー���れ���り��。WPA3-Personal �ットワーク��SAE ��証�文字数�制����パスフレーズを使用���。"
 
 #: ../clients/common/settings-docs.h.in:35
 msgid "Flags indicating how to handle the \"psk\" property."
@@ -6190,42 +6091,31 @@ msgid ""
 "NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as "
 "a string and will be hashed using the de-facto MD5 method to derive the "
 "actual WEP key."
-msgstr ""
-"WEP キー�解釈を制����。使用��る値� NM_WEP_KEY_TYPE_KEY (1) ��キー� 10 文字��� 26 文字� 16 "
-"進数��る��5 文字��� 13 文字� ASCII パスワード��る必���り��。も��� NM_WEP_KEY_TYPE_PASSPHRASE "
-"(2) を使用��������場���パスフレーズを文字列����供��実際� WEP キーを�得�る MD5 メソッドを使用���ッシュ化�れ��。"
+msgstr "WEP キー�解釈を制����。使用��る値� NM_WEP_KEY_TYPE_KEY (1) ��キー� 10 文字��� 26 文字� 16 進数��る��5 文字��� 13 文字� ASCII パスワード��る必���り��。も��� NM_WEP_KEY_TYPE_PASSPHRASE (2) を使用��������場���パスフレーズを文字列����供��実際� WEP キーを�得�る MD5 メソッドを使用���ッシュ化�れ��。"
 
 #: ../clients/common/settings-docs.h.in:38
 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."
-msgstr ""
-"インデックス 0 � WEP キー。�� WEP キー��多��ットワーク�使用�れ����。キー�解釈方法��\"wep-key-type\" "
-"プロパティーを�照������。"
+msgstr "インデックス 0 � WEP キー。�� WEP キー��多��ットワーク�使用�れ����。キー�解釈方法��\"wep-key-type\" プロパティーを�照������。"
 
 #: ../clients/common/settings-docs.h.in:39
 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."
-msgstr ""
-"インデックス 1 � WEP キー。�� WEP インデックス��多���ットワーク�使用�れ����ん。キー�解釈方法��\"wep-key-"
-"type\" プロパティーを�照������。"
+msgstr "インデックス 1 � WEP キー。�� WEP インデックス��多���ットワーク�使用�れ����ん。キー�解釈方法��\"wep-key-type\" プロパティーを�照������。"
 
 #: ../clients/common/settings-docs.h.in:40
 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."
-msgstr ""
-"インデックス 2 � WEP キー。�� WEP インデックス��多���ットワーク�使用�れ����ん。キー�解釈方法��\"wep-key-"
-"type\" プロパティーを�照������。"
+msgstr "インデックス 2 � WEP キー。�� WEP インデックス��多���ットワーク�使用�れ����ん。キー�解釈方法��\"wep-key-type\" プロパティーを�照������。"
 
 #: ../clients/common/settings-docs.h.in:41
 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."
-msgstr ""
-"インデックス 3 � WEP キー。�� WEP インデックス��多���ットワーク�使用�れ����ん。キー�解釈方法��\"wep-key-"
-"type\" プロパティーを�照������。"
+msgstr "インデックス 3 � WEP キー。�� WEP インデックス��多���ットワーク�使用�れ����ん。キー�解釈方法��\"wep-key-type\" プロパティーを�照������。"
 
 #: ../clients/common/settings-docs.h.in:42
 msgid ""
@@ -6233,10 +6123,7 @@ msgid ""
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
 "(default key) through 3.  Note that some consumer access points (like the "
 "Linksys WRT54G) number the keys 1 - 4."
-msgstr ""
-"�的 WEP �使用�れ (��り key-mgmt = \"none\")�デフォルト���� WEP キーインデックス� AP "
-"�使用�れる場����� WEP キーインデックスを���入力���。有効�値� 0 (デフォルトキー) �ら 3 "
-"��。コンシューマー�アクセス�イント (Linksys WRT54G ��) �キー番�� 1 - 4 ��り��。"
+msgstr "�的 WEP �使用�れ (��り key-mgmt = \"none\")�デフォルト���� WEP キーインデックス� AP �使用�れる場����� WEP キーインデックスを���入力���。有効�値� 0 (デフォルトキー) �ら 3 ��。コンシューマー�アクセス�イント (Linksys WRT54G ��) �キー番�� 1 - 4 ��り��。"
 
 #: ../clients/common/settings-docs.h.in:43
 msgid ""
@@ -6245,28 +6132,21 @@ msgid ""
 "determine whether it's feasible to start WPS enrollment from the Access "
 "Point capabilities. WPS can be disabled by setting this property to a value "
 "of 1."
-msgstr ""
-"WPS �モード�使用�れる場�����モード�使用�れる�を示�フラグ。アクセス�イント�機能�ら WPS エンロールメントを開始��る����を "
-"NetworkManager  �自動的�決定�る���デフォルト設定�変更を�る利点���ん��り��ん。��プロパティー�値を 1 ��る� WPS "
-"を無効�����。"
+msgstr "WPS �モード�使用�れる場�����モード�使用�れる�を示�フラグ。アクセス�イント�機能�ら WPS エンロールメントを開始��る����を NetworkManager  �自動的�決定�る���デフォルト設定�変更を�る利点���ん��り��ん。��プロパティー�値を 1 ��る� WPS を無効�����。"
 
 #: ../clients/common/settings-docs.h.in:44
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
 "verification of the server certificate's altSubjectName is performed."
-msgstr ""
-"�証サー�ー�表示�れる証明書� altSubjectName �一致�る文字列�一覧。��一覧�空�場���サー�ー証明書� "
-"altSubjectName �検証�れ��ん。"
+msgstr "�証サー�ー�表示�れる証明書� altSubjectName �一致�る文字列�一覧。��一覧�空�場���サー�ー証明書� altSubjectName �検証�れ��ん。"
 
 #: ../clients/common/settings-docs.h.in:45
 msgid ""
 "Anonymous identity string for EAP authentication methods.  Used as the "
 "unencrypted identity with EAP types that support different tunneled identity "
 "like EAP-TTLS."
-msgstr ""
-"EAP �証���る匿�アイデンティティ�文字列。EAP-TTLS ���別�トン�ル化アイデンティティをサ�ート�る EAP "
-"タイプ��暗�化�����アイデンティティ���使用����。"
+msgstr "EAP �証���る匿�アイデンティティ�文字列。EAP-TTLS ���別�トン�ル化アイデンティティをサ�ート�る EAP タイプ��暗�化�����アイデンティティ���使用����。"
 
 #: ../clients/common/settings-docs.h.in:46
 msgid ""
@@ -6276,8 +6156,8 @@ msgstr "�証�タイムアウト。ゼロ�グロー�ル�デフォルト
 
 #: ../clients/common/settings-docs.h.in:47
 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 "
+"Contains the CA certificate if used by the EAP method specified in the \"eap"
+"\" property. Certificate data is specified using a \"scheme\"; two are "
 "currently supported: blob and path. When using the blob scheme (which is "
 "backwards compatible with NM 0.7.x) this property should be set to the "
 "certificate's DER encoded data. When using the path scheme, this property "
@@ -6285,22 +6165,14 @@ msgid ""
 "with the string \"file://\" and ending with a terminating NUL byte. This "
 "property can be unset even if the EAP method supports CA certificates, but "
 "this allows man-in-the-middle attacks and is NOT recommended."
-msgstr ""
-"\"eap\" プロパティー�指定�� EAP メソッド�使用�る場���CA 証明書を����。証明書データ� \"scheme\" "
-"を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) "
-"ブロブスキームを使用�る場�����プロパティーを�証明書� DER "
-"エンコードデータ�設定�る必���り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL "
-"�イト�終�る UTF-8 エンコード�フルパス�指定�る証明書�設定�る必���り��。��プロパティー��EAP メソッド� CA "
-"証明書をサ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨�れ��ん。"
+msgstr "\"eap\" プロパティー�指定�� EAP メソッド�使用�る場���CA 証明書を����。証明書データ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) ブロブスキームを使用�る場�����プロパティーを�証明書� DER エンコードデータ�設定�る必���り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フルパス�指定�る証明書�設定�る必���り��。��プロパティー��EAP メソッド� CA 証明書をサ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨�れ��ん。"
 
 #: ../clients/common/settings-docs.h.in:48
 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 "
 "that requires a login."
-msgstr ""
-"\"ca-cert\" プロパティー��存�れ� CA 証明書�アクセス�る��使用�れるパスワード。証明書��ログインを�求�る PKCS#11 "
-"トークン��存�れ�場�����用�れ��。"
+msgstr "\"ca-cert\" プロパティー��存�れ� CA 証明書�アクセス�る��使用�れるパスワード。証明書��ログインを�求�る PKCS#11 トークン��存�れ�場�����用�れ��。"
 
 #: ../clients/common/settings-docs.h.in:49
 msgid "Flags indicating how to handle the \"ca-cert-password\" property."
@@ -6311,9 +6183,7 @@ 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 "
 "certificate specified in the \"ca-cert\" property."
-msgstr ""
-"\"ca-cert\" プロパティー�指定�れ�証明書�追加�る際��検証�ェイン�追加�れる PEM フォーマット��� DER "
-"フォーマット�証明書を�むディレクトリー�� UTF-8 エンコードパス。"
+msgstr "\"ca-cert\" プロパティー�指定�れ�証明書�追加�る際��検証�ェイン�追加�れる PEM フォーマット��� DER フォーマット�証明書を�むディレクトリー�� UTF-8 エンコードパス。"
 
 #: ../clients/common/settings-docs.h.in:51
 msgid ""
@@ -6324,21 +6194,14 @@ msgid ""
 "certificate's DER encoded data. When using the path scheme, this property "
 "should be set to the full UTF-8 encoded path of the certificate, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte."
-msgstr ""
-"\"eap\" プロパティー�指定�� EAP メソッド�使用�る場���クライアント証明書を����。証明書データ� \"scheme\" "
-"を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x �後方互�性��る) "
-"ブロブスキームを使用�る場�����プロパティーを�証明書� DER "
-"エンコードデータ�設定�る必���り��。パススキームを使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL "
-"�イト�終�る UTF-8 エンコード�フル パス�指定�る証明書�設定�る必���り��。"
+msgstr "\"eap\" プロパティー�指定�� EAP メソッド�使用�る場���クライアント証明書を����。証明書データ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x �後方互�性��る) ブロブスキームを使用�る場�����プロパティーを�証明書� DER エンコードデータ�設定�る必���り��。パススキームを使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�る証明書�設定�る必���り��。"
 
 #: ../clients/common/settings-docs.h.in:52
 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 "
 "that requires a login."
-msgstr ""
-"\"client-cert\" プロパティー��存�れ�クライアント証明書�アクセス�る���使用�れるパスワード。証明書��ログインを�求�る "
-"PKCS#11 トークン��存�れ�場�����用�れ��。"
+msgstr "\"client-cert\" プロパティー��存�れ�クライアント証明書�アクセス�る���使用�れるパスワード。証明書��ログインを�求�る PKCS#11 トークン��存�れ�場�����用�れ��。"
 
 #: ../clients/common/settings-docs.h.in:53
 msgid "Flags indicating how to handle the \"client-cert-password\" property."
@@ -6351,10 +6214,7 @@ msgid ""
 "authentication server.  If a matching dNSName is found, this constraint is "
 "met.  If no dNSName values are present, this constraint is matched against "
 "SubjectName CN using same suffix match comparison."
-msgstr ""
-"サー�ードメイン��制約。設定�る���� FQDN ���証サー�ー�表示�る証明書� dNSName "
-"�素�対���サフィックス一致�件���使用�れ��。一致�る dNSName �見��る����制約�満��れ��。dNSName "
-"値�表示�れ������制約����サフィックス一致比較を使用�� SubjectName CN を照����。"
+msgstr "サー�ードメイン��制約。設定�る���� FQDN ���証サー�ー�表示�る証明書� dNSName �素�対���サフィックス一致�件���使用�れ��。一致�る dNSName �見��る����制約�満��れ��。dNSName 値�表示�れ������制約����サフィックス一致比較を使用�� SubjectName CN を照����。"
 
 #: ../clients/common/settings-docs.h.in:55
 msgid ""
@@ -6363,12 +6223,7 @@ msgid ""
 "\"pwd\", and \"fast\".  Each method requires different configuration using "
 "the properties of this setting; refer to wpa_supplicant documentation for "
 "the allowed combinations."
-msgstr ""
-"802.1x ��ットワーク��証�る際�使用��る EAP "
-"メソッド。有効�メソッド��\"leap\"�\"md5\"�\"tls\"�\"peap\"�\"ttls\"�\"pwd\"��よ� "
-"\"fast\" "
-"��り��。メソッド�����設定�プロパティーを使用��設定��れ�れ必���り��。�能�組����������wpa_supplicant "
-"ドキュメントを�照������。"
+msgstr "802.1x ��ットワーク��証�る際�使用��る EAP メソッド。有効�メソッド��\"leap\"�\"md5\"�\"tls\"�\"peap\"�\"ttls\"�\"pwd\"��よ� \"fast\" ��り��。メソッド�����設定�プロパティーを使用��設定��れ�れ必���り��。�能�組����������wpa_supplicant ドキュメントを�照������。"
 
 #: ../clients/common/settings-docs.h.in:56
 msgid ""
@@ -6377,42 +6232,45 @@ msgid ""
 msgstr "EAP �証方法�アイデンティティ文字列。�����ユーザー�ユーザー����ログイン���り��。"
 
 #: ../clients/common/settings-docs.h.in:57
+msgid ""
+"Whether the 802.1X authentication is optional. If TRUE, the activation will "
+"continue even after a timeout or an authentication failure. Setting the "
+"property to TRUE is currently allowed only for Ethernet connections. If set "
+"to FALSE, the activation can continue only after a successful authentication."
+msgstr "802.1X �証�オプション����。TRUE �場��タイムアウト����証エラー�発生��後�も�アクティベーション�続行�れ��。�在�プロパティーを TRUE �設定��る���イーサ�ット接続�場�����。FALSE �設定�る���証��功��後���アクティベーションを続行����。"
+
+#: ../clients/common/settings-docs.h.in:58
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr "EAP-FAST � PAC を�む UTF-8 エンコーディングファイルパス。"
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:59
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
-msgstr ""
-"EAP �証方法�使用�る UTF-8 エンコード�パスワード。\"password\" プロパティー� \"password-raw\" "
-"プロパティー�両方を指定�る��\"password\" �優先�れ��。"
+msgstr "EAP �証方法�使用�る UTF-8 エンコード�パスワード。\"password\" プロパティー� \"password-raw\" プロパティー�両方を指定�る��\"password\" �優先�れ��。"
 
-#: ../clients/common/settings-docs.h.in:59
-#: ../clients/common/settings-docs.h.in:104
-#: ../clients/common/settings-docs.h.in:131
-#: ../clients/common/settings-docs.h.in:179
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:299
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "\"password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:61
 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\" "
 "property and the \"password-raw\" property are specified, \"password\" is "
 "preferred."
-msgstr ""
-"EAP �証方法�使用�るパスワード。UTF-8 "
-"以外�エンコーディングを使用��パスワード�使用��る�イト�列���指定���。\"password\" プロパティー� \"password-"
-"raw\" プロパティー�両方を指定�る��\"password\" �優先�れ��。"
+msgstr "EAP �証方法�使用�るパスワード。UTF-8 以外�エンコーディングを使用��パスワード�使用��る�イト�列���指定���。\"password\" プロパティー� \"password-raw\" プロパティー�両方を指定�る��\"password\" �優先�れ��。"
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:62
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr "\"password-raw\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:63
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6420,89 +6278,64 @@ msgid ""
 "the supplicant to allow or forbid it. The TLS options map to "
 "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
 "details."
-msgstr ""
-"NMSetting8021xAuthFlags オプションを使用���\"phase 1\" �外部�証を使用�る�証フラグを指定���。� TLS "
-"�ージョン�明示的�無効�����。特定� TLS 無効フラグ�設定�れ����場���サプリカント�許����拒����。TLS オプション� "
-"tls_disable_tlsv1_x 設定�マッピング�れ��。詳細��wpa_supplicant ドキュメントを�照������。"
+msgstr "NMSetting8021xAuthFlags オプションを使用���\"phase 1\" �外部�証を使用�る�証フラグを指定���。� TLS �ージョン�明示的�無効�����。特定� TLS 無効フラグ�設定�れ����場���サプリカント�許����拒����。TLS オプション� tls_disable_tlsv1_x 設定�マッピング�れ��。詳細��wpa_supplicant ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.h.in:64
 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 "
-"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), \"2\" "
-"(allow authenticated provisioning), and \"3\" (allow both authenticated and "
-"unauthenticated provisioning).  See the wpa_supplicant documentation for "
-"more details."
-msgstr ""
-"\"eap\" プロパティー� EAP メソッド FAST を指定��場���EAP-FAST "
-"信用情報�インラインプロビジョニングを有効���無効����。�識�れる値� \"0\" (無効)�\"1\" "
-"(��証プロビジョニングを許�)�\"2\" (�証�れ�プロビジョニングを許�)��よ� \"3\" "
-"(�証�れ�プロビジョニング����証プロビジョニングを許�) ��り��。詳細��wpa_supplicant ドキュメントを�照������。"
+"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), "
+"\"2\" (allow authenticated provisioning), and \"3\" (allow both "
+"authenticated and unauthenticated provisioning).  See the wpa_supplicant "
+"documentation for more details."
+msgstr "\"eap\" プロパティー� EAP メソッド FAST を指定��場���EAP-FAST 信用情報�インラインプロビジョニングを有効���無効����。�識�れる値� \"0\" (無効)�\"1\" (��証プロビジョニングを許�)�\"2\" (�証�れ�プロビジョニングを許�)��よ� \"3\" (�証�れ�プロビジョニング����証プロビジョニングを許�) ��り��。詳細��wpa_supplicant ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.h.in:65
 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 "
 "\"1\" to force use of the new PEAP label.  See the wpa_supplicant "
 "documentation for more details."
-msgstr ""
-"キー派生時��新�� PEAP ラベルを使用�る��を強制���。一部� RADIUS サー�ー���新��ラベルを�PEAPv1 "
-"��時�使用�るよ��強制�る必���り��。\"1\" �設定�る��新�� PEAP "
-"ラベルを使用�る��を強制���。詳細��wpa_supplicant ドキュメントを�照������。"
+msgstr "キー派生時��新�� PEAP ラベルを使用�る��を強制���。一部� RADIUS サー�ー���新��ラベルを�PEAPv1 ��時�使用�るよ��強制�る必���り��。\"1\" �設定�る��新�� PEAP ラベルを使用�る��を強制���。詳細��wpa_supplicant ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.h.in:66
 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 "
 "used.  Sometimes when using older RADIUS servers, it is necessary to force "
 "the client to use a particular PEAP version.  To do so, this property may be "
 "set to \"0\" or \"1\" to force that specific PEAP version."
-msgstr ""
-"\"eap\" プロパティー� EAP メソッド PEAP を設定�る場��使用�る PEAP "
-"�ージョンを強制���。�れを設定�����サー�ー�報告�る�ージョン�使用�れ��。以�� RADIUS "
-"サー�ー�使用�れる場���り�クライアント�特定� PEAP �ージョンを使用�るよ��強制�る必���り��。���������プロパティーを "
-"\"0\" ��� \"1\" �設定����� PEAP �ージョンを強制���。"
+msgstr "\"eap\" プロパティー� EAP メソッド PEAP を設定�る場��使用�る PEAP �ージョンを強制���。�れを設定�����サー�ー�報告�る�ージョン�使用�れ��。以�� RADIUS サー�ー�使用�れる場���り�クライアント�特定� PEAP �ージョンを使用�るよ��強制�る必���り��。���������プロパティーを \"0\" ��� \"1\" �設定����� PEAP �ージョンを強制���。"
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
 "authentication. If the list is empty, no verification of the server "
 "certificate's altSubjectName is performed."
-msgstr ""
-"内部� \"phase 2\" �証時���証サー�ー�表示�る証明書� altSubjectName "
-"�一致��文字列�一覧。��一覧�空�場���サー�ー証明書� altSubjectName �検証�れ��ん。"
+msgstr "内部� \"phase 2\" �証時���証サー�ー�表示�る証明書� altSubjectName �一致��文字列�一覧。��一覧�空�場���サー�ー証明書� altSubjectName �検証�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
-"Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
+"Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
 "property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", "
 "\"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each "
 "\"phase 2\" inner method requires specific parameters for successful "
 "authentication; see the wpa_supplicant documentation for more details."
-msgstr ""
-"TLS トン�ルを使用�るEAP  メソッドを \"eap\" プロパティー�指定��場���利用�能� \"phase 2\" 内�� EAP "
-"�証方法を指定���。一般的���られ��る� EAP � \"phase 2\" "
-"メソッド��\"pap\"�\"chap\"�\"mschap\"�\"mschapv2\"�\"gtc\"�\"otp\"�\"md5\"��よ� "
-"\"tls\" ��。�証を�功��る���� \"phase 2\" �内部メソッド�特別�パラメーター�必���。詳細� "
-"wpa_supplicant ドキュメントを�照������。"
+msgstr "内部 TLS トン�ルを使用�る EAP 方�� \"eap\" プロパティー�指定�れ��る場��許��れる \"phase 2\" 内部� EAP �証方�を指定���。�識�れる� EAP \"phase 2\" 方�� \"pap\"�\"chap\"�\"mschap\"�\"mschapv2\"�\"gtc\"�\"otp\"�\"md5\"��よ� \"tls\" ��。� \"phase 2\" 内部方�����証を�功��る���特定�パラメーター�必���。詳細������wpa_supplicant �ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.h.in:69
 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\" "
+"Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
+"an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
 "property.  Recognized EAP-based \"phase 2\" methods are \"md5\", "
 "\"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method "
 "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\" ��。�証を�功��る���\"phase "
-"2\" 内��方法�特別�パラメーター�必���。詳細� wpa_supplicant ドキュメントを�照������。"
+msgstr "内部 TLS トン�ルを使用�る EAP 方�� \"eap\" プロパティー�指定�れ��る場��許��れる \"phase 2\" 内部 EAP ベース��証方�を指定���。�識�れる EAP ベース� \"phase 2\" 方���\"md5\"�\"mschapv2\"�\"otp\"�\"gtc\"��よ� \"tls\" ��。� \"phase 2\" 内部方�����証を�功��る���特定�パラメーター�必���。詳細������wpa_supplicant �ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.h.in:70
 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 "
@@ -6514,38 +6347,28 @@ msgid ""
 "with a terminating NUL byte. This property can be unset even if the EAP "
 "method supports CA certificates, but this allows man-in-the-middle attacks "
 "and is NOT recommended."
-msgstr ""
-"\"phase2-auth\" プロパティー��� \"phase2-autheap\" プロパティー�指定�� EAP "
-"メソッド�使用�る場���\"phase 2\" � CA 証明書を����。証明書データ� \"scheme\" "
-"を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) "
-"ブロブスキームを使用�る場�����プロパティーを�証明書� DER "
-"エンコードデータ�設定�る必���り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL "
-"�イト�終�る UTF-8 エンコード�フル パス�指定�る証明書�設定�る必���り��。��プロパティー��EAP メソッド� CA "
-"証明書をサ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨�れ��ん。"
+msgstr "\"phase2-auth\" プロパティー��� \"phase2-autheap\" プロパティー�指定�� EAP メソッド�使用�る場���\"phase 2\" � CA 証明書を����。証明書データ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) ブロブスキームを使用�る場�����プロパティーを�証明書� DER エンコードデータ�設定�る必���り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�る証明書�設定�る必���り��。��プロパティー��EAP メソッド� CA 証明書をサ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.h.in:71
 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 "
 "PKCS#11 token that requires a login."
-msgstr ""
-"\"phase2-ca-cert\" プロパティー��存�れ��る \"phase2\" � CA "
-"証明書�アクセス�る��使用�れるパスワード。��証明書��ログ�必�� PKCS#11 トークン��存�れ��る場���用�れ��。"
+msgstr "\"phase2-ca-cert\" プロパティー��存�れ��る \"phase2\" � CA 証明書�アクセス�る��使用�れるパスワード。��証明書��ログ�必�� PKCS#11 トークン��存�れ��る場���用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:71
-msgid "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
+#: ../clients/common/settings-docs.h.in:72
+msgid ""
+"Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr "\"phase2-ca-cert-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.h.in:73
 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 "
 "certificate specified in the \"phase2-ca-cert\" property."
-msgstr ""
-"\"phase2-ca-cert\" プロパティー�指定��証明書�追加�る際��検証�ェイン�追加�れ� PEM フォーマット��� DER  "
-"フォーマット�証明書��存�れ��るディレクトリー�� UTF-8  エンコード�パス。"
+msgstr "\"phase2-ca-cert\" プロパティー�指定��証明書�追加�る際��検証�ェイン�追加�れ� PEM フォーマット��� DER  フォーマット�証明書��存�れ��るディレクトリー�� UTF-8  エンコード�パス。"
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6557,31 +6380,21 @@ msgid ""
 "\"file://\" and ending with a terminating NUL byte. This property can be "
 "unset even if the EAP method supports CA certificates, but this allows man-"
 "in-the-middle attacks and is NOT recommended."
-msgstr ""
-"\"phase2-auth\" プロパティー��� \"phase2-autheap\" プロパティー�指定�� EAP "
-"メソッド�使用�る場���\"phase 2\" クライアント証明書を����。証明書データ� \"scheme\" "
-"を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) "
-"ブロブスキームを使用�る場�����プロパティーを�証明書� DER "
-"エンコードデータ�設定�る必���り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL "
-"�イト�終�る UTF-8 エンコード�フル パス�指定�る証明書�設定�る必���り��。��プロパティー��EAP メソッド� CA "
-"証明書をサ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨�れ��ん。"
+msgstr "\"phase2-auth\" プロパティー��� \"phase2-autheap\" プロパティー�指定�� EAP メソッド�使用�る場���\"phase 2\" クライアント証明書を����。証明書データ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。(NM 0.7.x ��後方互�性��る) ブロブスキームを使用�る場�����プロパティーを�証明書� DER エンコードデータ�設定�る必���り��。パススキームを使用�る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�る証明書�設定�る必���り��。��プロパティー��EAP メソッド� CA 証明書をサ�ート�る場��も設定�る必���り��ん��設定����中間者攻撃��能��る���推奨�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
-msgstr ""
-"\"phase2-client-cert\" プロパティー��存�れ��る \"phase2\" "
-"クライアント証明書�アクセス�る��使用�れるパスワード。��証明書��ログイン�必�� PKCS#11 "
-"トークン��存�れ��る場�����用�れ��。"
+msgstr "\"phase2-client-cert\" プロパティー��存�れ��る \"phase2\" クライアント証明書�アクセス�る��使用�れるパスワード。��証明書��ログイン�必�� PKCS#11 トークン��存�れ��る場�����用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr "\"phase2-client-cert-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.h.in:77
 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 "
@@ -6589,12 +6402,9 @@ msgid ""
 "matching dNSName is found, this constraint is met.  If no dNSName values are "
 "present, this constraint is matched against SubjectName CN using same suffix "
 "match comparison."
-msgstr ""
-"サー�ードメイン��制約。設定�る��内部 \"phase 2\" �証時���証サー�ー�表示�る証明書� dNSName �素�対����� "
-"FQDN �サフィックス一致�件���使用�れ��。一致�る dNSName �見��る����制約�満��れ��。dNSName "
-"値�表示�れ������制約����サフィックス一致比較を使用�� SubjectName CN を照����。"
+msgstr "サー�ードメイン��制約。設定�る��内部 \"phase 2\" �証時���証サー�ー�表示�る証明書� dNSName �素�対����� FQDN �サフィックス一致�件���使用�れ��。一致�る dNSName �見��る����制約�満��れ��。dNSName 値�表示�れ������制約����サフィックス一致比較を使用�� SubjectName CN を照����。"
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.h.in:78
 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 "
@@ -6611,55 +6421,39 @@ msgid ""
 "and ending with a terminating NUL byte, and as with the blob scheme the "
 "\"phase2-private-key-password\" property must be set to the password used to "
 "decode the PKCS#12 private key and certificate."
-msgstr ""
-"\"phase2-auth\" プロパティー��� \"phase2-autheap\" プロパティーを \"tls\" "
-"�設定�る場���\"phase 2\" 内部秘密�を����。キーデータ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 "
-"��サ�ート�れ��。ブロブスキーム�秘密�を使用���る場�����プロパティーをキー�暗�化 PEM "
-"エンコードデータ�設定�る必���り��。パススキーム�秘密�を使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 "
-"NUL �イト�終�る UTF-8 エンコード�フル パス�指定�るキー�設定�る必���り��。PKCS#12 "
-"フォーマット�秘密��ブロブスキームを設定���る場�����プロパティーを�PKCS#12 データ�設定��\"phase2-private-key-"
-"password\" プロパティーを�PKCS#12 証明書�よ�キーを復��る��使用�るパスワード�設定�る必���り��。PKCS#12 "
-"ファイル�パススキームを使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 "
-"エンコード�フル パス�指定�るキー�設定�る必���り��。ブロブスキームを使用��場���\"phase2-private-key-"
-"password\" プロパティーを�PKCS#12 秘密��よ�証明書を復��るパスワード�設定�る必���る����。"
+msgstr "\"phase2-auth\" プロパティー��� \"phase2-autheap\" プロパティーを \"tls\" �設定�る場���\"phase 2\" 内部秘密�を����。キーデータ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。ブロブスキーム�秘密�を使用���る場�����プロパティーをキー�暗�化 PEM エンコードデータ�設定�る必���り��。パススキーム�秘密�を使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�るキー�設定�る必���り��。PKCS#12 フォーマット�秘密��ブロブスキームを設定���る場�����プロパティーを�PKCS#12 データ�設定��\"phase2-private-key-password\" プロパティーを�PKCS#12 証明書�よ�キーを復��る��使用�るパスワード�設定�る必���り��。PKCS#12 ファイル�パススキームを使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�るキー�設定�る必���り��。ブロブスキームを使用��場���\"phase2-private-key-password\" プロパティーを�PKCS#12 秘密��よ�証明書を復��るパスワード�設定�る必���る����。"
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.h.in:79
 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 "
 "scheme, or is a PKCS#12 format key."
-msgstr ""
-"秘密��パススキーマを使用�る��PKCS#12 フォーマットキー��る場���\"phase2-private-key\" プロパティー�指定�� "
-"\"phase 2\" 秘密��複��使用�れるパスワード。"
+msgstr "秘密��パススキーマを使用�る��PKCS#12 フォーマットキー��る場���\"phase2-private-key\" プロパティー�指定�� \"phase 2\" 秘密��複��使用�れるパスワード。"
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr "\"phase2-private-key-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
 "unset, no verification of the authentication server certificate's subject is "
 "performed.  This property provides little security, if any, and its use is "
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
-msgstr ""
-"内部� \"phase 2\" �証時���証サー�ー�表示�れる証明書� subject "
-"�一致�る従属文字列。設定���場����証サー�ー�証明書� subject "
-"�検証�れ��ん。��プロパティー��セキュリティー����護�れ�����使用�る���推奨�れ��代�り� NMSetting8021x:"
-"phase2-domain-suffix-match �使用�れ��。"
+msgstr "内部� \"phase 2\" �証時���証サー�ー�表示�れる証明書� subject �一致�る従属文字列。設定���場����証サー�ー�証明書� subject �検証�れ��ん。��プロパティー��セキュリティー����護�れ�����使用�る���推奨�れ��代�り� NMSetting8021x:phase2-domain-suffix-match �使用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.h.in:82
 msgid "PIN used for EAP authentication methods."
 msgstr "EAP �証方法�使用�れる PIN"
 
-#: ../clients/common/settings-docs.h.in:82
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:183
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "\"pin\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:84
 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 "
@@ -6674,83 +6468,57 @@ msgid ""
 "property should be set to the full UTF-8 encoded path of the key, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte, and as "
 "with the blob scheme the \"private-key-password\" property must be set to "
-"the password used to decode the PKCS#12 private key and certificate. WARNING:"
-" \"private-key\" is not a \"secret\" property, and thus unencrypted private "
-"key data using the BLOB scheme may be readable by unprivileged users.  "
-"Private keys should always be encrypted with a private key password to "
-"prevent unauthorized access to unencrypted private key data."
-msgstr ""
-"\"eap\" プロパティーを \"tls\" �設定�る場���秘密�を����。キーデータ� \"scheme\" "
-"を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。ブロブスキーム�秘密�を使用���る場�����プロパティーを�キー�暗�化 "
-"PEM エンコードデータ�設定�る必���り��。パススキーム�秘密�を使用���る場�����プロパティーを�文字列 \"file://\" "
-"�始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�るキー�設定�る必���り��。PKCS#12 "
-"フォーマット�秘密��ブロブスキームを使用���る場�����プロパティーを PKCS#12 データ�設定��\"private-key-"
-"password\" プロパティーを�PKCS#12 証明書�よ�キーを復��る��使用�るパスワード�設定�る必���り��。PKCS#12 "
-"ファイル�パススキームを使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 "
-"エンコード�フル パス�指定�るキー�設定�る必���り��。ブロブスキームを使用���る場���\"private-key-password\" "
-"プロパティー��PKCS#12 秘密��証明書を復��る��使用�るパスワード設定�る必���り��。警告: \"秘密�\" � \"シークレット\" "
-"プロパティー�������BLOB "
-"スキームを使用�る暗�化�����秘密�データ��特権を����ユーザー�読�込�る場���り��。秘密��常�秘密�パスワード�暗�化��暗�化�れ����秘密�データ���証アクセス�行�れ��よ���る必���り��。"
+"the password used to decode the PKCS#12 private key and certificate. "
+"WARNING: \"private-key\" is not a \"secret\" property, and thus unencrypted "
+"private key data using the BLOB scheme may be readable by unprivileged "
+"users.  Private keys should always be encrypted with a private key password "
+"to prevent unauthorized access to unencrypted private key data."
+msgstr "\"eap\" プロパティーを \"tls\" �設定�る場���秘密�を����。キーデータ� \"scheme\" を使用��指定�れ��。�在�ブロブ�パス� 2 ��サ�ート�れ��。ブロブスキーム�秘密�を使用���る場�����プロパティーを�キー�暗�化 PEM エンコードデータ�設定�る必���り��。パススキーム�秘密�を使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�るキー�設定�る必���り��。PKCS#12 フォーマット�秘密��ブロブスキームを使用���る場�����プロパティーを PKCS#12 データ�設定��\"private-key-password\" プロパティーを�PKCS#12 証明書�よ�キーを復��る��使用�るパスワード�設定�る必���り��。PKCS#12 ファイル�パススキームを使用���る場�����プロパティーを�文字列 \"file://\" �始�り�終了 NUL �イト�終�る UTF-8 エンコード�フル パス�指定�るキー�設定�る必���り��。ブロブスキームを使用���る場���\"private-key-password\" プロパティー��PKCS#12 秘密��証明書を復��る��使用�るパスワード設定�る必���り��。警告: \"秘密�\" � \"シークレット\" プロパティー�������BLOB スキームを使用�る暗�化�����秘密�データ��特権を����ユーザー�読�込�る場���り��。秘密��常�秘密�パスワード�暗�化��暗�化�れ����秘密�データ���証アクセス�行�れ��よ���る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:85
 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 "
+"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 "
 "private key is a PKCS#12 format key."
-msgstr ""
-"秘密��パススキーマを使用�る��秘密�� PKCS#12 フォーマットを使用���る場���\"private-key\" "
-"プロパティー�指定��秘密��復�化�使用�れるパスワード。"
+msgstr "秘密��パススキーマを使用�る��秘密�� PKCS#12 フォーマットを使用���る場���\"private-key\" プロパティー�指定��秘密��復�化�使用�れるパスワード。"
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:86
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr "\"private-key-password\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.h.in:87
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
 "server certificate's subject is performed.  This property provides little "
 "security, if any, and its use is deprecated in favor of NMSetting8021x:"
 "domain-suffix-match."
-msgstr ""
-"�証サー�ー�表示�れる証明書� subject �一致�る従属文字列。設定���場����証サー�ー�証明書� subject "
-"�検証�れ��ん。��プロパティー�セキュリティー����護�れ�������使用��推奨��り�代�り� NMSetting8021x:domain-"
-"suffix-match �使用�れ��。"
+msgstr "�証サー�ー�表示�れる証明書� subject �一致�る従属文字列。設定���場����証サー�ー�証明書� subject �検証�れ��ん。��プロパティー�セキュリティー����護�れ�������使用��推奨��り�代�り� NMSetting8021x:domain-suffix-match �使用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.h.in:88
 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-"
 "path switch.  The certificates in this directory are added to the "
-"verification chain in addition to any certificates specified by the \"ca-"
-"cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-"
-"ca-path is rather a file name (bundle of trusted CA certificates), it "
-"overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets "
-"ca_cert/ca_cert2 options for wpa_supplicant)."
-msgstr ""
-"TRUE �場���--system-ca-path スイッ��設定時�指定��システム� CA ディレクトリーを使用���\"ca-path\" "
-"プロパティー� \"phase2-ca-path\" プロパティーをオー�ーライド���。��ディレクトリー�証明書��\"ca-cert\" "
-"プロパティー� \"phase2-ca-cert\" プロパティー�指定��証明書��も�検証�ェイン�追加�れ��。--system-ca-path "
-"��供�れるパス�ファイル� (信頼�れ� CA 証明書��ンドル) �場���\"ca-cert\" プロパティー� \"phase2-ca-"
-"cert\" プロパティー�代�り�オー�ーライド�れ�� (wpa_supplicant � ca_cert オプション�よ�  ca_cert2 "
-"オプションを設定���)。"
+"verification chain in addition to any certificates specified by the \"ca-cert"
+"\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-"
+"path is rather a file name (bundle of trusted CA certificates), it overrides "
+"\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
+"options for wpa_supplicant)."
+msgstr "TRUE �場���--system-ca-path スイッ��設定時�指定��システム� CA ディレクトリーを使用���\"ca-path\" プロパティー� \"phase2-ca-path\" プロパティーをオー�ーライド���。��ディレクトリー�証明書��\"ca-cert\" プロパティー� \"phase2-ca-cert\" プロパティー�指定��証明書��も�検証�ェイン�追加�れ��。--system-ca-path ��供�れるパス�ファイル� (信頼�れ� CA 証明書��ンドル) �場���\"ca-cert\" プロパティー� \"phase2-ca-cert\" プロパティー�代�り�オー�ーライド�れ�� (wpa_supplicant � ca_cert オプション�よ�  ca_cert2 オプションを設定���)。"
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "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 �場���速度�二�モード�自動�ゴシエーションを強制���。\"speed\" プロパティー� \"duplex\" "
-"プロパティー�両方�も指定�れる場��リンク自動�ゴシエーション�プロセス�間�1 ��モード���アド�タイズ�れ���入れられ��。�れ��BASE-"
-"T 802.3 仕様���機能��ギガビットモード�強制�役立���。���ら���よ��ケース���リンク�ゴシエーション�必須��ら��。FALSE "
-"�場���\"speed\" プロパティー� \"duplex\" プロパティー�両方�も設定�れる��リンク設定�スキップ�れ��。"
+"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 �場���速度�二�モード�自動�ゴシエーションを強制���。\"speed\" プロパティー� \"duplex\" プロパティー�両方�も指定�れる場��リンク自動�ゴシエーション�プロセス�間�1 ��モード���アド�タイズ�れ���入れられ��。�れ��BASE-T 802.3 仕様���機能��ギガビットモード�強制�役立���。���ら���よ��ケース���リンク�ゴシエーション�必須��ら��。FALSE �場���\"speed\" プロパティー� \"duplex\" プロパティー�両方�も設定�れる��リンク設定�スキップ�れ��。"
 
-#: ../clients/common/settings-docs.h.in:89
+#: ../clients/common/settings-docs.h.in:90
 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 "
@@ -6761,23 +6529,13 @@ msgid ""
 "creates a random MAC address on each connect. \"stable\" creates a hashed "
 "MAC address based on connection.stable-id and a machine dependent key. If "
 "unspecified, the value can be overwritten via global defaults, see manual of "
-"NetworkManager.conf. If still unspecified, it defaults to \"preserve\" "
-"(older versions of NetworkManager may use a different default value). On D-"
-"Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
+"NetworkManager.conf. If still unspecified, it defaults to \"preserve"
+"\" (older versions of NetworkManager may use a different default value). On "
+"D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
 "\"cloned-mac-address\"."
-msgstr ""
-"指定��場���デ�イス����永続化 MAC アドレス�代�り��� MAC アドレスを使用�る必���り��。�れ��MAC "
-"クローニング���スプーフィング���知られ����。明示的� MAC "
-"アドレスを指定�る以外��\"preserve\"�\"permanent\"�\"random\"�\"stable\" "
-"�値�サ�ート�れ��。\"preserve\" ���アクティベーション時� MAC アドレスを変更���ん。\"permanent\" "
-"���デ�イス�永続化�ードウェアアドレス��る場���れを使用��� (アドレス���場�� \"preserve\" ���)。\"random\" "
-"����接続�対��ランダム� MAC アドレスを作����。\"stable\" ���connection.stable-id "
-"�機種�存キー�基�����ッシュ化�� MAC "
-"アドレスを作����。指定�������値�グロー�ル�デフォルト�より上書��れ��。NetworkManager.conf "
-"を�照������。�れ�も指定���場���デフォルト� \"permanent\" �設定�れ��。D-Bus �������フィールド� "
-"\"assigned-mac-address\" ���廃止予定� \"cloned-mac-address\" ���表示�れ��。"
+msgstr "指定��場���デ�イス����永続化 MAC アドレス�代�り��� MAC アドレスを使用�る必���り��。�れ��MAC クローニング���スプーフィング���知られ����。明示的� MAC アドレスを指定�る以外��\"preserve\"�\"permanent\"�\"random\"�\"stable\" �値�サ�ート�れ��。\"preserve\" ���アクティベーション時� MAC アドレスを変更���ん。\"permanent\" ���デ�イス�永続化�ードウェアアドレス��る場���れを使用��� (アドレス���場�� \"preserve\" ���)。\"random\" ����接続�対��ランダム� MAC アドレスを作����。\"stable\" ���connection.stable-id �機種�存キー�基�����ッシュ化�� MAC アドレスを作����。指定�������値�グロー�ル�デフォルト�より上書��れ��。NetworkManager.conf を�照������。�れ�も指定���場���デフォルト� \"permanent\" �設定�れ��。D-Bus �������フィールド� \"assigned-mac-address\" ���廃止予定� \"cloned-mac-address\" ���表示�れ��。"
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.h.in:91
 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 "
@@ -6790,65 +6548,45 @@ msgid ""
 "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\" "
-"プロパティーも設定�る必���り��。二�モードを指定�る���デ�イス���モードをサ�ート�る��を確�������。"
+msgstr "値� \"half\" ��� \"full\" ���れ��設定�れ��る場��指定�れ�二�モードを使用�るよ��デ�イスを設定���。\"auto-negotiate\" � \"yes\" �場��リンク�ゴシエーション�間�アド�タイズ�れる���指定�れ�二�モード����り��。�れ��BASE-T 802.3 仕様���機能��ギガビットモード�強制�役立���。���ら���よ��ケース���リンク�ゴシエーション�必須��ら��。値�設定�れ����場� (デフォルト)�リンク�設定�スキップ�れる� (\"auto-negotiate\" � \"no\" �場� = デフォルト)�自動�ゴシエート�れる� (\"auto-negotiate\" � \"yes\" �場�) ���れ���り�ローカルデ�イス�����サ�ート�れる二�モードをアド�タイズ���。指定�る場�� \"speed\" プロパティーも設定�る必���り��。二�モードを指定�る���デ�イス���モードをサ�ート�る��を確�������。"
 
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.h.in:93
 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 "
 "of the device (i.e. MAC spoofing)."
-msgstr ""
-"指定�る����接続�永続的� MAC アドレス�一致�る Ethernet デ�イス����用�れ��。��プロパティー��デ�イス� MAC "
-"アドレスを変更���ん (MAC スプーフィング)。"
+msgstr "指定�る����接続�永続的� MAC アドレス�一致�る Ethernet デ�イス����用�れ��。��プロパティー��デ�イス� MAC アドレスを変更���ん (MAC スプーフィング)。"
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.h.in:94
 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 "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
-msgstr ""
-"指定�る����接続��永続的� MAC アドレス�リスト�アドレス�一致�る Ethernet デ�イス���用�れ��ん。 � MAC "
-"アドレス��標準� 16 進数�コロン (00:11:22:33:44:55) �指定�る必���り��。"
+msgstr "指定�る����接続��永続的� MAC アドレス�リスト�アドレス�一致�る Ethernet デ�イス���用�れ��ん。 � MAC アドレス��標準� 16 進数�コロン (00:11:22:33:44:55) �指定�る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
-"Specific port type to use if the device supports multiple attachment methods."
-"  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), \"bnc\" "
-"(Thin Ethernet) or \"mii\" (Media Independent Interface). If the device "
-"supports only one port type, this setting is ignored."
-msgstr ""
-"デ�イス�複数�割り当�方法をサ�ート�る場��使用�る�ートタイプ。\"tp\" (ツイストペア)�\"aui\" "
-"(接続機構インターフェース)�\"bnc\" (シンイーサー�ット)���� \"mii\" (メディア独立インターフェース) "
-"���れ���り��。デ�イス��ート�タイプを 1 ���サ�ート�る場����設定�無視�れ��。"
+"Specific port type to use if the device supports multiple attachment "
+"methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
+"\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
+"device supports only one port type, this setting is ignored."
+msgstr "デ�イス�複数�割り当�方法をサ�ート�る場��使用�る�ートタイプ。\"tp\" (ツイストペア)�\"aui\" (接続機構インターフェース)�\"bnc\" (シンイーサー�ット)���� \"mii\" (メディア独立インターフェース) ���れ���り��。デ�イス��ート�タイプを 1 ���サ�ート�る場����設定�無視�れ��。"
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.h.in:97
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
-msgstr ""
-"s390 �ットワークデ�イス�タイプ。\"qeth\"�\"lcs\"���� \"ctc\" ���れ���り��。s390 "
-"システム�利用�能������仮想�ットワークデ�イス��り��。"
+msgstr "s390 �ットワークデ�イス�タイプ。\"qeth\"�\"lcs\"���� \"ctc\" ���れ���り��。s390 システム�利用�能������仮想�ットワークデ�イス��り��。"
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:98
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
 "\"portname\", \"protocol\", among others.  Key names must contain only "
 "alphanumeric characters (ie, [a-zA-Z0-9])."
-msgstr ""
-"s390 "
-"固有�デ�イスオプション���る�キー�値�ペア����ディクショナリー。キー�値�両方を文字列��る必���り��。\"portno\"�\"layer2\"�\"portname\"�\"protocol\" "
-"���キー�使用����。キー����英数字�� (��り [a-zA-Z0-9]) �使用����。"
+msgstr "s390 固有�デ�イスオプション���る�キー�値�ペア����ディクショナリー。キー�値�両方を文字列��る必���り��。\"portno\"�\"layer2\"�\"portname\"�\"protocol\" ���キー�使用����。キー����英数字�� (��り [a-zA-Z0-9]) �使用����。"
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -6856,36 +6594,24 @@ msgid ""
 "applies to the network device that uses these subchannels.  The list should "
 "contain exactly 3 strings, and each string may only be composed of "
 "hexadecimal characters and the period (.) character."
-msgstr ""
-"���ットワークデ�イス��z/VM ��� s390 ホスト��接続�使用�る特定�サブ�ャン�ルを識別���。z/VM 以外�デ�イス�対�る "
-"\"mac-address\" "
-"プロパティー�よ�����プロパティーを使用�����接続����サブ�ャン�ルを使用�る�ットワークデ�イス����用�れるよ�����。��一覧�� "
-"3 ��文字列���れ��る必���り��文字列���16 進数�ピリオド (.) ��を使用����。"
+msgstr "���ットワークデ�イス��z/VM ��� s390 ホスト��接続�使用�る特定�サブ�ャン�ルを識別���。z/VM 以外�デ�イス�対�る \"mac-address\" プロパティー�よ�����プロパティーを使用�����接続����サブ�ャン�ルを使用�る�ットワークデ�イス����用�れるよ�����。��一覧�� 3 ��文字列���れ��る必���り��文字列���16 進数�ピリオド (.) ��を使用����。"
 
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "When a value greater 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\" "
-"プロパティーも設定�る必���り��。速度値を指定�る���デ�イス���速度をサ�ート�る��を確�������。"
+"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:100
+#: ../clients/common/settings-docs.h.in:101
 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), "
@@ -6896,149 +6622,121 @@ msgid ""
 "(0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to "
 "use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
 "disable management of Wake-on-LAN in NetworkManager)."
-msgstr ""
-"有効��る NMSettingWiredWakeOnLan "
-"オプション。����デ�イス�����オプションをサ�ート�る�����り��ん。NM_SETTING_WIRED_WAKE_ON_LAN_PHY "
-"(0x2)�NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST "
-"(0x4)�NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST "
-"(0x8)�NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST "
-"(0x10)�NM_SETTING_WIRED_WAKE_ON_LAN_ARP "
-"(0x20)�NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40)����特別�値 "
-"NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (グロー�ル設定を使用) �よ� "
-"NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (NetworkManager � Wake-on-LAN "
-"�管�を無効) �ら組����る�������。"
+msgstr "有効��る NMSettingWiredWakeOnLan オプション。����デ�イス�����オプションをサ�ート�る�����り��ん。NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2)�NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4)�NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8)�NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10)�NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20)�NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40)����特別�値 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (グロー�ル設定を使用) �よ� NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (NetworkManager � Wake-on-LAN �管�を無効) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.h.in:102
 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 "
 "required."
-msgstr ""
-"指定�る��マジックパケットベース� Wake-on-LAN �使用�れるパスワード��Ethernet � MAC "
-"アドレス���表示�れ��。NULL ��る��パスワード��求�れ��ん。"
+msgstr "指定�る��マジックパケットベース� Wake-on-LAN �使用�れるパスワード��Ethernet � MAC アドレス���表示�れ��。NULL ��る��パスワード��求�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.h.in:103
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr "ADSL 接続�カプセル化。\"vcmux\" ��� \"llc\" �����。"
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.h.in:104
 msgid "Password used to authenticate with the ADSL service."
 msgstr "ADSL サービス���証�使用�るパスワード。"
 
-#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:106
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr "ADSL 接続プロトコル。\"pppoa\"�\"pppoe\"���� \"ipoatm\" �����。"
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:107
 msgid "Username used to authenticate with the ADSL service."
 msgstr "ユーザー���ADSL サービス���証�使用�れ���。"
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:108
 msgid "VCI of ADSL connection"
 msgstr "ADSL 接続� VCI"
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:109
 msgid "VPI of ADSL connection"
 msgstr "ADSL 接続� VPI"
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:110
 msgid "The Bluetooth address of the device."
 msgstr "デ�イス� Bluetooth アドレス。"
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.h.in:111
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
-msgstr ""
-"NAP プロファイルをサ�ート�るデ�イス�� \"dun\" (ダイアルアップ�ットワーキング接続�場�) ��� \"panu\" "
-"(パーソナルエリア�ットワーキング接続�場�) ���れ���り��。"
+msgstr "NAP プロファイルをサ�ート�るデ�イス�� \"dun\" (ダイアルアップ�ットワーキング接続�場�) ��� \"panu\" (パーソナルエリア�ットワーキング接続�場�) ���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.h.in:112
 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-"
 "zA-Z0-9])."
-msgstr ""
-"ボンディングオプション���る�キー�値�ペア����ディクショナリー。キー�値�両方を文字列��る必���り��。オプション���英数字�� (��り "
-"[a-zA-Z0-9]) を使用����。"
+msgstr "ボンディングオプション���る�キー�値�ペア����ディクショナリー。キー�値�両方を文字列��る必���り��。オプション���英数字�� (��り [a-zA-Z0-9]) を使用����。"
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.h.in:113
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "Ethernet MAC アドレス�エージングタイム (秒��)。"
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.h.in:114
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr "スパニングツリープロトコル (STP) フォワード�延 (秒��)。"
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:115
 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 "
 "standards. This property is a mask of 16 bits, each corresponding to a group "
 "address in that range that must be forwarded. The mask can't have bits 0, 1 "
 "or 2 set because they are used for STP, MAC pause frames and LACP."
-msgstr ""
-"転��るグループアドレス�マスク。仕様�より�通常�01:80:C2:00:00:00 - 01:80:C2:00:00:0F "
-"�範囲��るグループアドレス�転��れ��ん。��プロパティー� 16 "
-"ビット�マスク���れ�れ転��必��範囲内�グループアドレス�対応���。マスク��STP�MAC �止フレーム��よ� LACP "
-"�使用�れ��る���ビット 0�1���� 2 を設定�る�������ん。"
+msgstr "転��るグループアドレス�マスク。仕様�より�通常�01:80:C2:00:00:00 - 01:80:C2:00:00:0F �範囲��るグループアドレス�転��れ��ん。��プロパティー� 16 ビット�マスク���れ�れ転��必��範囲内�グループアドレス�対応���。マスク��STP�MAC �止フレーム��よ� LACP �使用�れ��る���ビット 0�1���� 2 を設定�る�������ん。"
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:116
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "スパニングツリープロトコル (STP) Hello タイム (秒��)。"
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:117
 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."
-"cloned-mac-address\" is referred instead to generate the initial MAC address."
-" Note that setting \"ethernet.cloned-mac-address\" anyway overwrites the MAC "
-"address of the bridge later while activating the bridge. Hence, this "
+"cloned-mac-address\" is referred instead to generate the initial MAC "
+"address. Note that setting \"ethernet.cloned-mac-address\" anyway overwrites "
+"the MAC address of the bridge later while activating the bridge. Hence, this "
 "property is deprecated. Deprecated: 1"
-msgstr ""
-"指定��場���ブリッジ� MAC アドレス。新��ブリッジを作��る����  MAC "
-"アドレス�設定�れ��。��フィールドを指定�����\"ethernet.cloned-mac-address\" �代�り��照�れ��期 MAC "
-"アドレス�生��れ��。\"ethernet.cloned-mac-address\" ��ブリッジ�アクティベート中��ブリッジ� MAC "
-"アドレスを上書����。��������プロパティー�廃止�れ��。�推奨: 1"
+msgstr "指定��場���ブリッジ� MAC アドレス。新��ブリッジを作��る����  MAC アドレス�設定�れ��。��フィールドを指定�����\"ethernet.cloned-mac-address\" �代�り��照�れ��期 MAC アドレス�生��れ��。\"ethernet.cloned-mac-address\" ��ブリッジ�アクティベート中��ブリッジ� MAC アドレスを上書����。��������プロパティー�廃止�れ��。�推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.h.in:118
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "スパニングツリープロトコル (STP) メッセージ最大期間 (秒��)。"
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.h.in:119
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
-msgstr ""
-"��ブリッジ�����IGMP "
-"スヌーピング�有効����を制御���。�ッシュ��一致�原因�スヌーピング�自動的�無効�����る場�����矛盾�解決�る����機能�有効��ら������り��。"
+msgstr "��ブリッジ�����IGMP スヌーピング�有効����を制御���。�ッシュ��一致�原因�スヌーピング�自動的�無効�����る場�����矛盾�解決�る����機能�有効��ら������り��。"
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.h.in:120
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
-msgstr ""
-"��ブリッジ���るスパニングツリープロトコル (STP) �優先度を設定���。値����方�優先度�高��り��。優先度�一番低�ブリッジ� "
-"root ブリッジ��択�れ��。"
+msgstr "��ブリッジ���るスパニングツリープロトコル (STP) �優先度を設定���。値����方�優先度�高��り��。優先度�一番低�ブリッジ� root ブリッジ��択�れ��。"
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.h.in:121
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr "��ブリッジ�����スパニングツリープロトコル (STP) �有効����を制御���。"
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.h.in:122
 msgid ""
 "The default PVID for the ports of the bridge, that is the VLAN id assigned "
 "to incoming untagged frames."
 msgstr "ブリッジ��ート��デフォルト� PVID ��。�れ���信��タグ��フレーム�割り当�られ� VLAN ID ��。"
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.h.in:123
 msgid "Control whether VLAN filtering is enabled on the bridge."
 msgstr "��ブリッジ�����VLAN フィルタリング�有効����を制御���。"
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.h.in:124
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "bridge will also have the default-pvid VLAN configured  by the bridge.vlan-"
@@ -7046,89 +6744,73 @@ msgid ""
 "following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where "
 "$vid is either a single id between 1 and 4094 or a range, represented as a "
 "couple of ids separated by a dash."
-msgstr ""
-"ブリッジ VLAN オブジェクト��列。���指定�れ� VLAN �����ブリッジ���bridge.vlan-default-pvid "
-"プロパティー�よ��設定�れ� default-pvid VLAN も�り��。nmcli ���VLAN �リスト�以下�構文�指定����: "
-"$vid [pvid] [untagged] [, $vid [pvid] [untagged]]...。���� $vid ��1 �ら 4094 "
-"�間��一 ID ���範囲���れ���り�ダッシュ�区切られ�複数� ID �表�れ��。"
+msgstr "ブリッジ VLAN オブジェクト��列。���指定�れ� VLAN �����ブリッジ���bridge.vlan-default-pvid プロパティー�よ��設定�れ� default-pvid VLAN も�り��。nmcli ���VLAN �リスト�以下�構文�指定����: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]...。���� $vid ��1 �ら 4094 �間��一 ID ���範囲���れ���り�ダッシュ�区切られ�複数� ID �表�れ��。"
 
-#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.h.in:125
 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."
-msgstr ""
-"�ート� \"hairpin mode\" を有効���無効����。��モード���フレームを������ート�らフレームを�り戻��������。"
+msgstr "�ート� \"hairpin mode\" を有効���無効����。��モード���フレームを������ート�らフレームを�り戻��������。"
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr "���ートを経由���宛先�スパニングツリープロトコル (STP) �ートコスト。"
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:127
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr "��ブリッジ�ート�スパニングツリープロトコル (STP) �優先度。"
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:128
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "port will also have the default-pvid VLAN configured on the bridge by the "
 "bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified "
-"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]."
-".. where $vid is either a single id between 1 and 4094 or a range, "
-"represented as a couple of ids separated by a dash."
-msgstr ""
-"ブリッジ VLAN オブジェクト��列。���指定�れ� VLAN ������ート���bridge.vlan-default-pvid "
-"プロパティー�よ��ブリッジ�設定�れ� default-pvid VLAN も�り��。nmcli ���VLAN �リスト�以下�構文�指定����:"
-" $vid [pvid] [untagged] [, $vid [pvid] [untagged]]...。���� $vid ��1 �ら 4094 "
-"�間��一 ID ���範囲���れ���り�ダッシュ�区切られ�複数� ID �表�れ��。"
+"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] "
+"[untagged]]... where $vid is either a single id between 1 and 4094 or a "
+"range, represented as a couple of ids separated by a dash."
+msgstr "ブリッジ VLAN オブジェクト��列。���指定�れ� VLAN ������ート���bridge.vlan-default-pvid プロパティー�よ��ブリッジ�設定�れ� default-pvid VLAN も�り��。nmcli ���VLAN �リスト�以下�構文�指定����: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]...。���� $vid ��1 �ら 4094 �間��一 ID ���範囲���れ���り�ダッシュ�区切られ�複数� ID �表�れ��。"
 
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:175
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
 msgstr "ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定��サイズより大��パケット��複数�フレーム�分割�れ��。"
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:130
 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 "
 "used when required."
-msgstr ""
-"CDMA ベース�モ�イルブロード�ンド�ットワーク��接続を確立�るダイアル�番���れ�指定���。指定���場���必��応��デフォルト�番� "
-"(#777) �使用�れ��。"
+msgstr "CDMA ベース�モ�イルブロード�ンド�ットワーク��接続を確立�るダイアル�番���れ�指定���。指定���場���必��応��デフォルト�番� (#777) �使用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:130
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:180
 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 "
 "password is required, it is specified here."
-msgstr ""
-"必��応����ットワーク��証�る��使用�るパスワード。多��プロ�イダー�パスワードを必����������るパスワードも許��れ��。パスワード�必��場������指定���。"
+msgstr "必��応����ットワーク��証�る��使用�るパスワード。多��プロ�イダー�パスワードを必����������るパスワードも許��れ��。パスワード�必��場������指定���。"
 
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:186
 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 "
 "username is required, it is specified here."
-msgstr ""
-"必��応����ットワーク��証�る��使用�るユーザー�。多��プロ�イダー�ユーザー�を必����������るユーザー�も許��れ��。ユーザー��必��場������指定���。"
+msgstr "必��応����ットワーク��証�る��使用�るユーザー�。多��プロ�イダー�ユーザー�を必����������るユーザー�も許��れ��。ユーザー��必��場������指定���。"
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:134
 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 "
 "set, the authentication retries for 3 times before failing the connection. "
 "Currently this only applies to 802-1x authentication."
-msgstr ""
-"�証��試行数。ゼロ�無���試行�る��を�味����。-1 "
-"�グロー�ル�デフォルトを使用�る��を�味���。グロー�ルデフォルト�設定�れ��場����証を 3 回�試行��ら接続�失敗���。�在��れ� "
-"802-1x �証����用�れ��。"
+msgstr "�証��試行数。ゼロ�無���試行�る��を�味����。-1 �グロー�ル�デフォルトを使用�る��を�味���。グロー�ルデフォルト�設定�れ��場����証を 3 回�試行��ら接続�失敗���。�在��れ� 802-1x �証����用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:135
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
@@ -7136,32 +6818,25 @@ msgid ""
 "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\" を�照������。"
+msgstr "接続�リソース�利用�能�場���NetworkManager �接続を自動的�行�����。TRUE �場��接続�自動的�有効��り�FALSE �場��手作業�接続を有効化���。自動接続� VPN プロファイル��実装�れ��点�注�������。VPN プロファイル を自動接続�る別�方法��� \"secondaries\" を�照������。"
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.h.in:136
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
-msgstr ""
-"自動接続�優先度。接続を自動接続�設定�る��優先度�高�接続�優先�れ��。デフォルト� 0 ��。数値�高��る��優先度�高��り��。"
+msgstr "自動接続�優先度。接続を自動接続�設定�る��優先度�高�接続�優先�れ��。デフォルト� 0 ��。数値�高��る��優先度�高��り��。"
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:137
 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 "
 "overridden). Setting this to 1 means to try activation only once before "
 "blocking autoconnect. Note that after a timeout, NetworkManager will try to "
 "autoconnect again."
-msgstr ""
-"接続を自動的�試行�る�を止�る���回数。ゼロ�設定�る�無��行�れ��。-1 ��グロー�ルデフォルト (上書��れ����場�� 4 回) "
-"��。1 �設定�る��1 度��有効����ら自動接続をブロック���。タイムアウト後�NetworkManager "
-"��度�自動接続を試行�る���注�������。"
+msgstr "接続を自動的�試行�る�を止�る���回数。ゼロ�設定�る�無��行�れ��。-1 ��グロー�ルデフォルト (上書��れ����場�� 4 回) ��。1 �設定�る��1 度��有効����ら自動接続をブロック���。タイムアウト後�NetworkManager ��度�自動接続を試行�る���注�������。"
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
@@ -7171,27 +6846,21 @@ msgid ""
 "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 "
-"���接続を有効���場�����接続�スレーブ�自動的�起動�る����。�れ��マスター接続���有効��。\"autoconnect\"�\"autoconnect-"
-"priority\"��よ� \"autoconnect-retries\" ��プロパティー����設定��関係�り��ん。利用��る値��0: "
-"スレーブ接続�変更����1: ��接続�スレーブ接続を���アクティブ��る�-1: デフォルト��り��。-1 (デフォルト) "
-"�設定�れ��る場���グロー�ル� connection.autoconnect-slaves "
-"�読�込�れ�値�決定���。�れもデフォルト�設定�れ��る場���0 �フォール�ック�れ��。"
+msgstr "NetworkManager ���接続を有効���場�����接続�スレーブ�自動的�起動�る����。�れ��マスター接続���有効��。\"autoconnect\"�\"autoconnect-priority\"��よ� \"autoconnect-retries\" ��プロパティー����設定��関係�り��ん。利用��る値��0: スレーブ接続�変更����1: ��接続�スレーブ接続を���アクティブ��る�-1: デフォルト��り��。-1 (デフォルト) �設定�れ��る場���グロー�ル� connection.autoconnect-slaves �読�込�れ�値�決定���。�れもデフォルト�設定�れ��る場���0 �フォール�ック�れ��。"
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr "ゼロより大���る��タイムアウト�到��る��IP ゲートウェイ� ping �応答�る���IP アドレス��延��功���。"
 
-#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:140
 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.h.in:140
+#: ../clients/common/settings-docs.h.in:141
 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 "
@@ -7202,17 +6871,13 @@ msgid ""
 "restricts the interfaces a connection can be used with, and if interface "
 "names change or are reordered the connection may be applied to the wrong "
 "interface."
-msgstr ""
-"��接続��インド�れる�ットワークインターフェース���。設定�����接続��タイプ��切��れ����インターフェース�も割り当�る������� "
-"(��他�設定�よ��制��課�られる場���り��)。ソフトウェアデ�イス�場����れ�より�作���デ�イス����指定�れ��。インターフェース��簡���続���接続�場� "
-"(モ�イルブロード�ンド��� USB Ethernet "
-"��)���プロパティー�使用��������。��プロパティー�設定��接続�使用��るインターフェースを制���インターフェース�を変更��り�順番を変更�る��誤��インターフェース�接続��用�れる場���り��。"
+msgstr "��接続��インド�れる�ットワークインターフェース���。設定�����接続��タイプ��切��れ����インターフェース�も割り当�る������� (��他�設定�よ��制��課�られる場���り��)。ソフトウェアデ�イス�場����れ�より�作���デ�イス����指定�れ��。インターフェース��簡���続���接続�場� (モ�イルブロード�ンド��� USB Ethernet ��)���プロパティー�使用��������。��プロパティー�設定��接続�使用��るインターフェースを制���インターフェース�を変更��り�順番を変更�る��誤��インターフェース�接続��用�れる場���り��。"
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:142
 msgid "Whether LLDP is enabled for the connection."
 msgstr "��接続�対�� LLDP �有効��る����。"
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:143
 msgid ""
 "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the "
 "connection. LLMNR is a protocol based on the Domain Name System (DNS) packet "
@@ -7222,87 +6887,68 @@ msgid ""
 "interface, resolve: do not register hostname but allow resolving of LLMNR "
 "host names. This feature requires a plugin which supports LLMNR. One such "
 "plugin is dns-systemd-resolved."
-msgstr ""
-"LLMNR (リンクローカルマル�キャスト��解決) を接続�有効��る����。LLMNR �ドメイン�ームシステム (DNS) "
-"パケット形�をベース���プロトコル��IPv4 � IPv6 "
-"�両方�ホスト��一�ローカルリンク上�ホスト���解決を実行��るよ���るも���。利用��る値��yes: ホスト�を登録��接続を解決�no: "
-"インターフェース�対�� LLMNR を無効��る �resolve: ホスト�を登録��� LLMNR ホスト��解決を許��� 3 "
-"���り��。��機能���LLMNR をサ�ート�るプラグイン�必���。�����dns-systemd-resolved ����。"
+msgstr "LLMNR (リンクローカルマル�キャスト��解決) を接続�有効��る����。LLMNR �ドメイン�ームシステム (DNS) パケット形�をベース���プロトコル��IPv4 � IPv6 �両方�ホスト��一�ローカルリンク上�ホスト���解決を実行��るよ���るも���。利用��る値��yes: ホスト�を登録��接続を解決�no: インターフェース�対�� LLMNR を無効��る �resolve: ホスト�を登録��� LLMNR ホスト��解決を許��� 3 ���り��。��機能���LLMNR をサ�ート�るプラグイン�必���。�����dns-systemd-resolved ����。"
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.h.in:144
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "マスター接続�マスターデ�イス��� UUID �インターフェース�。"
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:145
 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. 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 ����。"
+msgstr "mDNS �接続�実行�れる����。利用��る値��yes: ホスト�を登録��接続を解決�no: インターフェース�対�� mDNS を無効��る�resolve: ホスト�を登録��� mDNS ホスト��解決を許��� 3 ���り��。��機能���mDNS をサ�ート�るプラグイン�必���。�����dns-systemd-resolved ����。"
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.h.in:146
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
 msgstr "接続を測定�る����。�在有効�接続���プロパティーをアップデート�る��変更����有効��り��。"
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "Specifies whether the profile can be active multiple times at a particular "
 "moment. The value is of type NMConnectionMultiConnect."
-msgstr ""
-"プロファイル���る特定�時点�複数回アクティブ��る����を指定���。値� NMConnectionMultiConnect タイプ��り��。"
+msgstr "プロファイル���る特定�時点�複数回アクティブ��る����を指定���。値� NMConnectionMultiConnect タイプ��り��。"
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.h.in:148
 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 connection; "
-"otherwise users are allowed if and only if they are in this list.  When this "
-"is not empty, the connection can be active only when one of the specified "
-"users is logged into an active session.  Each entry is of the form \"[type]:"
-"[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the "
-"\"user\" [type] is allowed.  Any other values are ignored and reserved for "
-"future use.  [id] is the username that this permission refers to, which may "
-"not contain the \":\" character. Any [reserved] information present must be "
-"ignored and is reserved for future use.  All of [type], [id], and [reserved] "
-"must be valid UTF-8."
-msgstr ""
-"指定��ユーザー�よる��接続��アクセス�種類を定義�る文字列��列。�れを NULL "
-"���空��る������ユーザー���接続�アクセス��るよ���り��。�れ以外�場�����一覧�挙�られ��るユーザー���許��れ��。�れ�空���������指定��ユーザー� "
-"1 人�アクティブ�セッション�ログイン��場���り�接続�アクティブ��り��。�エントリー�形�� \"[type]:[id]:"
-"[reserved]\" (���� \"user:dcbw:blah\") "
-"��り��。��他�値�無視�れ�今後�使用����予約�れ��。�時点���\"user\" � [type] ���利用����。[id] "
-"����権���照�るユーザー���\":\" 文字�使用����ん。表示�れ��る [reserved] "
-"情報�無視�れ�今後使用�れる���予約�れる必���り��。[type]�[id]��よ� [reserved] ����有効� UTF-8 "
-"��る必���り��。"
+"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 "
+"connection; otherwise users are allowed if and only if they are in this "
+"list.  When this is not empty, the connection can be active only when one of "
+"the specified users is logged into an active session.  Each entry is of the "
+"form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this "
+"time only the \"user\" [type] is allowed.  Any other values are ignored and "
+"reserved for future use.  [id] is the username that this permission refers "
+"to, which may not contain the \":\" character. Any [reserved] information "
+"present must be ignored and is reserved for future use.  All of [type], "
+"[id], and [reserved] must be valid UTF-8."
+msgstr "指定��ユーザー�よる��接続��アクセス�種類を定義�る文字列��列。�れを NULL ���空��る������ユーザー���接続�アクセス��るよ���り��。�れ以外�場�����一覧�挙�られ��るユーザー���許��れ��。�れ�空���������指定��ユーザー� 1 人�アクティブ�セッション�ログイン��場���り�接続�アクティブ��り��。�エントリー�形�� \"[type]:[id]:[reserved]\" (���� \"user:dcbw:blah\") ��り��。��他�値�無視�れ�今後�使用����予約�れ��。�時点���\"user\" � [type] ���利用����。[id] ����権���照�るユーザー���\":\" 文字�使用����ん。表示�れ��る [reserved] 情報�無視�れ�今後使用�れる���予約�れる必���り��。[type]�[id]��よ� [reserved] ����有効� UTF-8 ��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:149
 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 "
 "connection is read-only and cannot be modified."
-msgstr ""
-"正��権����供�れ�設定サービス� D-Bus インターフェースを使用��接続�修正��る場�� FALSE�接続�読��り専用�修正����場�� "
-"TRUE。"
+msgstr "正��権����供�れ�設定サービス� D-Bus インターフェースを使用��接続�修正��る場�� FALSE�接続�読��り専用�修正����場�� TRUE。"
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:150
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
 msgstr "ベース接続自身�有効��る�有効��る接続� UUID リスト。�時点��VPN 接続���サ�ート�れ��。"
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:151
 msgid ""
-"Setting name of the device type of this slave's master connection (eg, "
-"\"bond\"), or NULL if this connection is not a slave."
+"Setting name of the device type of this slave's master connection (eg, \"bond"
+"\"), or NULL if this connection is not a slave."
 msgstr "��スレーブ�マスター接続 (\"bond\" ��) �デ�イスタイプ�設定�。��接続�スレーブ����場�� NULL。"
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -7331,50 +6977,27 @@ msgid ""
 "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}\"�\"${MAC}\"�\"${BOOT}\"�\"${RANDOM}\" "
-"��。�れ���接続時��デ�イス����起動時����毎回�固有� ID を効果的�作����。\"${DEVICE}\" "
-"��デ�イス�インターフェース��対応��\"${MAC}\" �デ�イス�永続的 MAC アドレス���点�注�������。'$' "
-"�続��識�れ����パターン�文字通り�扱�れ����今後使用�れる���予約�れ��。�������れ� '$' "
-"を使用��������エスケープ文字 \"$$\" ���使用�る���推奨�れ��。������れを \"${CONNECTION}-${BOOT}-"
-"${DEVICE}\" �設定�る����接続�対��固有� ID "
-"を作����。�れ��システムを�起動�る���変更�れ�プロファイル�アクティベート�れるインターフェース�応��異������。値�設定�れ����場���グロー�ル�接続デフォルトを�考����。引�続�値�設定�れ��場���デフォルト� "
-"\"${CONNECTION}\" �類似��接続�固有�固定 ID を使用���。"
+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}\"�\"${MAC}\"�\"${BOOT}\"�\"${RANDOM}\" ��。�れ���接続時��デ�イス����起動時����毎回�固有� ID を効果的�作����。\"${DEVICE}\" ��デ�イス�インターフェース��対応��\"${MAC}\" �デ�イス�永続的 MAC アドレス���点�注�������。'$' �続��識�れ����パターン�文字通り�扱�れ����今後使用�れる���予約�れ��。�������れ� '$' を使用��������エスケープ文字 \"$$\" ���使用�る���推奨�れ��。������れを \"${CONNECTION}-${BOOT}-${DEVICE}\" �設定�る����接続�対��固有� ID を作����。�れ��システムを�起動�る���変更�れ�プロファイル�アクティベート�れるインターフェース�応��異������。値�設定�れ����場���グロー�ル�接続デフォルトを�考����。引�続�値�設定�れ��場���デフォルト� \"${CONNECTION}\" �類似��接続�固有�固定 ID を使用���。"
 
-#: ../clients/common/settings-docs.h.in:152
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
 "timestamp periodically when the connection is active to ensure that an "
 "active connection has the latest timestamp. The property is only meant for "
 "reading (changes to this property will not be preserved)."
-msgstr ""
-"接続�最後�完全�有効�����ら��Unix エ�ック時間 (秒��)。NetworkManager "
-"��アクティブ�接続�最新�タイムスタンプ��る��を確��る����接続�アクティブ�時��接続�タイムスタンプを定期的�更新���。��プロパティー�読�込�������使用�れ�� "
-"(��プロパティー��変更��存�れ��ん)。"
+msgstr "接続�最後�完全�有効�����ら��Unix エ�ック時間 (秒��)。NetworkManager ��アクティブ�接続�最新�タイムスタンプ��る��を確��る����接続�アクティブ�時��接続�タイムスタンプを定期的�更新���。��プロパティー�読�込�������使用�れ�� (��プロパティー��変更��存�れ��ん)。"
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
 "ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-"
 "hardware dependent connections like VPN or otherwise, should contain the "
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
-msgstr ""
-"接続�ベースタイプ。�ードウェア��存�る接続�場����ードウェア�種類�固有�る設定��� (��り \"802-3-"
-"ethernet\"�\"802-11-wireless\"�\"bluetooth\" ��) ���れる必���り��。VPN "
-"����ードウェア��存���接続�����設定�タイプ� (��り \"vpn\"�\"bridge\" ��) ���れる必���り��。"
+msgstr "接続�ベースタイプ。�ードウェア��存�る接続�場����ードウェア�種類�固有�る設定��� (��り \"802-3-ethernet\"�\"802-11-wireless\"�\"bluetooth\" ��) ���れる必���り��。VPN ����ードウェア��存���接続�����設定�タイプ� (��り \"vpn\"�\"bridge\" ��) ���れる必���り��。"
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:155
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7384,15 +7007,9 @@ msgid ""
 "SSID, mobile broadband network provider, or \"type\" property changes. The "
 "UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, "
 "contains only hexadecimal characters and \"-\")."
-msgstr ""
-"��接続�対�るユニ�ーサル一�識別�。�����libuuid "
-"�生��れ��。�れ��接続�作��れ����割り当�られる必���り�接続����ットワーク��用�れ��る場���り変更���ん。������れ��\"id\" "
-"プロパティー��� NMSettingIP4Config �変更�る場��変更���ん��Wi-Fi "
-"SSID�モ�イル�ブロード�ンド�ットワークプロ�イダー���� \"type\" "
-"プロパティー�変更�る場����作��必���る場���り��。UUID �フォーマット� \"2815492f-7e56-435e-b2e9-"
-"246bd7cdc664\" (16 進数�文字� \"-\" �����れる) ��り��。"
+msgstr "��接続�対�るユニ�ーサル一�識別�。�����libuuid �生��れ��。�れ��接続�作��れ����割り当�られる必���り�接続����ットワーク��用�れ��る場���り変更���ん。������れ��\"id\" プロパティー��� NMSettingIP4Config �変更�る場��変更���ん��Wi-Fi SSID�モ�イル�ブロード�ンド�ットワークプロ�イダー���� \"type\" プロパティー�変更�る場����作��必���る場���り��。UUID �フォーマット� \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (16 進数�文字� \"-\" �����れる) ��り��。"
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "Timeout in milliseconds to wait for device at startup. During boot, devices "
 "may take a while to be detected by the driver. This property will cause to "
@@ -7401,165 +7018,123 @@ msgid ""
 "NMSettingConnection:interface-name to identify the device that will be "
 "waited for. The value 0 means no wait time. The default value is -1, which "
 "currently has the same meaning as no wait time."
-msgstr ""
-"デ�イス起動時�待�時間�ミリ秒���タイムアウト。起動時�ドライ�ー�デ�イスを検出�る���時間���る場���り��。��プロパティー�原因��NetworkManager-"
-"wait-online.service �よ� nm-online "
-"�デ�イス�表示�る�ャンスを与�る������り��。��プロパティー��待機�るデ�イスを特定�る際�� NMSettingConnection:"
-"interface-name ���機能�る点�注�������。値� 0 �場��待�時間��り��ん。デフォルト値� -1 "
-"���れ��時点�待�時間������味��り��。"
+msgstr "デ�イス起動時�待�時間�ミリ秒���タイムアウト。起動時�ドライ�ー�デ�イスを検出�る���時間���る場���り��。��プロパティー�原因��NetworkManager-wait-online.service �よ� nm-online �デ�イス�表示�る�ャンスを与�る������り��。��プロパティー��待機�るデ�イスを特定�る際�� NMSettingConnection:interface-name ���機能�る点�注�������。値� 0 �場��待�時間��り��ん。デフォルト値� -1 ���れ��時点�待�時間������味��り��。"
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
 "connection will be placed in the default zone as defined by the firewall. "
 "When updating this property on a currently activated connection, the change "
 "takes effect immediately."
-msgstr ""
-"接続�トラストレベル。自由形���大文字��文字を区別���文字列 (���� \"Home\"�\"Work\"�\"Public\")。NULL "
-"��る��ゾーンを指定�����接続��ファイアウォール�定義��デフォルトゾーン�設定�れ��。�在アクティブ�接続���プロパティーをアップデート�る��接続����有効��り��。"
+msgstr "接続�トラストレベル。自由形���大文字��文字を区別���文字列 (���� \"Home\"�\"Work\"�\"Public\")。NULL ��る��ゾーンを指定�����接続��ファイアウォール�定義��デフォルトゾーン�設定�れ��。�在アクティブ�接続���プロパティーをアップデート�る��接続����有効��り��。"
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"DCB FCoE アプリケーション�� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) �ら組����る�������。"
+msgstr "DCB FCoE アプリケーション�� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:159
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "FCoE コントローラーモード; \"fabric\" (デフォルト) ��� \"vn2vn\" ���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:160
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"FCoE フレーム�使用�るユーザー�最高優先度 (0 - 7)�も��� -1 (デフォルト�優先度)。\"app-fcoe-flags\" "
-"プロパティー�� NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを�む場���り使用�れ��。"
+msgstr "FCoE フレーム�使用�るユーザー�最高優先度 (0 - 7)�も��� -1 (デフォルト�優先度)。\"app-fcoe-flags\" プロパティー�� NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを�む場���り使用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"DCB FIP アプリケーション� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) �ら組����る�������。"
+msgstr "DCB FIP アプリケーション� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:162
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"FIP フレーム�使用�るユーザー�最高優先度 (0 - 7)�も��� -1 (デフォルト�優先度)。\"app-fip-flags\" "
-"プロパティー� NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを��る場���り使用���。"
+msgstr "FIP フレーム�使用�るユーザー�最高優先度 (0 - 7)�も��� -1 (デフォルト�優先度)。\"app-fip-flags\" プロパティー� NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを��る場���り使用���。"
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"DCB iSCSI アプリケーション� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) �ら組����る�������。"
+msgstr "DCB iSCSI アプリケーション� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:164
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"iSCSI フレーム�使用�るユーザー�最高優先度 (0 - 7)�も��� -1 (デフォルト�優先度)。\"app-iscsi-flags\" "
-"プロパティー� NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを追加�る場���り使用���。"
+msgstr "iSCSI フレーム�使用�るユーザー�最高優先度 (0 - 7)�も��� -1 (デフォルト�優先度)。\"app-iscsi-flags\" プロパティー� NM_SETTING_DCB_FLAG_ENABLE (0x1) フラグを追加�る場���り使用���。"
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:165
 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 "
 "priority's assigned group that the priority may use.  The sum of all "
 "percentages for priorities which belong to the same group must total 100 "
 "percents."
-msgstr ""
-"8 個� uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) "
-"�対応���。値��優先度�割り当�られ��るグループ�帯域幅�中�ら���優先度�使用�るパーセンテージを示���。グループ内��計を 100% "
-"��る必���り��。"
+msgstr "8 個� uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。値��優先度�割り当�られ��るグループ�帯域幅�中�ら���優先度�使用�るパーセンテージを示���。グループ内��計を 100% ��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:166
 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 "
 "priority should transmit priority pause."
-msgstr ""
-"8 個�ブール値��列。�列�インデックス��ユーザー�優先度 (0 - 7) "
-"�対応���。値��対応�る優先度��優先度��止を�信�る����を示���。"
+msgstr "8 個�ブール値��列。�列�インデックス��ユーザー�優先度 (0 - 7) �対応���。値��対応�る優先度��優先度��止を�信�る����を示���。"
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"DCB 優先フロー制御 (PFC) � NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) �ら組����る�������。"
+msgstr "DCB 優先フロー制御 (PFC) � NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:168
 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 "
 "allocated to that group.  Allowed values are 0 - 100, and the sum of all "
 "values must total 100 percents."
-msgstr ""
-"8 個� uint 値��列。�列�インデックス��優先度グループ ID (0 - 7) "
-"�対応���。値����グループ�割り当�られ�リンク帯域幅�パーセンテージを示���。使用��る値� 0 - 100 ���計を 100 "
-"パーセント��る必���り��。"
+msgstr "8 個� uint 値��列。�列�インデックス��優先度グループ ID (0 - 7) �対応���。値����グループ�割り当�られ�リンク帯域幅�パーセンテージを示���。使用��る値� 0 - 100 ���計を 100 パーセント��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"DCB 優先度グループ� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) �ら組����る�������。"
+msgstr "DCB 優先度グループ� NMSettingDcbFlags を指定���。フラグ��NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2)��よ� NM_SETTING_DCB_FLAG_WILLING (0x4) �ら組����る�������。"
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:170
 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 "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
-msgstr ""
-"8 �� uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。値�優先度グループ ID "
-"を示���。使用��る優先度グループ ID �値� 0 - 7 ��15 ��る�無制�グループ��り��。"
+msgstr "8 �� uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。値�優先度グループ ID を示���。使用��る優先度グループ ID �値� 0 - 7 ��15 ��る�無制�グループ��り��。"
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:171
 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 "
 "all of the bandwidth allocated to its assigned group."
-msgstr ""
-"8 個�ブール値��列。�列�インデックス�ユーザー�優先度 (0 - 7) "
-"�対応���。値����優先度を割り当��グループ�割り当�られ�����帯域幅を���優先度�使用�る����を示���。"
+msgstr "8 個�ブール値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。値����優先度を割り当��グループ�割り当�られ�����帯域幅を���優先度�使用�る����を示���。"
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:172
 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 "
 "the priority is mapped."
-msgstr ""
-"8 uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。値��優先度�マッピング�れるトラフィッククラス (0 - "
-"7) を示�����。"
+msgstr "8 uint 値��列。�列�インデックス�ユーザー�優先度 (0 - 7) �対応���。値��優先度�マッピング�れるトラフィッククラス (0 - 7) を示�����。"
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:173
 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 "
@@ -7568,115 +7143,99 @@ msgid ""
 "to use the correct APN for the user's mobile broadband plan. The APN may "
 "only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section "
 "14.9."
-msgstr ""
-"GSM ベース��ットワーク�データセッションを確立�る際�使用�る APN を指定�る GPRS アクセス�イント�。�� APN "
-"��������ットワーク利用料金�支払�方法��インター�ット�アクセス�る�も���プロ�イダー固有�ウォールドガーデン���アクセス�る�を決定���。������ユーザー�モ�イルブロード�ンドプラン�対��正�� "
-"APN を使用�る�������。APN �文字列��a- z � 0 - 9 ���使用���GSM 03.60 セクション 14.9 �準拠���。"
+msgstr "GSM ベース��ットワーク�データセッションを確立�る際�使用�る APN を指定�る GPRS アクセス�イント�。�� APN ��������ットワーク利用料金�支払�方法��インター�ット�アクセス�る�も���プロ�イダー固有�ウォールドガーデン���アクセス�る�を決定���。������ユーザー�モ�イルブロード�ンドプラン�対��正�� APN を使用�る�������。APN �文字列��a- z � 0 - 9 ���使用���GSM 03.60 セクション 14.9 �準拠���。"
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:174
+msgid ""
+"When TRUE, the settings such as APN, username, or password will default to "
+"values that match the network the modem will register to in the Mobile "
+"Broadband Provider database."
+msgstr "TRUE �場��APN�ユーザー����� パスワード���設定��モデム�モ�イルブロード�ンドプロ�イダーデータベース�登録�る�ットワーク�一致�る値�デフォルト設定�れ��。"
+
+#: ../clients/common/settings-docs.h.in:175
 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 "
 "specified device."
-msgstr ""
-"(WWAN 管�サービス�指定�れ�よ��) ��接続��用�れるデ�イス�一�識別�。�れを指定�る��接続��指定��デ�イス����用�れ��。"
+msgstr "(WWAN 管�サービス�指定�れ�よ��) ��接続��用�れるデ�イス�一�識別�。�れを指定�る��接続��指定��デ�イス����用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
 msgstr "TRUE ��る��ホーム�ットワーク��接続����能��り��。ローミング�ットワーク��接続�作��れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
 "to force the device to register only on the specified network. This can be "
 "used to ensure that the device does not roam when direct roaming control of "
 "the device is not otherwise possible."
-msgstr ""
-"特定��ットワーク登録を強制�る�ットワーク ID (GSM LAI フォーマット MCC-MNC)。�ットワーク ID "
-"を指定�る��NetworkManager "
-"��指定���ットワーク���デ�イス�登録を強制�よ�����。�れ��デ�イス�ローミングを阻止�る���使用����。 "
-"�れ以外��ローミングを直接制御�る�������ん。"
+msgstr "特定��ットワーク登録を強制�る�ットワーク ID (GSM LAI フォーマット MCC-MNC)。�ットワーク ID を指定�る��NetworkManager ��指定���ットワーク���デ�イス�登録を強制�よ�����。�れ��デ�イス�ローミングを阻止�る���使用����。 �れ以外��ローミングを直接制御�る�������ん。"
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "Legacy setting that used to help establishing PPP data sessions for GSM-"
 "based modems. Deprecated: 1"
 msgstr "GSM ベース�モデム��� PPP データセッションを確立�る���使用�れ�レガシー設定。�推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:182
 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 "
 "device."
-msgstr ""
-"PIN � SIM �ロック�れ�場�����他��作を行���アンロック�る必���り��。��� PIN "
-"を指定�る��デ�イス��作��能��り��。"
+msgstr "PIN � SIM �ロック�れ�場�����他��作を行���アンロック�る必���り��。��� PIN を指定�る��デ�イス��作��能��り��。"
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:184
 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 "
 "any device also allowed by \"device-id\" which contains a SIM card matching "
 "the given identifier."
-msgstr ""
-"(WWAN 管�サービス�よ��指定�れ�よ��) ��接続��用�れる SIM カード�一�識別�。�れを指定�る��接続��\"device-"
-"id\" �も許��れ��るデ�イス��用�れ��。�れ���指定��識別��一致�る SIM カード���れ��。"
+msgstr "(WWAN 管�サービス�よ��指定�れ�よ��) ��接続��用�れる SIM カード�一�識別�。�れを指定�る��接続��\"device-id\" �も許��れ��るデ�イス��用�れ��。�れ���指定��識別��一致�る SIM カード���れ��。"
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
 "connection will apply to any device also allowed by \"device-id\" and \"sim-"
 "id\" which contains a SIM card provisioned by the given operator."
-msgstr ""
-"\"310260\"�\"21601\" ��� MCC/MNC "
-"文字列。��接続��用�れる特定�モ�イル�ットワークオペレーターを識別���。�れを指定�る��接続��\"device-id\" �よ� \"sim-"
-"id\" �許��れるデ�イス�も�用�れ��。�れ���指定��オペレーター�ら�供�れる SIM カード���れ��。"
+msgstr "\"310260\"�\"21601\" ��� MCC/MNC 文字列。��接続��用�れる特定�モ�イル�ットワークオペレーターを識別���。�れを指定�る��接続��\"device-id\" �よ� \"sim-id\" �許��れるデ�イス�も�用�れ��。�れ���指定��オペレーター�ら�供�れる SIM カード���れ��。"
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:187
 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 "
 "of the device (i.e. MAC spoofing)."
-msgstr ""
-"指定�る����接続�永続的� MAC アドレス�一致�る IPoIB デ�イス����用�れ��。��プロパティー�デ�イス� MAC "
-"アドレスを変更���ん (MAC スプーフィング)。"
+msgstr "指定�る����接続�永続的� MAC アドレス�一致�る IPoIB デ�イス����用�れ��。��プロパティー�デ�イス� MAC アドレスを変更���ん (MAC スプーフィング)。"
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:189
 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 "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
-""
-msgstr ""
-"��デ�イス�使用�る InfiniBand P_Key。-1 ��デフォルト� P_Key (別� \"インデックス 0 � P_Key\") "
-"を使用�る��を示�����。 も����16 ビット�署���整数��。\"完全メン�ーシップ\" � P_Key "
-"�場�����高ビット�設定�れ��。"
+msgstr "��デ�イス�使用�る InfiniBand P_Key。-1 ��デフォルト� P_Key (別� \"インデックス 0 � P_Key\") を使用�る��を示�����。 も����16 ビット�署���整数��。\"完全メン�ーシップ\" � P_Key �場�����高ビット�設定�れ��。"
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:190
 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 "
 "setting either this property or \"mac-address\"."
-msgstr ""
-"��デ�イス�親デ�イス�インターフェース�。通常� NULL ����\"p_key\" プロパティー�設定�れる����プロパティー��� "
-"\"mac-address\" ���れ�を設定���ベースデ�イスを指定�る必���り��。"
+msgstr "��デ�イス�親デ�イス�インターフェース�。通常� NULL ����\"p_key\" プロパティー�設定�れる����プロパティー��� \"mac-address\" ���れ�を設定���ベースデ�イスを指定�る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr "IPoIB トランス�ートモード。\"datagram\" ��� \"connected\" ���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr "パケット�先頭�カプセル化レベルを���ら�追加��る�。��プロパティー��IPv6 トン�ル����用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -7685,92 +7244,80 @@ msgid ""
 "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 トン�ル���有効��。"
+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:192
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr "トン�ルパケット�割り当�るフローラベル。��プロパティー��IPv6 ����用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:195
 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."
-msgstr ""
-"トン�ル入力パケット�使用�れるキー。��プロパティー��特定�トン�ルモード (GRE�IP6GRE) "
-"�対����有効��。空��る��キー�使用�れ��ん。"
+msgstr "トン�ル入力パケット�使用�れるキー。��プロパティー��特定�トン�ルモード (GRE�IP6GRE) �対����有効��。空��る��キー�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
 msgstr "トン�ル�ローカルエンド�イント。値�空�����。も����IPv4 アドレス��� IPv6 アドレスを�む必���り��。"
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
-msgstr ""
-"トン�リングモード。���� NM_IP_TUNNEL_MODE_IPIP (1) や NM_IP_TUNNEL_MODE_GRE (2)。"
+msgstr "トン�リングモード。���� NM_IP_TUNNEL_MODE_IPIP (1) や NM_IP_TUNNEL_MODE_GRE (2)。"
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
 msgstr "ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定より大��パケット��複数�フラグメント�分割�れ��。"
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:199
 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) "
-"�対����有効��。空��る��キー�使用�れ��ん。"
+msgstr "トン�ル出力パケット�使用�れるキー。��プロパティー��特定�トン�ルモード (GRE�IP6GRE) �対����有効��。空��る��キー�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:200
 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 "
 "that interface."
-msgstr ""
-"指定��場���トン�ル化��パケット�����インターフェース�ら���よ���新��デ�イス��インド�れる親インターフェース����親接続� "
-"UUID を指定���。"
+msgstr "指定��場���トン�ル化��パケット�����インターフェース�ら���よ���新��デ�イス��インド�れる親インターフェース����親接続� UUID を指定���。"
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:201
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "��トン�ル��パス MTU 検出を有効��る����。"
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr "トン�ル�リモートエンド�イント。��値���IPv4 アドレス��� IPv6 アドレスを��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
 msgstr "トン�ル化パケット�設定�れるサービス�タイプ (IPv4) ���トラフィッククラス (IPv6) フィールド。"
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
 msgstr "トン�ル化パケット�割り当�る TTL。0 �特別�値��パケット� TTL 値を継承�る��を示�����。"
 
-#: ../clients/common/settings-docs.h.in:203
-#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:228
 msgid "Array of IP addresses."
 msgstr "IP アドレス��列。"
 
-#: ../clients/common/settings-docs.h.in:204
-#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:229
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
@@ -7778,13 +7325,9 @@ msgid ""
 "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."
-msgstr ""
-"�ットワーク上� IP アドレス��複を確��る��使用�れるタイムアウト "
-"(ミリ秒��)。アドレス�競��検出�れる��アクティベーション�失敗���。��値をゼロ��る���複アドレス�検出�行�れ��ん。-1 "
-"��デフォルト値 (設定 ipvx.dad-timeout をオー�ーライド���ゼロ���れ�) ��り��。値�ゼロより大��場��タイムアウト "
-"(ミリ秒) ��り��。�在���プロパティー� IPv4 ���実装�れ����。"
+msgstr "�ットワーク上� IP アドレス��複を確��る��使用�れるタイムアウト (ミリ秒��)。アドレス�競��検出�れる��アクティベーション�失敗���。��値をゼロ��る���複アドレス�検出�行�れ��ん。-1 ��デフォルト値 (設定 ipvx.dad-timeout をオー�ーライド���ゼロ���れ�) ��り��。値�ゼロより大��場��タイムアウト (ミリ秒) ��り��。�在���プロパティー� IPv4 ���実装�れ����。"
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:207
 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 "
@@ -7798,84 +7341,96 @@ msgid ""
 "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 \"duid\" generates a RFC4361-compliant client "
-"identifier based on a hash of the interface name as IAID and /etc/machine-id."
-" The special value \"stable\" is supported to generate a type 0 client "
+"identifier based on a hash of the interface name as IAID and /etc/machine-"
+"id. 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 you set the stable-id, you may want to include the \"${DEVICE}\" or "
 "\"${MAC}\" specifier to get a per-device key. If unset, a globally "
 "configured default is used. If still unset, the default depends on the DHCP "
 "plugin."
-msgstr ""
-"DHCP サー�ー��られる文字列。DHCP サー�ー� DHCP "
-"リース�オプションをカスタマイズ�る��使用�るローカルマシンを識別���。プロパティー� 16 進数 ('aa:bb:cc') "
-"�場����イナリー�クライアント ID ���解釈�れ��。��場��最���イト��RFC 2132 �セクション 9.14 "
-"�指定�れ��るよ���'type' フィールド��り�残り��イト��ードウェアアドレス ('01:xx:xx:xx:xx:xx:xx' ��。1 � "
-"Ethernet � ARP タイプ��残り� MAC アドレス) ��り��。文字列� 16 進数����場�����ードウェアアドレス�クライアント "
-"ID �見��れ�'type' フィールド� 0 �設定�れ��。特別値��る \"mac\" �よ� \"perm-mac\" "
-"�サ�ート�れ����。�れら��デ�イス��在���永続的 MAC アドレスを使用���type ethernet (01) "
-"�クライアント識別�を生����。�在��れら�オプション��ethernet リンク���有効��。特別値 \"duid\" ��IAID �よ� /"
-"etc/machine-id ���インターフェース���ッシュ�基��� RFC4361 準拠�クライアント識別�を生����。特別値 "
-"\"stable\" ��stable-id (connection.stable-id を�照) �よ�ホスト���キーを基��type 0 "
-"�クライアント識別�を生��るよ�サ�ート�れ����。stable-id を設定�る場���デ�イス���キーを�得�る��� "
-"\"${DEVICE}\" ��� \"${MAC}\" "
-"�指定�を�む��を�������。値�設定�れ��場���グロー�ル�設定�れ�デフォルト�使用�れ��。引�続�値�設定�れ��場���デフォルト� "
-"DHCP プラグイン��存�るよ�設定�れ��。"
+msgstr "DHCP サー�ー��られる文字列。DHCP サー�ー� DHCP リース�オプションをカスタマイズ�る��使用�るローカルマシンを識別���。プロパティー� 16 進数 ('aa:bb:cc') �場����イナリー�クライアント ID ���解釈�れ��。��場��最���イト��RFC 2132 �セクション 9.14 �指定�れ��るよ���'type' フィールド��り�残り��イト��ードウェアアドレス ('01:xx:xx:xx:xx:xx:xx' ��。1 � Ethernet � ARP タイプ��残り� MAC アドレス) ��り��。文字列� 16 進数����場�����ードウェアアドレス�クライアント ID �見��れ�'type' フィールド� 0 �設定�れ��。特別値��る \"mac\" �よ� \"perm-mac\" �サ�ート�れ����。�れら��デ�イス��在���永続的 MAC アドレスを使用���type ethernet (01) �クライアント識別�を生����。�在��れら�オプション��ethernet リンク���有効��。特別値 \"duid\" ��IAID �よ� /etc/machine-id ���インターフェース���ッシュ�基��� RFC4361 準拠�クライアント識別�を生����。特別値 \"stable\" ��stable-id (connection.stable-id を�照) �よ�ホスト���キーを基��type 0 �クライアント識別�を生��るよ�サ�ート�れ����。stable-id を設定�る場���デ�イス���キーを�得�る��� \"${DEVICE}\" ��� \"${MAC}\" �指定�を�む��を�������。値�設定�れ��場���グロー�ル�設定�れ�デフォルト�使用�れ��。引�続�値�設定�れ��場���デフォルト� DHCP プラグイン��存�るよ�設定�れ��。"
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:208
 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-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
-msgstr ""
-"\"dhcp-send-hostname\" プロパティー� TRUE �場���リースを�得�る際��指定�� FQDN � DHCP "
-"サー�ー��られ��。��優先度�よ� \"dhcp-hostname\" �相互�排他的���時�設定����ん。"
+msgstr "\"dhcp-send-hostname\" プロパティー� TRUE �場���リースを�得�る際��指定�� FQDN � DHCP サー�ー��られ��。��優先度�よ� \"dhcp-hostname\" �相互�排他的���時�設定����ん。"
 
-#: ../clients/common/settings-docs.h.in:207
-#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:231
 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-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
-msgstr ""
-"\"dhcp-send-hostname\" プロパティー� TRUE �場���リースを�得�る際��指定����� DHCP "
-"サー�ー��られ��。��プロパティー� \"dhcp-fqdn\" �相互�排他的���時�設定����ん。"
+msgstr "\"dhcp-send-hostname\" プロパティー� TRUE �場���リースを�得�る際��指定����� DHCP サー�ー��られ��。��プロパティー� \"dhcp-fqdn\" �相互�排他的���時�設定����ん。"
 
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:232
+msgid ""
+"Flags for the DHCP hostname and FQDN. Currently this property only includes "
+"flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
+"flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option "
+"will contain no flag. Otherwise, if no FQDN flag is set and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN "
+"flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is "
+"set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default "
+"is looked up in NetworkManager configuration. If that value is unset or also "
+"NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described "
+"above are sent in the DHCP requests."
+msgstr "DHCP ホスト�� FQDN �フラグ。�在���プロパティー���DHCP FQDN オプション�設定�れ� FQDN フラグを制御�るフラグ�����れ����。サ�ート�れ��るFQDN フラグ��NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1)�NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2)��よ� NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4) ��。FQDN フラグ�設定�れ��ら��NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) �設定�れ��る場��DHCP FQDN オプション��フラグ���れ��ん。����FQDN フラグ�設定�れ��ら��NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) �設定�れ����場��標準 FQDN フラグ�リクエスト�設定�れ��: IPv4 用� NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) � NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2)�IPv6 用� NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) ��り��。��プロパティー�デフォルト値 NM_DHCP_HOSTNAME_FLAG_NONE (0x0) �設定�れ��る場��NetworkManager 設定�グロー�ルデフォルト�検索�れ��。��値�未設定�場����� NM_DHCP_HOSTNAME_FLAG_NONE (0x0) �場���上述��標準 FQDN フラグ� DHCP リクエスト��信�れ��。"
+
+#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:233
+msgid ""
+"A string containing the \"Identity Association Identifier\" (IAID) used by "
+"the DHCP client. The property is a 32-bit decimal value or a special value "
+"among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac"
+"\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC "
+"address are used as IAID. When set to \"ifname\", the IAID is computed by "
+"hashing the interface name. The special value \"stable\" can be used to "
+"generate an IAID based on the stable-id (see connection.stable-id), a per-"
+"host key and the interface name. When the property is unset, the value from "
+"global configuration is used; if no global default is set then the IAID is "
+"assumed to be \"ifname\". Note that at the moment this property is ignored "
+"for IPv6 by dhclient, which always derives the IAID from the MAC address."
+msgstr "DHCP クライアント�使用�る \"Identity Association Identifier\" (IAID) を�む文字列。プロパティー��32 ビット� 10 進数値���� \"mac\"�\"perm-mac\"�\"ifname\"��よ� \"stable\" ����特別�値��り��。\"mac\" (��� \"perm-mac\") �設定�れる���在� (���永続的�) MAC アドレス�最後� 4 �イト� IAID ���使用�れ��。\"ifname\" �設定�る��IAID �インターフェイス�を�ッシュ�る���よ��計算�れ��。特別�値� \"stable\" を使用���stable-id (connection.stable-id を�照)�ホスト���キー��よ�インターフェイス��基��� IAID を生�����。プロパティー�設定�れ����場���グロー�ル設定�値�使用�れ��。デフォルト�グロー�ル設定���場���IAID � \"ifname\" �見��れ��。�時点�����プロパティー� dhclient �よ�� IPv6 �対��無視�れる点�注�������。dhclient �常��MAC アドレス�ら IAID を�得���。"
+
+#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:234
 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 "
 "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."
-msgstr ""
-"TRUE �場��リースを�得�る際�ホスト�� DHCP サー�ー��信�れ��。一部� DHCP サー�ー���ホスト�を使用�� DNS "
-"データベースをアップデート��コンピューター��的ホスト�を�供���。\"dhcp-hostname\" プロパティー� NULL "
-"����プロパティー� TRUE �場�����コンピューター��在�永続ホスト���られ��。"
+msgstr "TRUE �場��リースを�得�る際�ホスト�� DHCP サー�ー��信�れ��。一部� DHCP サー�ー���ホスト�を使用�� DNS データベースをアップデート��コンピューター��的ホスト�を�供���。\"dhcp-hostname\" プロパティー� NULL ����プロパティー� TRUE �場�����コンピューター��在�永続ホスト���られ��。"
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:235
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "DHCP トランザクション�タイムアウト (秒��)。"
 
-#: ../clients/common/settings-docs.h.in:210
-#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:236
 msgid "Array of IP addresses of DNS servers."
 msgstr "DNS サー�ー� IP アドレス�列。"
 
-#: ../clients/common/settings-docs.h.in:211
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:237
 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 "
 "use default options. This is distinct from an empty list of properties."
-msgstr ""
-"DNS オプション��列。man 5 resolv.conf �説明�れ����。NULL "
-"��オプション�設定�れ������デフォルト�����る��を示�����。��場��NetworkManager "
-"�デフォルト�オプションを使用��プロパティー�リスト�空�����る場���区別�れ��。"
+msgstr "DNS オプション��列。man 5 resolv.conf �説明�れ����。NULL ��オプション�設定�れ������デフォルト�����る��を示�����。��場��NetworkManager �デフォルト�オプションを使用��プロパティー�リスト�空�����る場���区別�れ��。"
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:238
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
 "this setting.  A lower value is better (higher priority). Zero selects a "
@@ -7893,69 +7448,50 @@ msgid ""
 "lowest priority value will be used. When using a DNS resolver that supports "
 "Conditional Forwarding 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 "
-"�優先度�値�負��る別�ドメイン�サブドメイン��る場����サブドメイン�無視�れ��。"
+"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:213
-#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:239
 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' "
-"���る�考�られ���インターフェース�クエリーを転�����を決�る際���使用�れ��。�れら���修飾ホスト�を完���る����使用�れ��ん。"
+msgstr "DNS 検索ドメイン��列。�ルダ ('~') �始�るドメイン��ドメインを 'routing' ���る�考�られ���インターフェース�クエリーを転�����を決�る際���使用�れ��。�れら���修飾ホスト�を完���る����使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:240
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
 msgstr "ゲートウェイ����設定�関連付�られ����。\"アドレス\" ��も�設定��場���り有効��り��。"
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:241
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
 "and search domains specified in the \"dns\" and \"dns-search\" properties, "
 "if any, are used."
-msgstr ""
-"\"method\" を \"auto\" �設定����プロパティーを TRUE "
-"�設定�る��自動的�設定�れる�ームサー�ー�検索ドメイン�無視�れ��。\"dns\" プロパティー� \"dns-search\" "
-"プロパティー�指定���ームサー�ー�検索ドメイン���使用�れ��。"
+msgstr "\"method\" を \"auto\" �設定����プロパティーを TRUE �設定�る��自動的�設定�れる�ームサー�ー�検索ドメイン�無視�れ��。\"dns\" プロパティー� \"dns-search\" プロパティー�指定���ームサー�ー�検索ドメイン���使用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
-msgstr ""
-"\"method\" を \"auto\" �設定����プロパティーを TRUE �設定�る��自動的�設定��ルート�無視�れ�ルートを "
-"\"routes\" プロパティー�指定��場�����ルート���使用�れ��。"
+msgstr "\"method\" を \"auto\" �設定����プロパティーを TRUE �設定�る��自動的�設定��ルート�無視�れ�ルートを \"routes\" プロパティー�指定��場�����ルート���使用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:244
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -7963,49 +7499,34 @@ msgid ""
 "fail.  For example, in IPv6-only networks, setting this property to TRUE on "
 "the NMSettingIP4Config allows the overall network configuration to succeed "
 "if IPv4 configuration fails but IPv6 configuration completes successfully."
-msgstr ""
-"TRUE �場�����プロパティー�指定��設定�タイムアウト����も�全体��ットワーク設定�続行���。IP 設定�最低 1 "
-"���功�る必���り��功�����ットワーク全体�設定�失敗���。�����IPv6 "
-"�定��ットワーク�����NMSettingIP4Config ���プロパティーを TRUE �設定�る��IPv4 設定�失敗��IPv6 "
-"設定�完全��功��も�全体��ットワーク設定��功���。"
+msgstr "TRUE �場�����プロパティー�指定��設定�タイムアウト����も�全体��ットワーク設定�続行���。IP 設定�最低 1 ���功�る必���り��功�����ットワーク全体�設定�失敗���。�����IPv6 �定��ットワーク�����NMSettingIP4Config ���プロパティーを TRUE �設定�る��IPv4 設定�失敗��IPv6 設定�完全��功��も�全体��ットワーク設定��功���。"
 
-#: ../clients/common/settings-docs.h.in:218
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
-"subclass-specific documentation for other values. In general, for the "
-"\"auto\" method, properties such as \"dns\" and \"routes\" specify "
-"information that is added on to the information returned from automatic "
-"configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" "
-"properties modify this behavior. For methods that imply no upstream network, "
-"such as \"shared\" or \"link-local\", these properties must be empty. For "
-"IPv4 method \"shared\", the IP subnet can be configured by adding one manual "
-"IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared "
-"method must be configured on the interface which shares the internet to a "
-"subnet, not on the uplink which is shared."
-msgstr ""
-"IP 設定方法。NMSettingIP4Config � NMSettingIP6Config ��も� "
-"\"disabled\"�\"auto\"�\"manual\"��よ� \"link-local\" "
-"をサ�ート���。��他�値��サブクラス�関�るドキュメントを�照������。一般的��\"auto\" "
-"方法���\"dns\"�\"routes\" ���プロパティー��自動設定�ら返�れ�情報�追加�る情報を指定���。\"ignore-auto-"
-"routes\" プロパティー� \"ignore-auto-dns\" "
-"プロパティー����動作を修正���。アップストリーム��ットワーク��を�味�る \"shared\" ��� \"link-local\" "
-"���方法����れら�プロパティーを空��る必���り��。IPv4 方法 \"shared\" �場���手動� IPv4 アドレスを 1 "
-"�追加�� IP サブ�ットを設定����。設定���場�� 10.42.x.0/24 ��択�れ��。\"shared\" 方法��共有�れる "
-"uplink �����インター�ットをサブ�ット�共有�るインターフェース上�設定�れる必���る���注�������。"
+"subclass-specific documentation for other values. In general, for the \"auto"
+"\" method, properties such as \"dns\" and \"routes\" specify information "
+"that is added on to the information returned from automatic configuration.  "
+"The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this "
+"behavior. For methods that imply no upstream network, such as \"shared\" or "
+"\"link-local\", these properties must be empty. For IPv4 method \"shared\", "
+"the IP subnet can be configured by adding one manual IPv4 address or "
+"otherwise 10.42.x.0/24 is chosen. Note that the shared method must be "
+"configured on the interface which shares the internet to a subnet, not on "
+"the uplink which is shared."
+msgstr "IP 設定方法。NMSettingIP4Config � NMSettingIP6Config ��も� \"disabled\"�\"auto\"�\"manual\"��よ� \"link-local\" をサ�ート���。��他�値��サブクラス�関�るドキュメントを�照������。一般的��\"auto\" 方法���\"dns\"�\"routes\" ���プロパティー��自動設定�ら返�れ�情報�追加�る情報を指定���。\"ignore-auto-routes\" プロパティー� \"ignore-auto-dns\" プロパティー����動作を修正���。アップストリーム��ットワーク��を�味�る \"shared\" ��� \"link-local\" ���方法����れら�プロパティーを空��る必���り��。IPv4 方法 \"shared\" �場���手動� IPv4 アドレスを 1 �追加�� IP サブ�ットを設定����。設定���場�� 10.42.x.0/24 ��択�れ��。\"shared\" 方法��共有�れる uplink �����インター�ットをサブ�ット�共有�るインターフェース上�設定�れる必���る���注�������。"
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:246
 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."
-msgstr ""
-"TRUE ��る����接続��� IP タイプ�対�るデフォルト�接続���ら�����NetworkManager "
-"�よ��デフォルトルート�割り当�られ��ん。"
+msgstr "TRUE ��る����接続��� IP タイプ�対�るデフォルト�接続���ら�����NetworkManager �よ��デフォルトルート�割り当�られ��ん。"
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:247
 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 "
@@ -8014,15 +7535,10 @@ msgid ""
 "default route. Note that for IPv6, the kernel accepts zero (0) but coerces "
 "it to 1024 (user default). Hence, setting this property to zero effectively "
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
-msgstr ""
-"メトリックを明示的�指定���ルート�対�るデフォルト�メトリック。デフォルト�値 -1 "
-"��デ�イスタイプ�基���自動的�メトリック��択�れる��を示�����。��メトリック��明示的�メトリック設定���動的ルート�よ�手動 "
-"(�的) ルート��用�れ��。IPv6 ���カー�ル�ゼロ (0) を許������強制的� 1024 (ユーザーデフォルト) "
-"��り��。��������プロパティーをゼロ�設定�る��実際�� 1024 ��る���注�������。IPv4 "
-"���ゼロ�メトリック�正則値��り��。"
+msgstr "メトリックを明示的�指定���ルート�対�るデフォルト�メトリック。デフォルト�値 -1 ��デ�イスタイプ�基���自動的�メトリック��択�れる��を示�����。��メトリック��明示的�メトリック設定���動的ルート�よ�手動 (�的) ルート��用�れ��。IPv6 ���カー�ル�ゼロ (0) を許������強制的� 1024 (ユーザーデフォルト) ��り��。��������プロパティーをゼロ�設定�る��実際�� 1024 ��る���注�������。IPv4 ���ゼロ�メトリック�正則値��り��。"
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -8037,19 +7553,14 @@ msgid ""
 "will not delete any extraneous routes from tables except the main table. "
 "This is to preserve backward compatibility for users who manage routing "
 "tables outside of NetworkManager."
-msgstr ""
-"�リシールーティング (ソースルーティング) を有効���ルート�追加時�使用�るルーティングテーブルを設定���。�れ��device-"
-"routes�IPv4LL�DHCP�SLAAC�デフォルトルート��的ルート�������ルート�影響���。�����的ルート��ゼロ以外�ルーティングテーブルを明示的�指定�る������設定を個別�上書���る���注�������。������テーブル設定をゼロ�����る��グロー�ル設定�ら上書���るよ���り��。グロー�ル設定値を�用���らプロパティーをゼロ���も��リシールーティング���接続�アドレスファミリー�対��無効��り��。�リシールーティングを無効��る��NetworkManager "
-"�����ルートをメインテーブル�追加��� (����別�テーブル�明示的�設定���的ルート�除���)。���NetworkManager "
-"��メインテーブル以外�テーブル�ら外部ルートを削除���ん。�れ�より�NetworkManager "
-"以外�ルーティングテーブルを管��る���後方互�性を確����。"
+msgstr "�リシールーティング (ソースルーティング) を有効���ルート�追加時�使用�るルーティングテーブルを設定���。�れ��device-routes�IPv4LL�DHCP�SLAAC�デフォルトルート��的ルート�������ルート�影響���。�����的ルート��ゼロ以外�ルーティングテーブルを明示的�指定�る������設定を個別�上書���る���注�������。������テーブル設定をゼロ�����る��グロー�ル設定�ら上書���るよ���り��。グロー�ル設定値を�用���らプロパティーをゼロ���も��リシールーティング���接続�アドレスファミリー�対��無効��り��。�リシールーティングを無効��る��NetworkManager �����ルートをメインテーブル�追加��� (����別�テーブル�明示的�設定���的ルート�除���)。���NetworkManager ��メインテーブル以外�テーブル�ら外部ルートを削除���ん。�れ�より�NetworkManager 以外�ルーティングテーブルを管��る���後方互�性を確����。"
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:249
 msgid "Array of IP routes."
 msgstr "IP ルート��列。"
 
-#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:227
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -8069,19 +7580,9 @@ msgid ""
 "upgrade from older versions. Note that this setting is distinct from the "
 "Privacy Extensions as configured by \"ip6-privacy\" property and it does not "
 "affect the temporary addresses configured with this option."
-msgstr ""
-"RFC4862 IPv6 ステートレスアドレス�自動設定�使用�るアドレスを作��る方法を設定���。利用��る値� "
-"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) ��� "
-"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1) ��。��プロパティーを EUI64 "
-"�設定�る��アドレス���ードウェアアドレス�ら�得��インターフェーストークンを使用��生��れ��。�れ�より�アドレス�ホスト部分�一定��り��ットワークを変更�る際�ホスト�存在を追跡����。インターフェース��ードウェアを交��る�アドレス�変更���。stable-"
-"privacy �値��RFC7217 �指定�れ��るよ���接続� stable-id "
-"��ットワークアドレス��も��ホスト固有�秘密���暗���護�れ��る�ッシュ�使用を有効����。�れ�より�アドレス�ホスト�存在を追跡�る��������り��ットワークインターフェース��ードウェアを交��る際�アドレス�安定���。D-"
-"Bus ���addr-gen-mode 設定�������stable-privacy を有効��る�������。keyfile "
-"プラグイン���ディスク�設定���場�� EUI64 "
-"を�味��プロパティー�以���ージョン�ら�アップグレード�変更���ん。��設定��\"ip6-privacy\" "
-"プロパティー�より設定�れ�プライ�シー拡張��異�り���オプション�設定��一時アドレス��影響������注�������。"
+msgstr "RFC4862 IPv6 ステートレスアドレス�自動設定�使用�るアドレスを作��る方法を設定���。利用��る値� NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) ��� NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1) ��。��プロパティーを EUI64 �設定�る��アドレス���ードウェアアドレス�ら�得��インターフェーストークンを使用��生��れ��。�れ�より�アドレス�ホスト部分�一定��り��ットワークを変更�る際�ホスト�存在を追跡����。インターフェース��ードウェアを交��る�アドレス�変更���。stable-privacy �値��RFC7217 �指定�れ��るよ���接続� stable-id ��ットワークアドレス��も��ホスト固有�秘密���暗���護�れ��る�ッシュ�使用を有効����。�れ�より�アドレス�ホスト�存在を追跡�る��������り��ットワークインターフェース��ードウェアを交��る際�アドレス�安定���。D-Bus ���addr-gen-mode 設定�������stable-privacy を有効��る�������。keyfile プラグイン���ディスク�設定���場�� EUI64 を�味��プロパティー�以���ージョン�ら�アップグレード�変更���ん。��設定��\"ip6-privacy\" プロパティー�より設定�れ�プライ�シー拡張��異�り���オプション�設定��一時アドレス��影響������注�������。"
 
-#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:230
 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 "
@@ -8108,25 +7609,9 @@ msgid ""
 "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-id � "
-"\"${DEVICE}\" ��� \"${MAC}\" �指定�を�む��を�������。������\"stable-ll\" �よ� "
-"\"stable-llt\" �リンク層�アドレス��stable id �ら算出�れる生��れ�アドレス��り��。\"stable-llt\" "
-"オプション� DUID-LLT タイム値��3 年����的タイムスパン�中�ら��れ�� (インター�ル�上���\"llt\" "
-"�使用�れる一定�タイムスタンプ�����)。プロパティー�設定�れ����場��\"ipv6.dhcp-duid\" "
-"��供�れるグロー�ル値�使用�れ��。グロー�ル値��供�れ��場���デフォルト� \"lease\" 値�想定�れ��。 "
+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-id � \"${DEVICE}\" ��� \"${MAC}\" �指定�を�む��を�������。������\"stable-ll\" �よ� \"stable-llt\" �リンク層�アドレス��stable id �ら算出�れる生��れ�アドレス��り��。\"stable-llt\" オプション� DUID-LLT タイム値��3 年����的タイムスパン�中�ら��れ�� (インター�ル�上���\"llt\" �使用�れる一定�タイムスタンプ�����)。プロパティー�設定�れ����場��\"ipv6.dhcp-duid\" ��供�れるグロー�ル値�使用�れ��。グロー�ル値��供�れ��場���デフォルト� \"lease\" 値�想定�れ��。"
 
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:243
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -8141,368 +7626,326 @@ msgid ""
 "Privacy addresses that can be enabled with the \"addr-gen-mode\" property's "
 "\"stable-privacy\" setting as another way of avoiding host tracking with "
 "IPv6 addresses."
-msgstr ""
-"RFC4941 �説明�れ��るよ���SLAAC � IPv6 プライ�シー拡張を設定���。�れを有効��る��カー�ル��修正�れ� EUI-64 "
-"�より�MA アドレス�ら生���パブリックアドレス�加���IPv6 "
-"アドレスを一時的�生����。�れ�より�プライ�シー�強化�れ����アプリケーション�よ����題�発生�る場�も�り��。利用��る値��-1: "
-"�明�0: 無効�1: 有効 (パブリックアドレスを優先)�2: 有効 (一時アドレスを優先) ��り��。�接続�設定を \"-1\" (�明) "
-"��る��グロー�ル設定 \"ipv6.ip6-privacy\" �フォール�ック�れ��。���グロー�ル設定を指定�����\"-1\" "
-"�設定�る��\"/proc/sys/net/ipv6/conf/default/use_tempaddr\" "
-"�読�込��フォール�ック�れ��。��設定��IPv6 アドレス�ホスト�追跡を回��る別�方法��� \"addr-gen-mode\" "
-"プロパティー� \"stable-privacy\" 設定�有効���る�安定��プライ�シーアドレス��区別�れ��。"
+msgstr "RFC4941 �説明�れ��るよ���SLAAC � IPv6 プライ�シー拡張を設定���。�れを有効��る��カー�ル��修正�れ� EUI-64 �より�MA アドレス�ら生���パブリックアドレス�加���IPv6 アドレスを一時的�生����。�れ�より�プライ�シー�強化�れ����アプリケーション�よ����題�発生�る場�も�り��。利用��る値��-1: �明�0: 無効�1: 有効 (パブリックアドレスを優先)�2: 有効 (一時アドレスを優先) ��り��。�接続�設定を \"-1\" (�明) ��る��グロー�ル設定 \"ipv6.ip6-privacy\" �フォール�ック�れ��。���グロー�ル設定を指定�����\"-1\" �設定�る��\"/proc/sys/net/ipv6/conf/default/use_tempaddr\" �読�込��フォール�ック�れ��。��設定��IPv6 アドレス�ホスト�追跡を回��る別�方法��� \"addr-gen-mode\" プロパティー� \"stable-privacy\" 設定�有効���る�安定��プライ�シーアドレス��区別�れ��。"
 
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
-msgstr ""
-"IPv6 トークン化��インターフェース識別� draft-chown-6man-tokenised-ipv6-identifiers-02 "
-"�トークンを設定���。eui64 addr-gen-mode �行��便利��。"
+msgstr "IPv6 トークン化��インターフェース識別� draft-chown-6man-tokenised-ipv6-identifiers-02 �トークンを設定���。eui64 addr-gen-mode �行��便利��。"
 
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:251
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "転�トラフィック�暗�化�必�����。"
 
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr "MACsec キー一致���る共有�� CAK (接続関連キー)。"
 
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:253
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "\"mka-cak\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr "MACsec キー一致���る共有�� CKN (接続�関連�るキー�)。"
 
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:255
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr "MKA (MACsec キー一致) � CAK (接続関連キー) を�得�る方法を指定���。"
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:256
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"指定��場����� MACSEC インターフェースを作��る�親インターフェース����親接続� UUID "
-"を指定���。��プロパティー�指定�れ������接続���\"mac-address\" プロパティー�追加�れ� \"802-3-"
-"ethernet\" 設定を��る必���り��。"
+msgstr "指定��場����� MACSEC インターフェースを作��る�親インターフェース����親接続� UUID を指定���。��プロパティー�指定�れ������接続���\"mac-address\" プロパティー�追加�れ� \"802-3-ethernet\" 設定を��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr "SCI (セキュア�ャ�ル識別�) ��ートコン�ー�ント (1 - 65534)。"
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "Specifies whether the SCI (Secure Channel Identifier) is included in every "
 "packet."
 msgstr "パケット��� SCI (セキュア�ャ�ル識別�) ���れ��る����を指定���。"
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:259
 msgid "Specifies the validation mode for incoming frames."
 msgstr "入力フレーム�検証モードを指定���。"
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:260
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
 msgstr "��低�デ�イス��複数� macvlans 間�通信メカニズムを指定�る macvlan モード。"
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:261
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"指定��場����� MAC-VLAN インターフェースを作��る�親インターフェース����親接続� UUID "
-"を指定���。��プロパティーを指定���場���接続��\"mac-address\" プロパティー�追加�れ� \"802-3-ethernet\" "
-"設定を��る必���り��。"
+msgstr "指定��場����� MAC-VLAN インターフェースを作��る�親インターフェース����親接続� UUID を指定���。��プロパティーを指定���場���接続��\"mac-address\" プロパティー�追加�れ� \"802-3-ethernet\" 設定を��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:262
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "インターフェースをプロミスキャスモード��る������。"
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:263
 msgid "Whether the interface should be a MACVTAP."
 msgstr "インターフェース� MACVTAP ��������。"
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
-"A list of interface names to match. Each element is a shell wildcard pattern."
-"  When an element is prefixed with exclamation mark (!) the condition is "
-"inverted. A candidate interface name is considered matching when both these "
-"conditions are satisfied: (a) any of the elements not prefixed with '!' "
-"matches or there aren't such elements; (b) none of the elements prefixed "
-"with '!' match."
-msgstr ""
-"一致�るインターフェース��一覧。��素��シェルワイルドカードパターン��。感嘆符 (!) ��素�先頭�付���る場���件��転���。以下� "
-"(a) �よ� (b) ��件�両方�も満��れ��る場��候補�インターフェース��一致���る�考�られ��。(a) 感嘆符 (!) "
-"�先頭�付������素�一致�る������よ���素���場��(b) 感嘆符 (!) �先頭�付���る�素��れも一致���。"
+"A list of interface names to match. Each element is a shell wildcard "
+"pattern.  When an element is prefixed with exclamation mark (!) the "
+"condition is inverted. A candidate interface name is considered matching "
+"when both these conditions are satisfied: (a) any of the elements not "
+"prefixed with '!' matches or there aren't such elements; (b) none of the "
+"elements prefixed with '!' match."
+msgstr "一致�るインターフェース��一覧。��素��シェルワイルドカードパターン��。感嘆符 (!) ��素�先頭�付���る場���件��転���。以下� (a) �よ� (b) ��件�両方�も満��れ��る場��候補�インターフェース��一致���る�考�られ��。(a) 感嘆符 (!) �先頭�付������素�一致�る������よ���素���場��(b) 感嘆符 (!) �先頭�付���る�素��れも一致���。"
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:265
 msgid "The data path type. One of \"system\", \"netdev\" or empty."
 msgstr "データパス�種類。\"system\"�\"netdev\"����空���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:266
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr "ブリッジ�失敗モード。\"secure\"�\"standalone\"����空���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:267
 msgid "Enable or disable multicast snooping."
 msgstr "マル�キャスト�スヌーピングを有効化���無効化����。"
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:268
 msgid "Enable or disable RSTP."
 msgstr "RSTP を有効化���無効化����。"
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:269
 msgid "Enable or disable STP."
 msgstr "STP を有効化���無効化����。"
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.h.in:270
 msgid "Open vSwitch DPDK device arguments."
 msgstr "Open vSwitch DPDK デ�イス引数。"
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:271
 msgid ""
 "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
 "empty."
 msgstr "インターフェース�種類。\"internal\"� \"system\"�\"patch\"�\"dpdk\"����空���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:272
 msgid ""
 "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
 msgstr "接続�るリモート� Open vSwitch ブリッジ�ート�ユニキャスト宛先 IP アドレスを指定���。"
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:273
 msgid "The time port must be inactive in order to be considered down."
 msgstr "ダウン���見�������タイム�ートを�アクティブ��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:268
-msgid "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
+#: ../clients/common/settings-docs.h.in:274
+msgid ""
+"Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr "ボンディングモード。\"active-backup\"�\"balance-slb\"���� \"balance-tcp\" ���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:275
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr "トラフィック�転�を始�る���タイム�ートをアクティブ��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.h.in:276
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "LACP モード。\"active\"�\"off\"���� \"passive\" ���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:277
 msgid "The VLAN tag in the range 0-4095."
 msgstr "VLAN タグ�  0 - 4095 �範囲内��り��。"
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:278
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
-msgstr ""
-"VLAN モード。\"access\"�\"native-tagged\"�\"native-untagged\"�\"trunk\" "
-"���れ��設定�る��何も設定���ん。"
+msgstr "VLAN モード。\"access\"�\"native-tagged\"�\"native-untagged\"�\"trunk\" ���れ��設定�る��何も設定���ん。"
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:279
 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 the speed."
+"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 "
+"the speed."
 msgstr "ゼロ以外��pppd より指定��ボーレート�シリアル�ートを設定���。速度�自動的��択�れるよ���通常����値を 0 ����。"
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:280
 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 "
 "FALSE."
-msgstr ""
-"TRUE �場��pppd ��RTS シグナル�よ� CTS "
-"シグナルを使用����ードウェアフロー制御を使用�るシリアル�ートを設定�る必���り��。��値��通常� FALSE �設定�る必���り��。"
+msgstr "TRUE �場��pppd ��RTS シグナル�よ� CTS シグナルを使用����ードウェアフロー制御を使用�るシリアル�ートを設定�る必���り��。��値��通常� FALSE �設定�る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:281
 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 "
 "\"lcp-echo-interval\" property must also be set to a non-zero value if this "
 "property is used."
-msgstr ""
-"ゼロ以外��る��LCP echo-requests �指定��数値�ピア�応答���場��pppd "
-"��ピア��接続�失敗���推測���。��プロパティー�使用�れ��る場���\"lcp-echo-interval\" "
-"プロパティーもゼロ以外�値�設定�る必���り��。"
+msgstr "ゼロ以外��る��LCP echo-requests �指定��数値�ピア�応答���場��pppd ��ピア��接続�失敗���推測���。��プロパティー�使用�れ��る場���\"lcp-echo-interval\" プロパティーもゼロ以外�値�設定�る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:282
 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 "
 "will respond to echo requests and some will not, and it is not possible to "
 "autodetect this."
-msgstr ""
-"ゼロ以外��る��pppd ��n 秒���ピア� LCP echo-request フレームを�るよ���り�� (n �指定��値)。PPP "
-"ピア�一部���エコー�求�応答���。�れを自動検出�る�������ん。"
+msgstr "ゼロ以外��る��pppd ��n 秒���ピア� LCP echo-request フレームを�るよ���り�� (n �指定��値)。PPP ピア�一部���エコー�求�応答���。�れを自動検出�る�������ん。"
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:283
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr "TRUE �場���ステートフル MPPE �使用�れ��。ステートフル MPPE �詳細� pppd ドキュメントを�照������。"
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:284
 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 "
 "16384."
-msgstr ""
-"ゼロ以外��指定��サイズ以下�パケットをピア��信�るよ�� pppd ��求���。ゼロ以外���MRU � 128 �ら 16384 "
-"�間��る必���り��。"
+msgstr "ゼロ以外��指定��サイズ以下�パケットをピア��信�るよ�� pppd ��求���。ゼロ以外���MRU � 128 �ら 16384 �間��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:285
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
-""
 msgstr "ゼロ以外��pppd �より�指定��サイズ以下�パケット��信�れ��。"
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:286
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr "TRUE �場���Van Jacobsen TCP ヘッダー圧縮��求�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
-msgstr ""
-"TRUE �場���クライアント��証�る��相手� (通常� PPP サー�ー) ��求�れ��ん。FALSE "
-"�場���リモート��ら��証�必���り��。��ん�����場����れ� TRUE ��る必���り��。"
+msgstr "TRUE �場���クライアント��証�る��相手� (通常� PPP サー�ー) ��求�れ��ん。FALSE �場���リモート��ら��証�必���り��。��ん�����場����れ� TRUE ��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:288
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "TRUE �場���BSD 圧縮��求�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:289
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "TRUE �場���\"deflate\" 圧縮��求�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:290
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "TRUE �場���CHAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:291
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "TRUE �場���EAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:292
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "TRUE �場���MSCHAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:293
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "TRUE �場���MSCHAPv2 �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:294
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "TRUE �場���PAP �証方法�使用�れ��ん。"
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:295
 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 "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
-msgstr ""
-"TRUE �場���PPP セッション� MPPE (Microsoft �イントツー�イント暗�化) �必���り��。64 ビット��� 128 "
-"ビット���れ�� MPPE �利用�����る��セッション�失敗���。MPPE �モ�イルブロード�ンド接続�使用�れ��点�注�������。"
+msgstr "TRUE �場���PPP セッション� MPPE (Microsoft �イントツー�イント暗�化) �必���り��。64 ビット��� 128 ビット���れ�� MPPE �利用�����る��セッション�失敗���。MPPE �モ�イルブロード�ンド接続�使用�れ��点�注�������。"
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:296
 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 "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
-msgstr ""
-"TRUE �場���PPP セッション��128 ビット MPPE (Microsoft �イントツー�イント暗�化) "
-"�必���り��。���\"require-mppe\" プロパティーを TRUE �設定�る必���り��。128 ビット� MPPE "
-"�利用������セッション�失敗���。"
+msgstr "TRUE �場���PPP セッション��128 ビット MPPE (Microsoft �イントツー�イント暗�化) �必���り��。���\"require-mppe\" プロパティーを TRUE �設定�る必���り��。128 ビット� MPPE �利用������セッション�失敗���。"
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:297
 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 "
 "activated on the interface specified in \"interface-name\" of "
 "NMSettingConnection."
-msgstr ""
-"指定��場����� PPPoE "
-"接続�作��れる親インターフェース�を指定���。��プロパティーを指定�������接続��NMSettingConnection � "
-"\"interface-name\" �指定��インターフェース�接続�有効��り��。"
+msgstr "指定��場����� PPPoE 接続�作��れる親インターフェース�を指定���。��プロパティーを指定�������接続��NMSettingConnection � \"interface-name\" �指定��インターフェース�接続�有効��り��。"
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:298
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "PPPoE サービス���証�使用�るパスワード。"
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:300
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
 "should be left blank.  It is only required if there are multiple access "
 "concentrators or a specific service is known to be required."
-msgstr ""
-"指定�る��PPPoE "
-"��セッションを開始�る����指定��サービスを�供�るアクセス集線装置��を使用�るよ���り��。多��プロ�イダー�����設定を空白�����る必���り��。�れ��アクセス集線装置�複数�る場�や�特別�サービス�必���る���分����る場���り必���り��。"
+msgstr "指定�る��PPPoE ��セッションを開始�る����指定��サービスを�供�るアクセス集線装置��を使用�るよ���り��。多��プロ�イダー�����設定を空白�����る必���り��。�れ��アクセス集線装置�複数�る場�や�特別�サービス�必���る���分����る場���り必���り��。"
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:301
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "PPPoE サービス���証�使用�るユーザー�。"
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:302
 msgid "Whether the proxy configuration is for browser only."
 msgstr "プロキシー設定�ブラウザー専用��る����。"
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:303
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr "プロキシー設定�方法。デフォルト� NM_SETTING_PROXY_METHOD_NONE (0) ��。"
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:304
 msgid "PAC script for the connection."
 msgstr "接続� PAC スクリプト。"
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:305
 msgid "PAC URL for obtaining PAC file."
 msgstr "PAC ファイルを�得�る PAC URL"
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:306
 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 "
 "speed settings and use the highest available speed."
-msgstr ""
-"シリアル�ート��接続�使用�る速度。��値��通常�モ�イル�ブロード�ンドモデム��影響���ん。通常�速度設定を無視��利用�能�最高�速度を使用���。"
+msgstr "シリアル�ート��接続�使用�る速度。��値��通常�モ�イル�ブロード�ンドモデム��影響���ん。通常�速度設定を無視��利用�能�最高�速度を使用���。"
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:307
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "シリアル接続��イト幅。�����\"8n1\" � 8 ��。"
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:308
 msgid "Parity setting of the serial port."
 msgstr "シリアル�ート�パリティ設定。"
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:309
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr "モデム��信���イト間��延時間 (マイクロ秒��)。"
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:310
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
 msgstr "シリアル�ート�通信�る����止ビット�数。1 ��� 2 ���れ���り��。�����\"8n1\" � 1 ��。"
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:311
 msgid ""
 "Whether to autoprobe virtual functions by a compatible driver. If set to "
 "NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
@@ -8511,66 +7954,48 @@ msgid ""
 "interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
 "the global default is used; in case the global default is unspecified it is "
 "assumed to be NM_TERNARY_TRUE (1)."
-msgstr ""
-"互�性��るドライ�ー�よ��仮想関数を autoprobe �る����。NM_TERNARY_TRUE (1) �設定�れ��る場��カー�ル� "
-"VF を互�性��るドライ�ー��インド�よ�����れ��功��場��新���ットワークインターフェース�� VF "
-"�インスタンスを作����。NM_TERNARY_FALSE (0) �設定�れ��る場��VF ��求�れ��VF "
-"用��ットワークインターフェース�作��れ��ん。NM_TERNARY_DEFAULT (-1) "
-"�設定�れ��る場��グロー�ルデフォルト�使用�れ��。グロー�ルデフォルト�指定�れ����場���NM_TERNARY_TRUE (1) "
-"�設定�れ��る�推測�れ��。"
+msgstr "互�性��るドライ�ー�よ��仮想関数を autoprobe �る����。NM_TERNARY_TRUE (1) �設定�れ��る場��カー�ル� VF を互�性��るドライ�ー��インド�よ�����れ��功��場��新���ットワークインターフェース�� VF �インスタンスを作����。NM_TERNARY_FALSE (0) �設定�れ��る場��VF ��求�れ��VF 用��ットワークインターフェース�作��れ��ん。NM_TERNARY_DEFAULT (-1) �設定�れ��る場��グロー�ルデフォルト�使用�れ��。グロー�ルデフォルト�指定�れ����場���NM_TERNARY_TRUE (1) �設定�れ��る�推測�れ��。"
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:312
 msgid ""
 "The total number of virtual functions to create. Note that when the sriov "
 "setting is present NetworkManager enforces the number of virtual functions "
 "on the interface also when it is zero. To prevent any changes to SR-IOV "
 "parameters don't add a sriov setting to the connection."
-msgstr ""
-"作��る仮想関数��数。sriov 設定�有効�場��NetworkManager "
-"�インターフェース上�仮想関数�数を強化��ゼロ�場�も�様��る点�注�������。SR-IOV パラメーター��変更を阻止�る���sriov "
-"設定を接続�追加��������。"
+msgstr "作��る仮想関数��数。sriov 設定�有効�場��NetworkManager �インターフェース上�仮想関数�数を強化��ゼロ�場�も�様��る点�注�������。SR-IOV パラメーター��変更を阻止�る���sriov 設定を接続�追加��������。"
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:313
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-"for each VF. When represented as string a VF is in the form: \"INDEX [ATTR="
-"VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check="
-"true\". Multiple VFs can be specified using a comma as separator. Currently "
-"the following attributes are supported: mac, spoof-check, trust, min-tx-"
-"rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
+"for each VF. When represented as string a VF is in the form: \"INDEX "
+"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
+"check=true\". Multiple VFs can be specified using a comma as separator. "
+"Currently the following attributes are supported: mac, spoof-check, trust, "
+"min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
 "semicolon-separated list of VLAN descriptors, where each descriptor has the "
 "form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the "
 "default) or 'ad' for 802.1ad."
-msgstr ""
-"仮想関数記述���列。� VF 記述���GVariant 値�対�る辞書マッピング属性���。� VF ���� 'index' "
-"エントリー�必須��。文字列�表�場��VF �形�� \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\" "
-"��り��。�����\"2 mac=00:11:22:33:44:55 spoof-check=true\" ����。複数� VF "
-"��コンマをセパレーター���使用�る���指定����。�在サ�ート�れ��る属性��mac�spoof-check�trust�min-tx-"
-"rate�max-tx-rate��よ� vlans ��。\"vlans\" 属性��VLAN 記述�� semicolon-separated "
-"一覧���表�れ��。������記述��形�� \"ID[.PRIORITY[.PROTO]]\" ��り��。PROTO � 'q' (802."
-"1Q�デフォルト) ��� 'ad' (802.1ad) ���れ���り��。"
+msgstr "仮想関数記述���列。� VF 記述���GVariant 値�対�る辞書マッピング属性���。� VF ���� 'index' エントリー�必須��。文字列�表�場��VF �形�� \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\" ��り��。�����\"2 mac=00:11:22:33:44:55 spoof-check=true\" ����。複数� VF ��コンマをセパレーター���使用�る���指定����。�在サ�ート�れ��る属性��mac�spoof-check�trust�min-tx-rate�max-tx-rate��よ� vlans ��。\"vlans\" 属性��VLAN 記述�� semicolon-separated 一覧���表�れ��。������記述��形�� \"ID[.PRIORITY[.PROTO]]\" ��り��。PROTO � 'q' (802.1Q�デフォルト) ��� 'ad' (802.1ad) ���れ���り��。"
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:314
 msgid "Array of TC queueing disciplines."
 msgstr "TC キュー処���列"
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:315
 msgid "Array of TC traffic filters."
 msgstr "TC トラフィックフィルター��列"
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:316
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
 "passed directly to teamd. If not specified, the default configuration is "
 "used.  See man teamd.conf for the format details."
-msgstr ""
-"�ーム�ットワークインターフェース� JSON 設定。プロパティー���teamd ��切�生� JSON 設定データを�む必���り��。値を "
-"teamd �直接渡�����。指定�����デフォルト�設定�使用�れ��。フォーマット�詳細��man teamd.conf を�照������。"
+msgstr "�ーム�ットワークインターフェース� JSON 設定。プロパティー���teamd ��切�生� JSON 設定データを�む必���り��。値を teamd �直接渡�����。指定�����デフォルト�設定�使用�れ��。フォーマット�詳細��man teamd.conf を�照������。"
 
-#: ../clients/common/settings-docs.h.in:311
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:335
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8580,171 +8005,150 @@ msgid ""
 "max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', "
 "'validate-active', 'validate-inactive', '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-inactive'�'send-always'。詳細� teamd.conf � man ページを�照������。"
+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-inactive'�'send-always'。詳細� teamd.conf � man ページを�照������。"
 
-#: ../clients/common/settings-docs.h.in:312
+#: ../clients/common/settings-docs.h.in:318
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "teamd mcast_rejoin.count �相当���。"
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:319
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "teamd mcast_rejoin.interval �相当���。"
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:320
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "teamd notify_peers.count �相当���。"
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:321
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "teamd notify_peers.interval �相当���。"
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:322
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
 "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
-msgstr ""
-"teamd runner.name �相当���。�能�値: "
-"\"roundrobin\"�\"broadcast\"�\"activebackup\"�\"loadbalance\"�\"lacp\"�\"random\"。"
+msgstr "teamd runner.name �相当���。�能�値: \"roundrobin\"�\"broadcast\"�\"activebackup\"�\"loadbalance\"�\"lacp\"�\"random\"。"
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:323
 msgid "Corresponds to the teamd runner.active."
 msgstr "teamd runner.active �相当���。"
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:324
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "teamd runner.agg_select_policy �相当���"
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:325
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "teamd runner.fast_rate �相当���。"
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:326
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "teamd runner.hwaddr_policy �相当���。"
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "teamd runner.min_ports �相当���。"
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.h.in:328
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "teamd runner.sys_prio �相当���。"
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "teamd runner.tx_balancer.name �相当���。"
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "teamd runner.tx_balancer.interval �相当���。"
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:331
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "teamd runner.tx_hash �相当���。"
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:332
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
 "directly to teamd. If not specified, the default configuration is used. See "
 "man teamd.conf for the format details."
-msgstr ""
-"�ーム�ート� JSON 設定。プロパティー���teamd ����生� JSON 設定データを��る必���り��。値� teamd "
-"�直接渡�れる����。指定���場���デフォルト設定�使用�れ��。フォーマット�詳細��man teamd.conf を�照������。"
+msgstr "�ーム�ート� JSON 設定。プロパティー���teamd ����生� JSON 設定データを��る必���り��。値� teamd �直接渡�れる����。指定���場���デフォルト設定�使用�れ��。フォーマット�詳細��man teamd.conf を�照������。"
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "teamd ports.PORTIFNAME.lacp_key �相当���。"
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "teamd ports.PORTIFNAME.lacp_prio �相当���。"
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "teamd ports.PORTIFNAME.prio �相当���。"
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:337
 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 設定�無視�れ��。"
+msgstr "teamd ports.PORTIFNAME.queue_id �相当���。-1 �設定�る����パラメーター� json 設定�無視�れ��。"
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "teamd ports.PORTIFNAME.sticky �相当���。"
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:339
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr "デ�イスを所有�るグループ ID。NULL を設定�る��誰�も��デ�イスを使用��るよ���り��。"
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:340
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
-msgstr ""
-"仮想デ�イス�オペレーティングモード。利用��る値��レイヤー 3 デ�イスを作��る NM_SETTING_TUN_MODE_TUN (1) "
-"��Ethernet �よ��レイヤー 2 デ�イスを作��る NM_SETTING_TUN_MODE_TAP (2) ��。"
+msgstr "仮想デ�イス�オペレーティングモード。利用��る値��レイヤー 3 デ�イスを作��る NM_SETTING_TUN_MODE_TUN (1) ��Ethernet �よ��レイヤー 2 デ�イスを作��る NM_SETTING_TUN_MODE_TAP (2) ��。"
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
-msgstr ""
-"プロパティーを TRUE �設定�る��インターフェース�複数�ファイルディスクリプター (キュー) "
-"を使用���パケット���信を並行��処����。TRUE �設定�����インターフェース� 1 ��キュー��サ�ート���ん。"
+msgstr "プロパティーを TRUE �設定�る��インターフェース�複数�ファイルディスクリプター (キュー) を使用���パケット���信を並行��処����。TRUE �設定�����インターフェース� 1 ��キュー��サ�ート���ん。"
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:342
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr "デ�イスを所有�るユーザー ID。NULL を設定�る��誰�も��デ�イスを使用��るよ���り��。"
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:343
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
 msgstr "TRUE �場��インターフェース��パケット�先頭��物�インターフェースを接続�る 4 �イト�ヘッダーを追加���。"
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:344
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
 msgstr "IFF_VNET_HDR を TRUE ��る��トン�ルパケット���virtio �ットワークヘッダー���れ��。"
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:345
 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 "
 "support a strict ascii format, but the values can be arbitrary UTF8 strings "
 "up to a certain length."
-msgstr ""
-"ユーザーデータ��キー�値�ペア�ディクショナリー。��データ� NetworkManager "
-"�無視�れ�ユーザー�判断�使用����。��キー��厳密� ascii フォーマット��をサ�ート�����値��指定��長����任�� UTF8 "
-"文字列�����。"
+msgstr "ユーザーデータ��キー�値�ペア�ディクショナリー。��データ� NetworkManager �無視�れ�ユーザー�判断�使用����。��キー��厳密� ascii フォーマット��をサ�ート�����値��指定��長����任�� UTF8 文字列�����。"
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:346
 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\" and \"to\" are unsigned integers, ie \"7:3\"."
-msgstr ""
-"出力パケット�場��Linux SKB 優先度�ら 802.1p 優先度��マッピング�一覧。��マッピング��\"from:to\" "
-"�形��指定��\"from\" � \"to\" ��\"7:3\" ���署���整数����。"
+"priorities.  The mapping is given in the format \"from:to\" where both \"from"
+"\" and \"to\" are unsigned integers, ie \"7:3\"."
+msgstr "出力パケット�場��Linux SKB 優先度�ら 802.1p 優先度��マッピング�一覧。��マッピング��\"from:to\" �形��指定��\"from\" � \"to\" ��\"7:3\" ���署���整数����。"
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:347
 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 "
@@ -8755,85 +8159,63 @@ msgid ""
 "NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward "
 "compatibility, the default-value in the D-Bus API continues to be 0 and a "
 "missing property on D-Bus is still considered as 0."
-msgstr ""
-"VLAN インターフェース�動作�機能を制御�る 1 �以上�フラグ。NM_VLAN_FLAG_REORDER_HEADERS (0x1) "
-"(出力�パケットヘッダー�順�を変更)�NM_VLAN_FLAG_GVRP (0x2) (GVRP "
-"プロトコルを使用)�NM_VLAN_FLAG_LOOSE_BINDING (0x4) "
-"(マスターデ�イス�動作状態��インターフェース�ルーズ�インディング)�NM_VLAN_FLAG_MVRP (0x8) (MVRP プロトコル�使用) "
-"����り��。��プロパティー�デフォルト値� NM_VLAN_FLAG_REORDER_HEADERS ����以�� 0 "
-"���。後方互�性を確��る�� D-Bus API �デフォルト値を 0 ������D-Bus ���る�明�プロパティー�引�続� 0 "
-"�見��れ��。"
+msgstr "VLAN インターフェース�動作�機能を制御�る 1 �以上�フラグ。NM_VLAN_FLAG_REORDER_HEADERS (0x1) (出力�パケットヘッダー�順�を変更)�NM_VLAN_FLAG_GVRP (0x2) (GVRP プロトコルを使用)�NM_VLAN_FLAG_LOOSE_BINDING (0x4) (マスターデ�イス�動作状態��インターフェース�ルーズ�インディング)�NM_VLAN_FLAG_MVRP (0x8) (MVRP プロトコル�使用) ����り��。��プロパティー�デフォルト値� NM_VLAN_FLAG_REORDER_HEADERS ����以�� 0 ���。後方互�性を確��る�� D-Bus API �デフォルト値を 0 ������D-Bus ���る�明�プロパティー�引�続� 0 �見��れ��。"
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:348
 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."
-msgstr ""
-"��接続�作��るインターフェースを割り当�る必���る VLAN 識別�。有効�範囲� 0 - 4094 ��り�予約�れ��る id 4095 "
-"�除外�れ��。"
+msgstr "��接続�作��るインターフェースを割り当�る必���る VLAN 識別�。有効�範囲� 0 - 4094 ��り�予約�れ��る id 4095 �除外�れ��。"
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:349
 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\" and \"to\" are unsigned integers, ie \"7:3\"."
-msgstr ""
-"入力パケット�場���802.1p 優先度�ら Linux SKB 優先度��マッピング一覧。��マッピング��\"from:to\" "
-"�形��指定��\"from\" � \"to\" ��\"7:3\" ���署���整数����。"
+"priorities.  The mapping is given in the format \"from:to\" where both \"from"
+"\" and \"to\" are unsigned integers, ie \"7:3\"."
+msgstr "入力パケット�場���802.1p 優先度�ら Linux SKB 優先度��マッピング一覧。��マッピング��\"from:to\" �形��指定��\"from\" � \"to\" ��\"7:3\" ���署���整数����。"
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:350
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"指定��場����� VLAN インターフェースを作��る�親インターフェース����親接続� UUID "
-"を指定���。��プロパティーを指定���場���接続��\"mac-address\" プロパティー�指定�れ��る \"802-3-"
-"ethernet\" 設定を��る必���り��。"
+msgstr "指定��場����� VLAN インターフェースを作��る�親インターフェース����親接続� UUID を指定���。��プロパティーを指定���場���接続��\"mac-address\" プロパティー�指定�れ��る \"802-3-ethernet\" 設定を��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
 msgstr "VPN プラグイン特有�データ���るキー�値�ペア����ディクショナリー。キー�値�両方を文字列��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:352
 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 "
 "explicitly disconnected."
-msgstr ""
-"VPN サービス��続性をサ�ート�る����プロパティー� TRUE ��り��。VPN "
-"��明示的�切断�れる���リンク�変更�れ��止��も接続�れ�����り��。"
+msgstr "VPN サービス��続性をサ�ート�る����プロパティー� TRUE ��り��。VPN ��明示的�切断�れる���リンク�変更�れ��止��も接続�れ�����り��。"
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
-msgstr ""
-"パスワードや秘密����VPN プラグイン特有�シークレット�関�るキー�値�ペア�ディクショナリー。キー�値��も�文字列��る必���り��。"
+msgstr "パスワードや秘密����VPN プラグイン特有�シークレット�関�るキー�値�ペア�ディクショナリー。キー�値��も�文字列��る必���り��。"
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:354
 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."
-msgstr ""
-"��設定��ットワーク�接続�る��使用�る VPN プラグイン� D-Bus サービス�。vpnc プラグイン�場�� org.freedesktop."
-"NetworkManager.vpnc ��。"
+msgstr "��設定��ットワーク�接続�る��使用�る VPN プラグイン� D-Bus サービス�。vpnc プラグイン�場�� org.freedesktop.NetworkManager.vpnc ��。"
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:355
 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 "
 "is 60 seconds (unless overridden by vpn.timeout in configuration file). "
 "Values greater than zero mean timeout in seconds."
-msgstr ""
-"VPN �接続確立�関�るタイムアウト。一部�サービス��接続�時間���る場���り��。値を 0 ��る��デフォルト�タイムアウト� 60 "
-"秒��り�� (設定ファイル� vpn.timeout を上書������場�)。ゼロ以外�値を設定��場����れ�タイムアウト (秒��) "
-"��り��。"
+msgstr "VPN �接続確立�関�るタイムアウト。一部�サービス��接続�時間���る場���り��。値を 0 ��る��デフォルト�タイムアウト� 60 秒��り�� (設定ファイル� vpn.timeout を上書������場�)。ゼロ以外�値を設定��場����れ�タイムアウト (秒��) ��り��。"
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:356
 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 "
@@ -8841,146 +8223,131 @@ msgid ""
 "this property empty.  If this property is empty, NetworkManager will "
 "automatically supply the username of the user which requested the VPN "
 "connection."
-msgstr ""
-"VPN 接続���証�ユーザー��必���る場�������供�る必���り��。��接続�複数�ユーザー�利用���VPN "
-"��ユーザー���を�供�る必���る場�����プロパティーを空���������。��プロパティーを空��る��NetworkManager "
-"��VPN 接続を�求�るユーザー�ユーザー�を自動的��供���。"
+msgstr "VPN 接続���証�ユーザー��必���る場�������供�る必���り��。��接続�複数�ユーザー�利用���VPN ��ユーザー���を�供�る必���る場�����プロパティーを空���������。��プロパティーを空��る��NetworkManager ��VPN 接続を�求�るユーザー�ユーザー�を自動的��供���。"
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:357
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "カー�ル�学習�る FDB エントリー�存続時間 (秒��) を指定���。"
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
 msgstr "リモート� VXLAN トン�ルエンド�イント�接続�る UDP 宛先�ートを指定���。"
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr "使用�る VXLAN �ットワーク識別� (��� VXLAN セグメント識別�) を指定���。"
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:360
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "�ットリンク LL ADDR �欠����る通知�生��れる����を指定���。"
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:361
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "�ットリンク IP ADDR �欠����る通知�生��れる����を指定���。"
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
 msgstr "未知�ソースリンクレイヤー�アドレス� IP アドレスを�VXLAN デ�イス転�データベース�入力�る����を指定���。"
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
 msgstr "FDB エントリー�最大数を指定���。値�ゼロ�場���カー�ル�エントリーを無���存�る��を�味���。"
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:364
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr "指定��場����信パケット�使用�るソース� IP アドレスを指定���。"
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr "指定��場���親インターフェース����親接続� UUID を指定���。"
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:366
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "ARP プロキシーをオン��る����を指定���"
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:367
 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 "
 "forwarding database, or the multicast IP address to join."
-msgstr ""
-"宛先リンクレイヤーアドレス� VXLAN デ�イス転�データベース���場���出力パケット�使用�るユニキャスト�宛先 IP "
-"アドレス�����加�るマル�キャスト IP アドレスを指定���。"
+msgstr "宛先リンクレイヤーアドレス� VXLAN デ�イス転�データベース���場���出力パケット�使用�るユニキャスト�宛先 IP アドレス�����加�るマル�キャスト IP アドレスを指定���。"
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:368
 msgid "Specifies whether route short circuit is turned on."
 msgstr "ルート�ショートサーキット�オン�����る����を指定���。"
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr "リモート VXLAN �トン�ルエンド�イント�接続�る最大 UDP ソース�ートを指定���。"
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr "リモート� VXLAN トン�ルエンド�イント�接続�る���最� UDP ソース�ートを指定���。"
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "�信パケット�使用�る TOS 値を指定���。"
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:372
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr "�信パケット�使用�る生存時間�値を使用���。"
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "The P2P device that should be connected to. Currently this is the only way "
 "to create or join a group."
 msgstr "接続�れ��れ��ら�� P2P デ�イス。�れ���時点�グループを作����グループ��加�る唯一�方法��。"
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:374
 msgid ""
 "The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display "
 "requires a protocol specific information element to be set in certain Wi-Fi "
 "frames. These can be specified here for the purpose of establishing a "
 "connection. This setting is only useful when implementing a Wi-Fi Display "
 "client."
-msgstr ""
-"Wi-Fi Display (WFD) Information Elements (IEs) �設定。Wi-Fi Display ��特定� Wi-Fi "
-"フレーム�プロトコル指定�情報エレメントを設定�る必���り��。�れら��接続を確立�る目的����指定����。��設定��Wi-Fi "
-"Display クライアントを実装�る場����役立���。 "
+msgstr "Wi-Fi Display (WFD) Information Elements (IEs) �設定。Wi-Fi Display ��特定� Wi-Fi フレーム�プロトコル指定�情報エレメントを設定�る必���り��。�れら��接続を確立�る目的����指定����。��設定��Wi-Fi Display クライアントを実装�る場����役立���。"
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "Flags indicating which mode of WPS is to be used. There's little point in "
 "changing the default setting as NetworkManager will automatically determine "
 "the best method to use."
-msgstr ""
-"WPS �モード�使用�れる場�����モード�使用�れる�を示�フラグ。NetworkManager  "
-"�最��メソッド�使用を自動的�決定�る���デフォルト設定を変更�る利点���ん��り��ん。"
+msgstr "WPS �モード�使用�れる場�����モード�使用�れる�を示�フラグ。NetworkManager  �最��メソッド�使用を自動的�決定�る���デフォルト設定を変更�る利点���ん��り��ん。"
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:376
 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 "
 "(known as MAC spoofing). Deprecated: 1"
-msgstr ""
-"指定�る����接続� MAC アドレス�一致�る WiMAX デ�イス����用�れ��。��プロパティー�デ�イス� MAC アドレスを変更���ん "
-"(MAC スプーフィング���知られ����)。�推奨: 1"
+msgstr "指定�る����接続� MAC アドレス�一致�る WiMAX デ�イス����用�れ��。��プロパティー�デ�イス� MAC アドレスを変更���ん (MAC スプーフィング���知られ����)。�推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:377
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
 msgstr "��接続�使用�る WiMAX �ットワーク��ットワークサービスプロ�イダー (NSP) �。�推奨: 1"
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:378
 msgid ""
 "The use of fwmark is optional and is by default off. Setting it to 0 "
 "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
 "\"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to "
 "automatically choose a fwmark."
-msgstr ""
-"fwmark �使用�オプション��デフォルト�オフ�設定�れ����。�れを 0 �設定�る��無効化�れ��。無効化�れ��れ��出力パケット�� "
-"32 ビット� fwmark ��。\"ip4-auto-default-route\" ��� \"ip6-auto-default-route\" "
-"�有効化�れ��る場���自動的� fwmark ��択�れる��を�味�る点�注�������。"
+msgstr "fwmark �使用�オプション��デフォルト�オフ�設定�れ����。�れを 0 �設定�る��無効化�れ��。無効化�れ��れ��出力パケット�� 32 ビット� fwmark ��。\"ip4-auto-default-route\" ��� \"ip6-auto-default-route\" �有効化�れ��る場���自動的� fwmark ��択�れる��を�味�る点�注�������。"
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Whether to enable special handling of the IPv4 default route. If enabled, "
 "the IPv4 default route will be placed to a dedicated routing-table and two "
@@ -8990,3645 +8357,3655 @@ msgid ""
 "Table=auto. Leaving this at the default will enable this option "
 "automatically if ipv4.never-default is not set and there are any peers that "
 "use a default-route as allowed-ips."
-msgstr ""
-"IPv4 デフォルトルート�特別処�を有効化�る����。有効化�れ�場��IPv4 デフォルトルート�専用�ルーティングテーブル�置�れ�2 "
-"���リシールーティングルール�追加�れ��。fwmark 番��デフォルトルート�ルーティングテーブル���も使用�れ�fwmark "
-"�ゼロ�場��未使用� fwmark/table �自動的��択�れ��。�れ��wg-quick � Table=auto "
-"�行���る���対応�����。ipv4.never-default �設定�れ��ら��デフォルトルートを allowed-ips "
-"���使用�るピア��る場���れをデフォルト������������オプション�自動的�有効化�れ��。"
+msgstr "IPv4 デフォルトルート�特別処�を有効化�る����。有効化�れ�場��IPv4 デフォルトルート�専用�ルーティングテーブル�置�れ�2 ���リシールーティングルール�追加�れ��。fwmark 番��デフォルトルート�ルーティングテーブル���も使用�れ�fwmark �ゼロ�場��未使用� fwmark/table �自動的��択�れ��。�れ��wg-quick � Table=auto �行���る���対応�����。ipv4.never-default �設定�れ��ら��デフォルトルートを allowed-ips ���使用�るピア��る場���れをデフォルト������������オプション�自動的�有効化�れ��。"
 
-#: ../clients/common/settings-docs.h.in:374
+#: ../clients/common/settings-docs.h.in:380
 msgid "Like ip4-auto-default-route, but for the IPv6 default route."
 msgstr "ip4-auto-default-route ������IPv6 デフォルトルート��。"
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.h.in:381
 msgid ""
 "The listen-port. If listen-port is not specified, the port will be chosen "
 "randomly when the interface comes up."
-msgstr ""
-"listen-port ��。listen-port �指定�れ����場��インターフェースを起動��際��ート�ランダム��択�れ��。"
+msgstr "listen-port ��。listen-port �指定�れ����場��インターフェースを起動��際��ート�ランダム��択�れ��。"
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:382
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments. If zero a default MTU is "
 "used. Note that contrary to wg-quick's MTU setting, this does not take into "
 "account the current routes at the time of activation."
-msgstr ""
-"ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定より大��パケット��複数�フラグメント�分割�れ��。ゼロ�場���デフォルト� "
-"MTU を使用���。wg-quick � MTU 設定��対照的���れ�アクティベーション時��行�ルート����考慮���点�注�������。"
+msgstr "ゼロ以外��指定��サイズ以下�パケット����信�れ��。指定より大��パケット��複数�フラグメント�分割�れ��。ゼロ�場���デフォルト� MTU を使用���。wg-quick � MTU 設定��対照的���れ�アクティベーション時��行�ルート����考慮���点�注�������。"
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:383
 msgid ""
 "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
 "If TRUE (the default), NetworkManager will automatically add routes in the "
 "routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
 "no such routes are added automatically. In this case, the user may want to "
 "configure static routes in ipv4.routes and ipv6.routes, respectively."
-msgstr ""
-"ピア� AllowedIPs 範囲�ルートを自動的�追加�る����。TRUE (デフォルト) �場��NetworkManager � ipv4."
-"route-table �よ� ipv6.route-table �従���ルーティングテーブル�ルートを自動的�追加���。FALSE "
-"�場����よ��ルート�自動的�追加�れ��ん。��場��ユーザー� ipv4.routes �よ� ipv6.routes "
-"��れ�れ��的ルートを設定�る��を�������。"
+msgstr "ピア� AllowedIPs 範囲�ルートを自動的�追加�る����。TRUE (デフォルト) �場��NetworkManager � ipv4.route-table �よ� ipv6.route-table �従���ルーティングテーブル�ルートを自動的�追加���。FALSE �場����よ��ルート�自動的�追加�れ��ん。��場��ユーザー� ipv4.routes �よ� ipv6.routes ��れ�れ��的ルートを設定�る��を�������。"
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.h.in:384
 msgid "The 256 bit private-key in base64 encoding."
 msgstr "base64 エンコード���る 256 ビット�プライベートキー。"
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:385
 msgid "Flags indicating how to handle the \"private-key\" property."
 msgstr "\"private-key\" プロパティー�処�方法を示�フラグ。"
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.h.in:386
 msgid ""
 "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
 "whatever the device is already set to\"."
-msgstr ""
-"IEEE 802.15.4 �ャン�ル。正�整数��� -1 ��\"���デ�イス�設定�れ��るも�を設定��り使用��り���ん\" "
-"を�味���。"
+msgstr "IEEE 802.15.4 �ャン�ル。正�整数��� -1 ��\"���デ�イス�設定�れ��るも�を設定��り使用��り���ん\" を�味���。"
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
-msgstr ""
-"指定�る����接続�永続的� MAC アドレス�一致�る IEEE 802.15.4 (WPAN) MAC 層デ�イス����用�れ��。"
+msgstr "指定�る����接続�永続的� MAC アドレス�一致�る IEEE 802.15.4 (WPAN) MAC 層デ�イス����用�れ��。"
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:388
 msgid ""
 "IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, "
 "use whatever the device is already set to\"."
-msgstr ""
-"IEEE 802.15.4 ��ャン�ルページ。正�整数��� -1 ��\"���デ�イス�設定�れ��るも�を設定��り使用��り���ん\" "
-"を�味���。"
+msgstr "IEEE 802.15.4 ��ャン�ルページ。正�整数��� -1 ��\"���デ�イス�設定�れ��るも�を設定��り使用��り���ん\" を�味���。"
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.h.in:389
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "IEEE 802.15.4 パーソナルエリア�ットワーク (PAN) 識別�。"
 
-#: ../clients/common/settings-docs.h.in:384
-msgid ""
-"Short IEEE 802.15.4 address to be used within a restricted environment."
+#: ../clients/common/settings-docs.h.in:390
+msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
 msgstr "�定環境内��使用�れる IEEE 802.15.4 �ショートアドレス"
 
-#: ../clients/nm-online.c:89
+#: ../clients/nm-online.c:75
 msgid "Connecting"
 msgstr "接続中"
 
-#: ../clients/nm-online.c:205
+#: ../clients/nm-online.c:191
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr "エラー: NMClient オブジェクト�作��タイムアウト\n"
 
-#: ../clients/nm-online.c:225
+#: ../clients/nm-online.c:211
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "エラー: NMClient オブジェクトを作�����ん���: %s\n"
 
-#: ../clients/nm-online.c:251
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
 msgstr "出力を抑制�る"
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "接続�代�り� NetworkManager �起動を待機���"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:239
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
 msgstr "接続を待機�る時間を秒���指定�る (オプション���場��デフォルト値� 30)"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:240
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "NetworkManager �実行中���接続中���場��直��終了���"
 
-#: ../clients/nm-online.c:274
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr "NetworkManager �より�スタートアップ�ットワーク接続�アクティベート�完了�れる�を待機���。"
 
-#: ../clients/nm-online.c:281 ../clients/nm-online.c:287
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr "無効�オプション��。--help を使用��有効�オプション�一覧を確�������。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:175 ../clients/tui/nmt-editor.c:432
-#: ../clients/tui/nmt-password-dialog.c:173
-#: ../clients/tui/nmt-route-editor.c:121 ../clients/tui/nmtui-hostname.c:68
-#: ../clients/tui/nmtui.c:133
+#: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
+#: ../clients/tui/nmt-password-dialog.c:161
+#: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
+#: ../clients/tui/nmtui.c:121
 msgid "OK"
 msgstr "OK"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:323
-#: ../clients/tui/newt/nmt-newt-utils.c:355
+#: ../clients/tui/newt/nmt-newt-utils.c:311
+#: ../clients/tui/newt/nmt-newt-utils.c:343
 #, c-format
 msgid "Could not create temporary file: %s"
 msgstr "一時ファイルを作�����ん���: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:361
+#: ../clients/tui/newt/nmt-newt-utils.c:349
 #, c-format
 msgid "Editor failed: %s"
 msgstr "エディタ�失敗����: %s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:367
+#: ../clients/tui/newt/nmt-newt-utils.c:355
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "ファイル��読�込������ん���: %s"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm/nm-device.c:1379
+#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/tui/nm-editor-utils.c:156
+#: ../clients/tui/nm-editor-utils.c:144
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:160 ../libnm/nm-device.c:1381
+#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/tui/nm-editor-utils.c:164
+#: ../clients/tui/nm-editor-utils.c:152
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:169 ../libnm-core/nm-connection.c:2742
-#: ../libnm/nm-device.c:1397
+#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
+#: ../libnm/nm-device.c:1473
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:173
+#: ../clients/tui/nm-editor-utils.c:161
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:178 ../libnm/nm-device.c:1395
+#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
 msgid "Mobile Broadband"
 msgstr "モ�イルブロード�ンド"
 
-#: ../clients/tui/nm-editor-utils.c:181
+#: ../clients/tui/nm-editor-utils.c:169
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "モ�イルブロード�ンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:187 ../clients/tui/nmt-page-dsl.c:61
+#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:191
+#: ../clients/tui/nm-editor-utils.c:179
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:196 ../libnm-core/nm-connection.c:2734
-#: ../libnm/nm-device.c:1399
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4935
+#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
+#: ../libnm/nm-device.c:1475
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
 msgid "Bond"
 msgstr "ボンド"
 
-#: ../clients/tui/nm-editor-utils.c:200
+#: ../clients/tui/nm-editor-utils.c:188
 #, c-format
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:205 ../libnm-core/nm-connection.c:2738
-#: ../libnm/nm-device.c:1403
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5290
+#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
+#: ../libnm/nm-device.c:1479
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
 msgid "Bridge"
 msgstr "ブリッジ"
 
-#: ../clients/tui/nm-editor-utils.c:210
+#: ../clients/tui/nm-editor-utils.c:198
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:214 ../libnm-core/nm-connection.c:2736
-#: ../libnm/nm-device.c:1401
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5008
+#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
+#: ../libnm/nm-device.c:1477
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
 msgid "Team"
-msgstr "team "
+msgstr "team"
 
-#: ../clients/tui/nm-editor-utils.c:219
+#: ../clients/tui/nm-editor-utils.c:207
 #, c-format
 msgid "Team connection %d"
 msgstr "team 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-vlan.c:81
-#: ../libnm-core/nm-connection.c:2740 ../libnm/nm-device.c:1405
+#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
+#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:227
+#: ../clients/tui/nm-editor-utils.c:215
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:231 ../clients/tui/nmt-page-ip-tunnel.c:135
+#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
 msgid "IP tunnel"
 msgstr "IP トン�ル"
 
-#: ../clients/tui/nm-editor-utils.c:235
+#: ../clients/tui/nm-editor-utils.c:223
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP トン�ル接続 %d"
 
-#: ../clients/tui/nm-editor-utils.c:250
+#: ../clients/tui/nm-editor-utils.c:238
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 接続 %d"
 
-#: ../clients/tui/nmt-device-entry.c:367
+#: ../clients/tui/nmt-device-entry.c:355
 msgid "Select..."
 msgstr "�択..."
 
-#: ../clients/tui/nmt-edit-connection-list.c:109
+#: ../clients/tui/nmt-edit-connection-list.c:97
 msgid "Add"
 msgstr "追加"
 
-#: ../clients/tui/nmt-edit-connection-list.c:112
-#: ../clients/tui/nmt-page-ip4.c:168 ../clients/tui/nmt-page-ip6.c:167
-#: ../clients/tui/nmt-page-team-port.c:108 ../clients/tui/nmt-page-team.c:172
+#: ../clients/tui/nmt-edit-connection-list.c:100
+#: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:155
+#: ../clients/tui/nmt-page-team-port.c:96 ../clients/tui/nmt-page-team.c:160
 msgid "Edit..."
 msgstr "編集..."
 
-#: ../clients/tui/nmt-edit-connection-list.c:115
-#: ../clients/tui/nmtui-edit.c:528
+#: ../clients/tui/nmt-edit-connection-list.c:103
+#: ../clients/tui/nmtui-edit.c:516
 msgid "Delete"
 msgstr "削除"
 
-#: ../clients/tui/nmt-editor-section.c:102
+#: ../clients/tui/nmt-editor-section.c:90
 msgid "Hide"
 msgstr "隠�"
 
-#: ../clients/tui/nmt-editor-section.c:102
+#: ../clients/tui/nmt-editor-section.c:90
 msgid "Show"
 msgstr "表示�る"
 
-#: ../clients/tui/nmt-editor.c:99
+#: ../clients/tui/nmt-editor.c:87
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
 msgstr "接続 '%s'�タイプ '%s' 用�エディターを作�����ん���。"
 
-#: ../clients/tui/nmt-editor.c:103
+#: ../clients/tui/nmt-editor.c:91
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
 msgstr "無効�接続 '%s' �エディターを作�����ん���。"
 
-#: ../clients/tui/nmt-editor.c:113
+#: ../clients/tui/nmt-editor.c:101
 msgid "Edit Connection"
 msgstr "接続�編集"
 
-#: ../clients/tui/nmt-editor.c:174
+#: ../clients/tui/nmt-editor.c:162
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "接続を�存����ん: %s"
 
-#: ../clients/tui/nmt-editor.c:188
+#: ../clients/tui/nmt-editor.c:176
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "新��接続を追加����ん: %s"
 
-#: ../clients/tui/nmt-editor.c:335
+#: ../clients/tui/nmt-editor.c:323
 msgid "Profile name"
 msgstr "プロファイル�"
 
-#: ../clients/tui/nmt-editor.c:346
+#: ../clients/tui/nmt-editor.c:334
 msgid "Ethernet device"
 msgstr "Ethernet デ�イス"
 
-#: ../clients/tui/nmt-editor.c:348
+#: ../clients/tui/nmt-editor.c:336
 msgid "Device"
 msgstr "デ�イス"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:408
+#: ../clients/tui/nmt-editor.c:396
 msgid "Automatically connect"
 msgstr "自動的�接続�る"
 
-#: ../clients/tui/nmt-editor.c:414
+#: ../clients/tui/nmt-editor.c:402
 msgid "Available to all users"
 msgstr "全ユーザー�使用�能"
 
-#: ../clients/tui/nmt-editor.c:429 ../clients/tui/nmt-password-dialog.c:170
-#: ../clients/tui/nmt-route-editor.c:114 ../clients/tui/nmtui-edit.c:219
-#: ../clients/tui/nmtui-edit.c:527 ../clients/tui/nmtui-hostname.c:66
+#: ../clients/tui/nmt-editor.c:417 ../clients/tui/nmt-password-dialog.c:158
+#: ../clients/tui/nmt-route-editor.c:102 ../clients/tui/nmtui-edit.c:207
+#: ../clients/tui/nmtui-edit.c:515 ../clients/tui/nmtui-hostname.c:54
 msgid "Cancel"
 msgstr "�り消�"
 
-#: ../clients/tui/nmt-mtu-entry.c:83
+#: ../clients/tui/nmt-mtu-entry.c:71
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: ../clients/tui/nmt-mtu-entry.c:85 ../clients/tui/nmt-mtu-entry.c:116
+#: ../clients/tui/nmt-mtu-entry.c:73 ../clients/tui/nmt-mtu-entry.c:104
 msgid "bytes"
 msgstr "�イト"
 
-#: ../clients/tui/nmt-page-bond.c:87
+#: ../clients/tui/nmt-page-bond.c:75
 msgid "Round-robin"
 msgstr "ラウンドロビン"
 
-#: ../clients/tui/nmt-page-bond.c:88
+#: ../clients/tui/nmt-page-bond.c:76
 msgid "Active Backup"
 msgstr "アクティブ��ックアップ"
 
-#: ../clients/tui/nmt-page-bond.c:89
+#: ../clients/tui/nmt-page-bond.c:77
 msgid "XOR"
 msgstr "XOR"
 
-#: ../clients/tui/nmt-page-bond.c:90
+#: ../clients/tui/nmt-page-bond.c:78
 msgid "Broadcast"
 msgstr "ブロードキャスト"
 
-#: ../clients/tui/nmt-page-bond.c:91
+#: ../clients/tui/nmt-page-bond.c:79
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../clients/tui/nmt-page-bond.c:92
+#: ../clients/tui/nmt-page-bond.c:80
 msgid "Adaptive Transmit Load Balancing (tlb)"
 msgstr "�応型�信負�分散機能 (tlb)"
 
-#: ../clients/tui/nmt-page-bond.c:93
+#: ../clients/tui/nmt-page-bond.c:81
 msgid "Adaptive Load Balancing (alb)"
 msgstr "�応型負�分散機能 (alb)"
 
-#: ../clients/tui/nmt-page-bond.c:99
+#: ../clients/tui/nmt-page-bond.c:87
 msgid "MII (recommended)"
 msgstr "MII (推奨)"
 
-#: ../clients/tui/nmt-page-bond.c:100
+#: ../clients/tui/nmt-page-bond.c:88
 msgid "ARP"
 msgstr "ARP"
 
-#: ../clients/tui/nmt-page-bond.c:361
+#: ../clients/tui/nmt-page-bond.c:349
 msgid "BOND"
 msgstr "ボンド"
 
-#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-bridge.c:84
-#: ../clients/tui/nmt-page-team.c:151
+#: ../clients/tui/nmt-page-bond.c:353 ../clients/tui/nmt-page-bridge.c:72
+#: ../clients/tui/nmt-page-team.c:139
 msgid "Slaves"
 msgstr "スレーブ"
 
-#: ../clients/tui/nmt-page-bond.c:377 ../clients/tui/nmt-page-ip-tunnel.c:147
-#: ../clients/tui/nmt-page-wifi.c:229
+#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
+#: ../clients/tui/nmt-page-wifi.c:218
 msgid "Mode"
 msgstr "モード"
 
-#: ../clients/tui/nmt-page-bond.c:383
+#: ../clients/tui/nmt-page-bond.c:371
 msgid "Primary"
 msgstr "プライマリー"
 
-#: ../clients/tui/nmt-page-bond.c:389
+#: ../clients/tui/nmt-page-bond.c:377
 msgid "Link monitoring"
 msgstr "リンク�モニタリング"
 
-#: ../clients/tui/nmt-page-bond.c:395 ../clients/tui/nmt-page-bond.c:402
-#: ../clients/tui/nmt-page-bond.c:409 ../clients/tui/nmt-page-bond.c:416
+#: ../clients/tui/nmt-page-bond.c:383 ../clients/tui/nmt-page-bond.c:390
+#: ../clients/tui/nmt-page-bond.c:397 ../clients/tui/nmt-page-bond.c:404
 msgctxt "milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: ../clients/tui/nmt-page-bond.c:396 ../clients/tui/nmt-page-bond.c:417
+#: ../clients/tui/nmt-page-bond.c:384 ../clients/tui/nmt-page-bond.c:405
 msgid "Monitoring frequency"
 msgstr "モニタリング�頻度"
 
-#: ../clients/tui/nmt-page-bond.c:403
+#: ../clients/tui/nmt-page-bond.c:391
 msgid "Link up delay"
 msgstr "リンクアップ��延"
 
-#: ../clients/tui/nmt-page-bond.c:410
+#: ../clients/tui/nmt-page-bond.c:398
 msgid "Link down delay"
 msgstr "リンクダウン��延"
 
-#: ../clients/tui/nmt-page-bond.c:423
+#: ../clients/tui/nmt-page-bond.c:411
 msgid "ARP targets"
 msgstr "ARP ターゲット"
 
-#: ../clients/tui/nmt-page-bond.c:430 ../clients/tui/nmt-page-ethernet.c:76
-#: ../clients/tui/nmt-page-vlan.c:109 ../clients/tui/nmt-page-wifi.c:363
+#: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
 msgid "Cloned MAC address"
 msgstr "クローン� MAC アドレス"
 
-#: ../clients/tui/nmt-page-bridge-port.c:59
+#: ../clients/tui/nmt-page-bridge-port.c:47
 msgid "BRIDGE PORT"
 msgstr "ブリッジ�ート"
 
-#: ../clients/tui/nmt-page-bridge-port.c:66
-#: ../clients/tui/nmt-page-bridge.c:117
+#: ../clients/tui/nmt-page-bridge-port.c:54
+#: ../clients/tui/nmt-page-bridge.c:105
 msgid "Priority"
 msgstr "優先度"
 
-#: ../clients/tui/nmt-page-bridge-port.c:72
+#: ../clients/tui/nmt-page-bridge-port.c:60
 msgid "Path cost"
 msgstr "パスコスト"
 
-#: ../clients/tui/nmt-page-bridge-port.c:74
+#: ../clients/tui/nmt-page-bridge-port.c:62
 msgid "Hairpin mode"
 msgstr "ヘアピンモード"
 
-#: ../clients/tui/nmt-page-bridge.c:80
+#: ../clients/tui/nmt-page-bridge.c:68
 msgid "BRIDGE"
 msgstr "ブリッジ"
 
-#: ../clients/tui/nmt-page-bridge.c:95 ../clients/tui/nmt-page-bridge.c:126
-#: ../clients/tui/nmt-page-bridge.c:136 ../clients/tui/nmt-page-bridge.c:146
+#: ../clients/tui/nmt-page-bridge.c:83 ../clients/tui/nmt-page-bridge.c:114
+#: ../clients/tui/nmt-page-bridge.c:124 ../clients/tui/nmt-page-bridge.c:134
 msgid "seconds"
 msgstr "秒"
 
-#: ../clients/tui/nmt-page-bridge.c:96
+#: ../clients/tui/nmt-page-bridge.c:84
 msgid "Aging time"
 msgstr "エージングタイム"
 
-#: ../clients/tui/nmt-page-bridge.c:98
+#: ../clients/tui/nmt-page-bridge.c:86
 msgid "Enable IGMP snooping"
 msgstr "IGMP スヌーピング�有効化"
 
-#: ../clients/tui/nmt-page-bridge.c:104
+#: ../clients/tui/nmt-page-bridge.c:92
 msgid "Enable STP (Spanning Tree Protocol)"
 msgstr "STP �有効化 (ツリープロトコル全域)"
 
-#: ../clients/tui/nmt-page-bridge.c:127
+#: ../clients/tui/nmt-page-bridge.c:115
 msgid "Forward delay"
 msgstr "フォワード�延"
 
-#: ../clients/tui/nmt-page-bridge.c:137
+#: ../clients/tui/nmt-page-bridge.c:125
 msgid "Hello time"
 msgstr "Hello タイム"
 
-#: ../clients/tui/nmt-page-bridge.c:147
+#: ../clients/tui/nmt-page-bridge.c:135
 msgid "Max age"
 msgstr "最大エイジ"
 
-#: ../clients/tui/nmt-page-bridge.c:153
+#: ../clients/tui/nmt-page-bridge.c:141
 msgid "Group forward mask"
 msgstr "グループ��方マスク"
 
-#: ../clients/tui/nmt-page-ethernet.c:69
+#: ../clients/tui/nmt-page-ethernet.c:57
 msgid "ETHERNET"
-msgstr "Ethernet "
+msgstr "Ethernet"
 
-#: ../clients/tui/nmt-page-ethernet.c:82
-#: ../clients/tui/nmt-page-infiniband.c:93
-#: ../clients/tui/nmt-page-ip-tunnel.c:185 ../clients/tui/nmt-page-vlan.c:115
-#: ../clients/tui/nmt-page-wifi.c:369
+#: ../clients/tui/nmt-page-ethernet.c:70
+#: ../clients/tui/nmt-page-infiniband.c:81
+#: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
+#: ../clients/tui/nmt-page-wifi.c:359
 msgid "MTU"
 msgstr "MTU"
 
-#: ../clients/tui/nmt-page-infiniband.c:46
+#: ../clients/tui/nmt-page-infiniband.c:34
 msgid "Datagram"
 msgstr "データグラム"
 
-#: ../clients/tui/nmt-page-infiniband.c:47
+#: ../clients/tui/nmt-page-infiniband.c:35
 msgid "Connected"
 msgstr "接続�れ���"
 
-#: ../clients/tui/nmt-page-infiniband.c:80
+#: ../clients/tui/nmt-page-infiniband.c:68
 msgid "INFINIBAND"
 msgstr "インフィニ�ンド"
 
-#: ../clients/tui/nmt-page-infiniband.c:87
+#: ../clients/tui/nmt-page-infiniband.c:75
 msgid "Transport mode"
 msgstr "トランス�ートモード"
 
-#: ../clients/tui/nmt-page-ip4.c:37 ../clients/tui/nmt-page-ip6.c:42
+#: ../clients/tui/nmt-page-ip4.c:25 ../clients/tui/nmt-page-ip6.c:30
 msgid "Disabled"
 msgstr "無効"
 
-#: ../clients/tui/nmt-page-ip4.c:38 ../clients/tui/nmt-page-ip6.c:38
+#: ../clients/tui/nmt-page-ip4.c:26 ../clients/tui/nmt-page-ip6.c:26
 msgid "Automatic"
 msgstr "自動"
 
-#: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:40
+#: ../clients/tui/nmt-page-ip4.c:27 ../clients/tui/nmt-page-ip6.c:28
 msgid "Link-Local"
 msgstr "ローカル�リンク"
 
-#: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
+#: ../clients/tui/nmt-page-ip4.c:28 ../clients/tui/nmt-page-ip6.c:29
 msgid "Manual"
 msgstr "手作業"
 
-#: ../clients/tui/nmt-page-ip4.c:41
+#: ../clients/tui/nmt-page-ip4.c:29
 msgid "Shared"
 msgstr "共有"
 
-#: ../clients/tui/nmt-page-ip4.c:81 ../clients/tui/nmt-page-ip6.c:82
+#: ../clients/tui/nmt-page-ip4.c:69 ../clients/tui/nmt-page-ip6.c:70
 msgid "(No custom routes)"
 msgstr "(カスタム�ルート��)"
 
-#: ../clients/tui/nmt-page-ip4.c:84 ../clients/tui/nmt-page-ip6.c:85
+#: ../clients/tui/nmt-page-ip4.c:72 ../clients/tui/nmt-page-ip6.c:73
 #, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
 msgstr[0] "%d ��カスタムルート"
 
-#: ../clients/tui/nmt-page-ip4.c:127
+#: ../clients/tui/nmt-page-ip4.c:115
 msgid "IPv4 CONFIGURATION"
 msgstr "IPv4 設定"
 
-#: ../clients/tui/nmt-page-ip4.c:135 ../clients/tui/nmt-page-ip6.c:136
+#: ../clients/tui/nmt-page-ip4.c:123 ../clients/tui/nmt-page-ip6.c:124
 msgid "Addresses"
 msgstr "アドレス"
 
-#: ../clients/tui/nmt-page-ip4.c:149 ../clients/tui/nmt-page-ip6.c:150
+#: ../clients/tui/nmt-page-ip4.c:137 ../clients/tui/nmt-page-ip6.c:138
 msgid "DNS servers"
 msgstr "DNS サー�ー"
 
-#: ../clients/tui/nmt-page-ip4.c:155 ../clients/tui/nmt-page-ip6.c:156
+#: ../clients/tui/nmt-page-ip4.c:143 ../clients/tui/nmt-page-ip6.c:144
 msgid "Search domains"
 msgstr "検索ドメイン"
 
-#: ../clients/tui/nmt-page-ip4.c:170 ../clients/tui/nmt-page-ip6.c:169
+#: ../clients/tui/nmt-page-ip4.c:158 ../clients/tui/nmt-page-ip6.c:157
 msgid "Routing"
 msgstr "ルーティング"
 
-#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
+#: ../clients/tui/nmt-page-ip4.c:160 ../clients/tui/nmt-page-ip6.c:159
 msgid "Never use this network for default route"
 msgstr "���ットワーク�デフォルト�ルート��使用���"
 
-#: ../clients/tui/nmt-page-ip4.c:178 ../clients/tui/nmt-page-ip6.c:177
+#: ../clients/tui/nmt-page-ip4.c:166 ../clients/tui/nmt-page-ip6.c:165
 msgid "Ignore automatically obtained routes"
 msgstr "自動的��得�れ�ルートを無視"
 
-#: ../clients/tui/nmt-page-ip4.c:184 ../clients/tui/nmt-page-ip6.c:183
+#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
 msgid "Ignore automatically obtained DNS parameters"
 msgstr "自動的��得�れ� DNS パラメーターを無視"
 
-#: ../clients/tui/nmt-page-ip4.c:192
+#: ../clients/tui/nmt-page-ip4.c:180
 msgid "Require IPv4 addressing for this connection"
 msgstr "��接続�� IPv4 アドレス設定�必���り��"
 
-#: ../clients/tui/nmt-page-ip6.c:37
+#: ../clients/tui/nmt-page-ip6.c:25
 msgid "Ignore"
 msgstr "無視�る"
 
-#: ../clients/tui/nmt-page-ip6.c:39
+#: ../clients/tui/nmt-page-ip6.c:27
 msgid "Automatic (DHCP-only)"
 msgstr "自動 (DHCP ��)"
 
-#: ../clients/tui/nmt-page-ip6.c:128
+#: ../clients/tui/nmt-page-ip6.c:116
 msgid "IPv6 CONFIGURATION"
 msgstr "IPv6 設定"
 
-#: ../clients/tui/nmt-page-ip6.c:191
+#: ../clients/tui/nmt-page-ip6.c:179
 msgid "Require IPv6 addressing for this connection"
 msgstr "��接続�� IPv6 アドレス設定�必���り��"
 
 #. The order must match the NM_IP_TUNNEL_MODE_* enum
-#: ../clients/tui/nmt-page-ip-tunnel.c:77
+#: ../clients/tui/nmt-page-ip-tunnel.c:65
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:78
+#: ../clients/tui/nmt-page-ip-tunnel.c:66
 msgid "GRE"
 msgstr "GRE"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:79
+#: ../clients/tui/nmt-page-ip-tunnel.c:67
 msgid "SIT"
 msgstr "SIT"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:80
+#: ../clients/tui/nmt-page-ip-tunnel.c:68
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:81
+#: ../clients/tui/nmt-page-ip-tunnel.c:69
 msgid "VTI"
 msgstr "VTI"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:82
+#: ../clients/tui/nmt-page-ip-tunnel.c:70
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:83
+#: ../clients/tui/nmt-page-ip-tunnel.c:71
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:84
+#: ../clients/tui/nmt-page-ip-tunnel.c:72
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:85
+#: ../clients/tui/nmt-page-ip-tunnel.c:73
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:149 ../clients/tui/nmt-page-vlan.c:86
+#: ../clients/tui/nmt-page-ip-tunnel.c:137 ../clients/tui/nmt-page-vlan.c:74
 msgid "Parent"
 msgstr "親"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:156
+#: ../clients/tui/nmt-page-ip-tunnel.c:144
 msgid "Local IP"
 msgstr "ローカル IP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:162
+#: ../clients/tui/nmt-page-ip-tunnel.c:150
 msgid "Remote IP"
 msgstr "リモート IP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:168
+#: ../clients/tui/nmt-page-ip-tunnel.c:156
 msgid "Input key"
 msgstr "入力キー"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:175
+#: ../clients/tui/nmt-page-ip-tunnel.c:163
 msgid "Output key"
 msgstr "出力キー"
 
-#: ../clients/tui/nmt-page-ppp.c:130
+#: ../clients/tui/nmt-page-ppp.c:118
 msgid "PPP CONFIGURATION"
 msgstr "PPP 設定"
 
-#: ../clients/tui/nmt-page-ppp.c:139
+#: ../clients/tui/nmt-page-ppp.c:127
 msgid "Allowed authentication methods:"
 msgstr "使用��る�証方法:"
 
-#: ../clients/tui/nmt-page-ppp.c:146
+#: ../clients/tui/nmt-page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
 
-#: ../clients/tui/nmt-page-ppp.c:154
+#: ../clients/tui/nmt-page-ppp.c:142
 msgid "PAP"
 msgstr "PAP"
 
-#: ../clients/tui/nmt-page-ppp.c:162
+#: ../clients/tui/nmt-page-ppp.c:150
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../clients/tui/nmt-page-ppp.c:170
+#: ../clients/tui/nmt-page-ppp.c:158
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../clients/tui/nmt-page-ppp.c:178
+#: ../clients/tui/nmt-page-ppp.c:166
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../clients/tui/nmt-page-ppp.c:194
+#: ../clients/tui/nmt-page-ppp.c:182
 msgid "Use point-to-point encryption (MPPE)"
 msgstr "MPPE (�イントツー�イント暗�化) を使用"
 
-#: ../clients/tui/nmt-page-ppp.c:206
+#: ../clients/tui/nmt-page-ppp.c:194
 msgid "Require 128-bit encryption"
 msgstr "128 ビット暗�化を�求"
 
-#: ../clients/tui/nmt-page-ppp.c:216
+#: ../clients/tui/nmt-page-ppp.c:204
 msgid "Use stateful MPPE"
 msgstr "ステートフル MPPE を使用"
 
-#: ../clients/tui/nmt-page-ppp.c:228
+#: ../clients/tui/nmt-page-ppp.c:216
 msgid "Allow BSD data compression"
 msgstr "BSD データ圧縮を許�"
 
-#: ../clients/tui/nmt-page-ppp.c:236
+#: ../clients/tui/nmt-page-ppp.c:224
 msgid "Allow Deflate data compression"
 msgstr "Deflate データ圧縮を許�"
 
-#: ../clients/tui/nmt-page-ppp.c:244
+#: ../clients/tui/nmt-page-ppp.c:232
 msgid "Use TCP header compression"
 msgstr "TCP ヘッダー圧縮を使用"
 
-#: ../clients/tui/nmt-page-ppp.c:254
+#: ../clients/tui/nmt-page-ppp.c:242
 msgid "Send PPP echo packets"
 msgstr "PPP エコーパケットを�信"
 
-#: ../clients/tui/nmt-page-team-port.c:91
+#: ../clients/tui/nmt-page-team-port.c:79
 msgid "TEAM PORT"
 msgstr "team �ート"
 
-#: ../clients/tui/nmt-page-team-port.c:98 ../clients/tui/nmt-page-team.c:162
+#: ../clients/tui/nmt-page-team-port.c:86 ../clients/tui/nmt-page-team.c:150
 msgid "JSON configuration"
 msgstr "JSON 設定"
 
-#: ../clients/tui/nmt-page-team.c:144
+#: ../clients/tui/nmt-page-team.c:132
 msgid "TEAM"
 msgstr "team"
 
-#: ../clients/tui/nmt-page-vlan.c:101
+#: ../clients/tui/nmt-page-vlan.c:89
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: ../clients/tui/nmt-page-wifi.c:63
+#: ../clients/tui/nmt-page-wifi.c:51
 msgctxt "Wi-Fi"
 msgid "Client"
 msgstr "クライアント"
 
-#: ../clients/tui/nmt-page-wifi.c:64
+#: ../clients/tui/nmt-page-wifi.c:52
 msgid "Access Point"
 msgstr "アクセス�イント"
 
-#: ../clients/tui/nmt-page-wifi.c:65
+#: ../clients/tui/nmt-page-wifi.c:53
 msgid "Ad-Hoc Network"
 msgstr "アドホック�ットワーク"
 
-#: ../clients/tui/nmt-page-wifi.c:70
+#: ../clients/tui/nmt-page-wifi.c:58
 msgctxt "Wi-Fi"
 msgid "Automatic"
 msgstr "自動"
 
 #. 802.11a Wi-Fi network
-#: ../clients/tui/nmt-page-wifi.c:72
+#: ../clients/tui/nmt-page-wifi.c:60
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
 #. 802.11b / 802.11g Wi-Fi network
-#: ../clients/tui/nmt-page-wifi.c:74
+#: ../clients/tui/nmt-page-wifi.c:62
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../clients/tui/nmt-page-wifi.c:79
+#: ../clients/tui/nmt-page-wifi.c:67
 msgctxt "Wi-Fi security"
 msgid "None"
 msgstr "��"
 
-#: ../clients/tui/nmt-page-wifi.c:80
+#: ../clients/tui/nmt-page-wifi.c:68
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 パーソナル"
 
-#: ../clients/tui/nmt-page-wifi.c:81
+#: ../clients/tui/nmt-page-wifi.c:69
+msgid "WPA3 Personal"
+msgstr "WPA3 Personal"
+
+#: ../clients/tui/nmt-page-wifi.c:70
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 エンタープライズ"
 
-#: ../clients/tui/nmt-page-wifi.c:82
+#: ../clients/tui/nmt-page-wifi.c:71
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 ビット�キー (16 進数��� ASCII)"
 
-#: ../clients/tui/nmt-page-wifi.c:83
+#: ../clients/tui/nmt-page-wifi.c:72
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 ビット�パスフレーズ"
 
-#: ../clients/tui/nmt-page-wifi.c:84
+#: ../clients/tui/nmt-page-wifi.c:73
 msgid "Dynamic WEP (802.1x)"
 msgstr "å‹•çš„ WEP (802.1x)"
 
-#: ../clients/tui/nmt-page-wifi.c:85
+#: ../clients/tui/nmt-page-wifi.c:74
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../clients/tui/nmt-page-wifi.c:90
+#: ../clients/tui/nmt-page-wifi.c:79
 msgctxt "WEP key index"
 msgid "1 (Default)"
 msgstr "1 (デフォルト)"
 
-#: ../clients/tui/nmt-page-wifi.c:91
+#: ../clients/tui/nmt-page-wifi.c:80
 msgctxt "WEP key index"
 msgid "2"
 msgstr "2"
 
-#: ../clients/tui/nmt-page-wifi.c:92
+#: ../clients/tui/nmt-page-wifi.c:81
 msgctxt "WEP key index"
 msgid "3"
 msgstr "3"
 
-#: ../clients/tui/nmt-page-wifi.c:93
+#: ../clients/tui/nmt-page-wifi.c:82
 msgctxt "WEP key index"
 msgid "4"
 msgstr "4"
 
-#: ../clients/tui/nmt-page-wifi.c:98
+#: ../clients/tui/nmt-page-wifi.c:87
 msgid "Open System"
 msgstr "Open System"
 
-#: ../clients/tui/nmt-page-wifi.c:99
+#: ../clients/tui/nmt-page-wifi.c:88
 msgid "Shared Key"
 msgstr "共有キー"
 
-#: ../clients/tui/nmt-page-wifi.c:213
+#: ../clients/tui/nmt-page-wifi.c:202
 msgid "WI-FI"
 msgstr "WI-FI"
 
-#: ../clients/tui/nmt-page-wifi.c:255
+#: ../clients/tui/nmt-page-wifi.c:244
 msgid "Channel"
 msgstr "�ャン�ル"
 
-#: ../clients/tui/nmt-page-wifi.c:260
-msgid "Security"
-msgstr "セキュリティー"
-
 #. "wpa-enterprise"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:281
+#: ../clients/tui/nmt-page-wifi.c:271
 msgid "(No support for wpa-enterprise yet...)"
 msgstr "(�在�WPA エンタープライズ��対応�����ん...)"
 
-#: ../clients/tui/nmt-page-wifi.c:291 ../clients/tui/nmt-page-wifi.c:310
+#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
 msgid "WEP index"
 msgstr "WEP インデックス"
 
-#: ../clients/tui/nmt-page-wifi.c:299 ../clients/tui/nmt-page-wifi.c:318
+#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
 msgid "Authentication"
 msgstr "�証"
 
 #. "dynamic-wep"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:324
+#: ../clients/tui/nmt-page-wifi.c:314
 msgid "(No support for dynamic-wep yet...)"
 msgstr "(�在�動的 WEP ��対応�����ん...)"
 
-#: ../clients/tui/nmt-page-wifi.c:357
+#: ../clients/tui/nmt-page-wifi.c:347
 msgid "BSSID"
 msgstr "BSSID"
 
-#: ../clients/tui/nmt-password-fields.c:127
+#: ../clients/tui/nmt-password-fields.c:115
 msgid "Ask for this password every time"
 msgstr "毎回���パスワード�入力を求�る"
 
-#: ../clients/tui/nmt-password-fields.c:128
+#: ../clients/tui/nmt-password-fields.c:116
 msgid "Show password"
 msgstr "パスワードを表示�る"
 
-#: ../clients/tui/nmt-route-table.c:186
+#: ../clients/tui/nmt-route-table.c:174
 msgid "Destination"
 msgstr "�信先"
 
-#: ../clients/tui/nmt-route-table.c:186
+#: ../clients/tui/nmt-route-table.c:174
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../clients/tui/nmt-route-table.c:195
+#: ../clients/tui/nmt-route-table.c:183
 msgid "Next Hop"
 msgstr "次�ホップ"
 
-#: ../clients/tui/nmt-route-table.c:203
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Metric"
 msgstr "メトリック"
 
-#: ../clients/tui/nmt-route-table.c:223
+#: ../clients/tui/nmt-route-table.c:211
 msgid "No custom routes are defined."
 msgstr "カスタム�ルート�定義�れ����ん。"
 
-#: ../clients/tui/nmt-slave-list.c:133
+#: ../clients/tui/nmt-slave-list.c:121
 msgid "Select the type of slave connection you wish to add."
 msgstr "追加���スレーブ接続�タイプを�択������。"
 
-#: ../clients/tui/nmt-widget-list.c:138
+#: ../clients/tui/nmt-widget-list.c:126
 msgid "Add..."
 msgstr "追加..."
 
-#: ../clients/tui/nmt-widget-list.c:201
+#: ../clients/tui/nmt-widget-list.c:189
 msgid "Remove"
 msgstr "削除"
 
-#: ../clients/tui/nmtui-connect.c:54
+#: ../clients/tui/nmtui-connect.c:42
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
 msgstr "�証�����openconnect �実行���。\n"
 "処��完了�る��nmtui �戻り��。"
 
-#: ../clients/tui/nmtui-connect.c:68
+#: ../clients/tui/nmtui-connect.c:56
 #, c-format
 msgid "Error: openconnect failed: %s"
 msgstr "エラー: openconnect �失敗����: %s"
 
-#: ../clients/tui/nmtui-connect.c:75
+#: ../clients/tui/nmtui-connect.c:63
 #, c-format
 msgid "openconnect failed with status %d"
 msgstr "openconnect �ステータス %d �失敗����"
 
-#: ../clients/tui/nmtui-connect.c:79
+#: ../clients/tui/nmtui-connect.c:67
 #, c-format
 msgid "openconnect failed with signal %d"
 msgstr "openconnect �シグナル %d �失敗����"
 
-#: ../clients/tui/nmtui-connect.c:182
+#: ../clients/tui/nmtui-connect.c:170
 #, c-format
 msgid "Activation failed: %s"
 msgstr "アクティベーション�失敗: %s"
 
-#: ../clients/tui/nmtui-connect.c:253
+#: ../clients/tui/nmtui-connect.c:241
 msgid "Connecting..."
 msgstr "接続中..."
 
-#: ../clients/tui/nmtui-connect.c:291 ../clients/tui/nmtui-connect.c:328
+#: ../clients/tui/nmtui-connect.c:279 ../clients/tui/nmtui-connect.c:316
 #, c-format
 msgid "Could not activate connection: %s"
 msgstr "接続をアクティベート����ん���: %s"
 
-#: ../clients/tui/nmtui-connect.c:390 ../clients/tui/nmtui-connect.c:439
+#: ../clients/tui/nmtui-connect.c:378 ../clients/tui/nmtui-connect.c:427
 msgid "Activate"
 msgstr "アクティベート"
 
-#: ../clients/tui/nmtui-connect.c:392
+#: ../clients/tui/nmtui-connect.c:380
 msgid "Deactivate"
 msgstr "解除"
 
-#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
-#: ../clients/tui/nmtui.c:127
+#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
+#: ../clients/tui/nmtui.c:115
 msgid "Quit"
 msgstr "終了"
 
-#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
+#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
 msgid "Back"
 msgstr "戻る"
 
-#: ../clients/tui/nmtui-connect.c:467
+#: ../clients/tui/nmtui-connect.c:455
 #, c-format
 msgid "No such connection '%s'"
 msgstr "��よ��接続 '%s' ��り��ん"
 
-#: ../clients/tui/nmtui-connect.c:469
+#: ../clients/tui/nmtui-connect.c:457
 msgid "Connection is already active"
 msgstr "接続����アクティブ�������"
 
-#: ../clients/tui/nmtui-edit.c:227
+#: ../clients/tui/nmtui-edit.c:215
 msgid "Create"
 msgstr "作�"
 
-#: ../clients/tui/nmtui-edit.c:369
+#: ../clients/tui/nmtui-edit.c:357
 msgid "Select the type of connection you wish to create."
 msgstr "作����接続タイプを�択������。"
 
-#: ../clients/tui/nmtui-edit.c:377
+#: ../clients/tui/nmtui-edit.c:365
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr "VPN �作�中�作���� VPN 接続�一覧�表示�れ��場���切� VPN プラグイン�インストール�れ�����能性��り��。"
 
-#: ../clients/tui/nmtui-edit.c:413 ../clients/tui/nmtui-edit.c:429
+#: ../clients/tui/nmtui-edit.c:401 ../clients/tui/nmtui-edit.c:417
 msgid "New Connection"
 msgstr "新��接続"
 
-#: ../clients/tui/nmtui-edit.c:468
+#: ../clients/tui/nmtui-edit.c:456
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "接続を削除����ん: %s"
 
-#: ../clients/tui/nmtui-edit.c:507
+#: ../clients/tui/nmtui-edit.c:495
 #, c-format
 msgid "Could not delete connection '%s': %s"
 msgstr "接続 '%s' を削除����ん���: %s"
 
-#: ../clients/tui/nmtui-edit.c:529
+#: ../clients/tui/nmtui-edit.c:517
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
 msgstr "本当�接続 '%s' を削除��も�����?"
 
-#: ../clients/tui/nmtui-hostname.c:44
+#: ../clients/tui/nmtui-hostname.c:32
 msgid "Set Hostname"
 msgstr "ホスト��設定"
 
-#: ../clients/tui/nmtui-hostname.c:52
+#: ../clients/tui/nmtui-hostname.c:40
 msgid "Hostname"
 msgstr "ホスト�"
 
 #. TRANSLATORS: this indicates the result. ie, "I have set the hostname to ..."
-#: ../clients/tui/nmtui-hostname.c:115
+#: ../clients/tui/nmtui-hostname.c:103
 #, c-format
 msgid "Set hostname to '%s'"
 msgstr "ホスト�を '%s' �設定���"
 
-#: ../clients/tui/nmtui-hostname.c:117
+#: ../clients/tui/nmtui-hostname.c:105
 #, c-format
 msgid "Unable to set hostname: %s"
 msgstr "ホスト�を設定����ん: %s"
 
-#: ../clients/tui/nmtui.c:50 ../clients/tui/nmtui.c:53
+#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
 msgid "connection"
 msgstr "接続"
 
-#: ../clients/tui/nmtui.c:51
+#: ../clients/tui/nmtui.c:39
 msgid "Edit a connection"
 msgstr "接続�編集"
 
-#: ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:42
 msgid "Activate a connection"
 msgstr "接続をアクティベート�る"
 
-#: ../clients/tui/nmtui.c:56
+#: ../clients/tui/nmtui.c:44
 msgid "new hostname"
 msgstr "新��ホスト�"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:45
 msgid "Set system hostname"
 msgstr "システム�ホスト�を設定�る"
 
-#: ../clients/tui/nmtui.c:101
+#: ../clients/tui/nmtui.c:89
 msgid "NetworkManager TUI"
 msgstr "NetworkManager TUI"
 
-#: ../clients/tui/nmtui.c:109
+#: ../clients/tui/nmtui.c:97
 msgid "Please select an option"
 msgstr "オプションを�択������"
 
-#: ../clients/tui/nmtui.c:157
+#: ../clients/tui/nmtui.c:145
 msgid "Usage"
 msgstr "使�方"
 
-#: ../clients/tui/nmtui.c:238
+#: ../clients/tui/nmtui.c:226
 msgid "Could not parse arguments"
 msgstr "引数を解�����ん���"
 
-#: ../clients/tui/nmtui.c:248
+#: ../clients/tui/nmtui.c:236
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "NetworkManager �接続����ん���: %s.\n"
 
-#: ../clients/tui/nmtui.c:253
+#: ../clients/tui/nmtui.c:241
 msgid "NetworkManager is not running."
 msgstr "NetworkManager �実行�����ん。"
 
-#: ../libnm-core/nm-crypto.c:219
+#: ../libnm-core/nm-crypto.c:204
 #, c-format
 msgid "PEM key file had no start tag"
 msgstr "PEM キーファイル��開始タグ��り��ん"
 
-#: ../libnm-core/nm-crypto.c:227
+#: ../libnm-core/nm-crypto.c:212
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM キーファイル��終了タグ '%s' ��り��ん。"
 
-#: ../libnm-core/nm-crypto.c:254
+#: ../libnm-core/nm-crypto.c:239
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "�正形�� PEM ファイル: Proc-Type �最��タグ���り��ん。"
 
-#: ../libnm-core/nm-crypto.c:262
+#: ../libnm-core/nm-crypto.c:247
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "�正形�� PEM ファイル: �明� Proc-Type タグ '%s' ��。"
 
-#: ../libnm-core/nm-crypto.c:274
+#: ../libnm-core/nm-crypto.c:259
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "�正形�� PEM ファイル: DEK-Info �２�目�タグ���り��ん。"
 
-#: ../libnm-core/nm-crypto.c:285
+#: ../libnm-core/nm-crypto.c:270
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "�正形�� PEM ファイル: DEK-Info タグ内� IV �見��り��ん。"
 
-#: ../libnm-core/nm-crypto.c:293
+#: ../libnm-core/nm-crypto.c:278
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "�正形�� PEM ファイル: DEK-Info タグ内�無効�形�� IV"
 
-#: ../libnm-core/nm-crypto.c:304
+#: ../libnm-core/nm-crypto.c:289
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "�正形�� PEM ファイル: �明�プライベートキー暗�文 '%s'。"
 
-#: ../libnm-core/nm-crypto.c:325
+#: ../libnm-core/nm-crypto.c:310
 #, c-format
 msgid "Could not decode private key."
 msgstr "プライベートキーを復�����ん���。"
 
-#: ../libnm-core/nm-crypto.c:366
+#: ../libnm-core/nm-crypto.c:351
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "期待�れ��る PKCS#8 開始タグ�検出�失敗����。"
 
-#: ../libnm-core/nm-crypto.c:374
+#: ../libnm-core/nm-crypto.c:359
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "期待�れ��る PKCS#8 終了タグ '%s' �検出�失敗����。"
 
-#: ../libnm-core/nm-crypto.c:386
+#: ../libnm-core/nm-crypto.c:371
 msgid "Failed to decode PKCS#8 private key."
 msgstr "PKCS#8 プライベートキー�復��失敗����。"
 
-#: ../libnm-core/nm-crypto.c:415
+#: ../libnm-core/nm-crypto.c:400
 msgid "Failed to find expected TSS start tag."
 msgstr "期待�れ��る TSS 開始タグ�検出�失敗����。"
 
-#: ../libnm-core/nm-crypto.c:423
+#: ../libnm-core/nm-crypto.c:408
 #, c-format
 msgid "Failed to find expected TSS end tag '%s'."
 msgstr "期待�れ��る TSS 終了タグ '%s' �検出�失敗����。"
 
-#: ../libnm-core/nm-crypto.c:482
+#: ../libnm-core/nm-crypto.c:468
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV ����長���数��イト数���れ��り��ん。"
 
-#: ../libnm-core/nm-crypto.c:498
+#: ../libnm-core/nm-crypto.c:484
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV � 16進法���数字を�ん����。"
 
-#: ../libnm-core/nm-crypto.c:574
+#: ../libnm-core/nm-crypto.c:560
 #, c-format
 msgid "IV must contain at least 8 characters"
 msgstr "IV �最低 8 文字�必�"
 
-#: ../libnm-core/nm-crypto.c:622
+#: ../libnm-core/nm-crypto.c:608
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "プライベートキー�タイプを判定����ん。"
 
-#: ../libnm-core/nm-crypto.c:634
+#: ../libnm-core/nm-crypto.c:620
 #, c-format
 msgid "Password provided, but key was not encrypted."
 msgstr "パスワード��供�れ�����キー�暗�化�れ��ん���。"
 
-#: ../libnm-core/nm-crypto.c:695
+#: ../libnm-core/nm-crypto.c:681
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "PEM 証明書�終了タグ '%s' ��り��ん���。"
 
-#: ../libnm-core/nm-crypto.c:704
+#: ../libnm-core/nm-crypto.c:690
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "PEM 証明書�終了タグ '%s' ��り��ん���。"
 
-#: ../libnm-core/nm-crypto.c:716
+#: ../libnm-core/nm-crypto.c:702
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "証明書�復��失敗����。"
 
-#: ../libnm-core/nm-crypto.c:745 ../libnm-core/nm-crypto.c:798
+#: ../libnm-core/nm-crypto.c:731 ../libnm-core/nm-crypto.c:784
 #, c-format
 msgid "Certificate file is empty"
 msgstr "証明書ファイル�空��"
 
-#: ../libnm-core/nm-crypto.c:778
+#: ../libnm-core/nm-crypto.c:764
 #, c-format
 msgid "Failed to recognize certificate"
 msgstr "証明書��識�失敗����"
 
-#: ../libnm-core/nm-crypto.c:890
+#: ../libnm-core/nm-crypto.c:876
 #, c-format
 msgid "not a valid private key"
 msgstr "無効�プライベートキー"
 
-#: ../libnm-core/nm-crypto-gnutls.c:74
+#: ../libnm-core/nm-crypto-gnutls.c:58
 msgid "Failed to initialize the crypto engine."
 msgstr "暗�化エンジン��期化�失敗����。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:106 ../libnm-core/nm-crypto-nss.c:127
+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:112
 #, c-format
 msgid "Unsupported key cipher for decryption"
-msgstr "解読�サ�ート�れ����キー�暗�"
+msgstr "解読�サ�ート�れ����キー�暗�文"
 
-#: ../libnm-core/nm-crypto-gnutls.c:116 ../libnm-core/nm-crypto-nss.c:134
+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:119
 #, c-format
 msgid "Invalid IV length (must be at least %u)."
 msgstr "IV �長��無効�� (最低�も %u �必�)。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:133
+#: ../libnm-core/nm-crypto-gnutls.c:117
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
 msgstr "復�化暗�文コンテキスト��期化�失敗����: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:145
+#: ../libnm-core/nm-crypto-gnutls.c:129
 #, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
 msgstr "プライベートキー�復��失敗����: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:159 ../libnm-core/nm-crypto-nss.c:221
+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:206
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "プライベートキー�復��失敗����: 予想外���語��長���。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:170 ../libnm-core/nm-crypto-nss.c:232
+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:217
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "プライベートキー�復��失敗����。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:204 ../libnm-core/nm-crypto-nss.c:287
+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:272
 #, c-format
 msgid "Unsupported key cipher for encryption"
-msgstr "暗�化�サ�ート�れ����キー�暗�"
+msgstr "暗�化�サ�ート�れ����キー�暗�文"
 
-#: ../libnm-core/nm-crypto-gnutls.c:220
+#: ../libnm-core/nm-crypto-gnutls.c:204
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr "暗�化暗�文コンテキスト��期化�失敗����: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:246
+#: ../libnm-core/nm-crypto-gnutls.c:230
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "データ�暗�化�失敗����: %s (%s)"
 
-#: ../libnm-core/nm-crypto-gnutls.c:271
+#: ../libnm-core/nm-crypto-gnutls.c:255
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "証明書データ��期化�エラー発生: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:293
+#: ../libnm-core/nm-crypto-gnutls.c:277
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "証明書をデコード����ん���: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:320
+#: ../libnm-core/nm-crypto-gnutls.c:304
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "PKCS#12 デコーダーを�期化����ん: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:333
+#: ../libnm-core/nm-crypto-gnutls.c:317
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルをデコード����ん: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:347
+#: ../libnm-core/nm-crypto-gnutls.c:331
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12 ファイルを確証����ん: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:375
+#: ../libnm-core/nm-crypto-gnutls.c:359
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "PKCS#8 デコーダーを�期化����ん���: %s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:402
+#: ../libnm-core/nm-crypto-gnutls.c:386
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "PKCS#8 ファイルをデコード����ん���: %s"
 
-#: ../libnm-core/nm-crypto-nss.c:80
+#: ../libnm-core/nm-crypto-nss.c:65
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "暗�化エンジン��期化�失敗����: %d。"
 
-#: ../libnm-core/nm-crypto-nss.c:146
+#: ../libnm-core/nm-crypto-nss.c:131
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "復�化暗�文スロット��期化�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:156
+#: ../libnm-core/nm-crypto-nss.c:141
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "復�化用シンメトリックキー�設定�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:166
+#: ../libnm-core/nm-crypto-nss.c:151
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "復�化用 IV �設定�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:174
+#: ../libnm-core/nm-crypto-nss.c:159
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "復�化コンテキスト��期化�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:190
+#: ../libnm-core/nm-crypto-nss.c:175
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "プライベートキー�復��失敗����: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:198
+#: ../libnm-core/nm-crypto-nss.c:183
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "プライベートキー�復��失敗����: 復���データ�大�����。"
 
-#: ../libnm-core/nm-crypto-nss.c:209
+#: ../libnm-core/nm-crypto-nss.c:194
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "プライベートキー復�化�完了�失敗����: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:298
+#: ../libnm-core/nm-crypto-nss.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "暗�化暗�文スロット��期化�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:306
+#: ../libnm-core/nm-crypto-nss.c:291
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "暗�化用�シンメトリックキー�設定�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:314
+#: ../libnm-core/nm-crypto-nss.c:299
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "暗�化用� IV �設定�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:322
+#: ../libnm-core/nm-crypto-nss.c:307
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "暗�化コンテキスト��期化�失敗����。"
 
-#: ../libnm-core/nm-crypto-nss.c:345
+#: ../libnm-core/nm-crypto-nss.c:330
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "暗�化�失敗����: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:353
+#: ../libnm-core/nm-crypto-nss.c:338
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "暗�化�後�予期���データ����り��。"
 
-#: ../libnm-core/nm-crypto-nss.c:391
+#: ../libnm-core/nm-crypto-nss.c:376
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "証明書�デコード�����ん: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:437
+#: ../libnm-core/nm-crypto-nss.c:422
 #, c-format
 msgid "Password must be UTF-8"
 msgstr "パスワード� UTF-8 ��る必���り��"
 
-#: ../libnm-core/nm-crypto-nss.c:460
+#: ../libnm-core/nm-crypto-nss.c:445
 #, c-format
 msgid "Couldn't initialize slot"
 msgstr "スロットを�期化����ん���"
 
-#: ../libnm-core/nm-crypto-nss.c:468
+#: ../libnm-core/nm-crypto-nss.c:453
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "PKCS#12 デコーダーを�期化����ん: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:477
+#: ../libnm-core/nm-crypto-nss.c:462
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "PKCS#12 ファイルをデコード����ん: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:486
+#: ../libnm-core/nm-crypto-nss.c:471
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "PKCS#12 ファイルを確証����ん: %d"
 
-#: ../libnm-core/nm-crypto-nss.c:536
+#: ../libnm-core/nm-crypto-nss.c:521
 msgid "Could not generate random data."
 msgstr "ランダムデータを生�����ん。"
 
-#: ../libnm-core/nm-connection.c:320
+#: ../libnm-core/nm-connection.c:306
 msgid "wrong type; should be a list of strings."
 msgstr "正����タイプ; 文字列�リスト��る必���り��。"
 
-#: ../libnm-core/nm-connection.c:390
+#: ../libnm-core/nm-connection.c:376
 msgid "unknown setting name"
 msgstr "�明�設定�"
 
-#: ../libnm-core/nm-connection.c:402
+#: ../libnm-core/nm-connection.c:388
 msgid "duplicate setting name"
 msgstr "�複�る設定�"
 
-#: ../libnm-core/nm-connection.c:1414
+#: ../libnm-core/nm-connection.c:1423
 msgid "setting not found"
 msgstr "設定�見��り��ん"
 
-#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
-#: ../libnm-core/nm-connection.c:1530
+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
+#: ../libnm-core/nm-connection.c:1539
 msgid "setting is required for non-slave connections"
 msgstr "設定��スレーブ接続�必���"
 
-#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
-#: ../libnm-core/nm-connection.c:1543
+#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
+#: ../libnm-core/nm-connection.c:1552
 msgid "setting not allowed in slave connection"
 msgstr "設定�スレーブ接続�許��れ��ん"
 
-#: ../libnm-core/nm-connection.c:1647
+#: ../libnm-core/nm-connection.c:1657
 msgid "Unexpected failure to normalize the connection"
 msgstr "接続を正�化�る���予期���障害"
 
-#: ../libnm-core/nm-connection.c:1710
+#: ../libnm-core/nm-connection.c:1720
 msgid "Unexpected failure to verify the connection"
 msgstr "接続を確��る���予期���障害"
 
-#: ../libnm-core/nm-connection.c:1746
+#: ../libnm-core/nm-connection.c:1756
 #, c-format
 msgid "unexpected uuid %s instead of %s"
-msgstr "%s �����予期�� uuid %s "
-
-#: ../libnm-core/nm-connection.c:2599 ../libnm-core/nm-setting-8021x.c:2567
-#: ../libnm-core/nm-setting-8021x.c:2584 ../libnm-core/nm-setting-8021x.c:2615
-#: ../libnm-core/nm-setting-8021x.c:2632 ../libnm-core/nm-setting-8021x.c:2674
-#: ../libnm-core/nm-setting-8021x.c:2686 ../libnm-core/nm-setting-8021x.c:2704
-#: ../libnm-core/nm-setting-8021x.c:2716 ../libnm-core/nm-setting-8021x.c:2740
-#: ../libnm-core/nm-setting-8021x.c:2822 ../libnm-core/nm-setting-adsl.c:172
-#: ../libnm-core/nm-setting-bluetooth.c:123
-#: ../libnm-core/nm-setting-bluetooth.c:181
-#: ../libnm-core/nm-setting-bluetooth.c:195 ../libnm-core/nm-setting-cdma.c:142
-#: ../libnm-core/nm-setting-connection.c:968
-#: ../libnm-core/nm-setting-connection.c:1011
-#: ../libnm-core/nm-setting-connection.c:1191
-#: ../libnm-core/nm-setting-ip-config.c:4905
-#: ../libnm-core/nm-setting-ip-tunnel.c:373
-#: ../libnm-core/nm-setting-olpc-mesh.c:98
-#: ../libnm-core/nm-setting-ovs-patch.c:91 ../libnm-core/nm-setting-pppoe.c:144
-#: ../libnm-core/nm-setting-vpn.c:530 ../libnm-core/nm-setting-vxlan.c:337
-#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:108
-#: ../libnm-core/nm-setting-wireless-security.c:917
-#: ../libnm-core/nm-setting-wireless.c:776
+msgstr "%s �����予期�� uuid %s"
+
+#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
+#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
+#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
+#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
+#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
+#: ../libnm-core/nm-setting-bluetooth.c:109
+#: ../libnm-core/nm-setting-bluetooth.c:167
+#: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
+#: ../libnm-core/nm-setting-connection.c:954
+#: ../libnm-core/nm-setting-connection.c:997
+#: ../libnm-core/nm-setting-connection.c:1177
+#: ../libnm-core/nm-setting-ip-config.c:4946
+#: ../libnm-core/nm-setting-ip-tunnel.c:359
+#: ../libnm-core/nm-setting-olpc-mesh.c:84
+#: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
+#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
+#: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
+#: ../libnm-core/nm-setting-wireless-security.c:902
+#: ../libnm-core/nm-setting-wireless.c:759
 msgid "property is missing"
 msgstr "プロパティー��り��ん"
 
-#: ../libnm-core/nm-connection.c:2745
+#: ../libnm-core/nm-connection.c:2755
 msgid "IP Tunnel"
 msgstr "IP トン�ル"
 
-#: ../libnm-core/nm-dbus-utils.c:199
+#: ../libnm-core/nm-dbus-utils.c:185
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "メソッド�タイプ '%s' を返������'%s' を想定������"
 
-#: ../libnm-core/nm-keyfile-utils.c:246
+#: ../libnm-core/nm-keyfile-utils.c:242
 #, c-format
 msgid "value is not an integer in range [%lld, %lld]"
 msgstr "値��[%lld, %lld] �範囲�整数���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:210
+#: ../libnm-core/nm-keyfile.c:196
 msgid "ignoring missing number"
 msgstr "�明�数字を無視"
 
-#: ../libnm-core/nm-keyfile.c:218
+#: ../libnm-core/nm-keyfile.c:204
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "無効�数字 '%s' を無視"
 
-#: ../libnm-core/nm-keyfile.c:239
+#: ../libnm-core/nm-keyfile.c:225
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "無効� %s アドレスを無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:281
+#: ../libnm-core/nm-keyfile.c:268
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "無効�ゲートウェイ '%s' (%s ルート用) を無視"
 
-#: ../libnm-core/nm-keyfile.c:302
+#: ../libnm-core/nm-keyfile.c:292
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "無効� %s ルートを無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../libnm-core/nm-keyfile.c:464
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "アドレス %c �予期���文字 '%s': '%s' (�置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:484
+#: ../libnm-core/nm-keyfile.c:474
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "%c �予期���文字 '%s': '%s' (�置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:493
+#: ../libnm-core/nm-keyfile.c:483
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "%c �予期���プレフィックス長�文字 '%s': '%s' (�置 %td)"
 
-#: ../libnm-core/nm-keyfile.c:504
+#: ../libnm-core/nm-keyfile.c:494
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "値 %s �後�ガベッジ: '%s'"
 
-#: ../libnm-core/nm-keyfile.c:510
+#: ../libnm-core/nm-keyfile.c:500
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "値 %s �後��推奨�セミコロン: '%s'"
 
-#: ../libnm-core/nm-keyfile.c:525
+#: ../libnm-core/nm-keyfile.c:514
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' �無効�プレフィックス長 (デフォルト値� %d)"
 
-#: ../libnm-core/nm-keyfile.c:532
+#: ../libnm-core/nm-keyfile.c:521
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "%s '%s' ��明�プレフィックス長 (デフォルト値� %d)"
 
-#: ../libnm-core/nm-keyfile.c:860 ../libnm-core/nm-setting-user.c:372
+#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "'%s' �無効�値: %s"
 
-#: ../libnm-core/nm-keyfile.c:898
+#: ../libnm-core/nm-keyfile.c:894
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "無効� DNS サー�ー IPv%c アドレス '%s' を無視"
 
-#: ../libnm-core/nm-keyfile.c:994 ../libnm-core/nm-keyfile.c:3122
+#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "無効��イト�素 '%d' (0〜255 以外) を無視"
 
-#: ../libnm-core/nm-keyfile.c:1005
+#: ../libnm-core/nm-keyfile.c:1001
 msgid "ignoring invalid MAC address"
 msgstr "有効� MAC アドレスを無視"
 
-#: ../libnm-core/nm-keyfile.c:1264
+#: ../libnm-core/nm-keyfile.c:1260
 msgid "ignoring invalid SSID"
 msgstr "無効� SSID を無視"
 
-#: ../libnm-core/nm-keyfile.c:1280
+#: ../libnm-core/nm-keyfile.c:1276
 msgid "ignoring invalid raw password"
 msgstr "無効�生パスワードを無視"
 
-#: ../libnm-core/nm-keyfile.c:1417
+#: ../libnm-core/nm-keyfile.c:1416
 msgid "invalid key/cert value"
 msgstr "無効�キー/証明書値"
 
-#: ../libnm-core/nm-keyfile.c:1428
+#: ../libnm-core/nm-keyfile.c:1427
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "無効�キー/証明書値パス \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1444 ../libnm-core/nm-keyfile.c:1527
+#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "証明書���キーファイル '%s' �存在���ん"
 
-#: ../libnm-core/nm-keyfile.c:1453
+#: ../libnm-core/nm-keyfile.c:1456
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "無効� PKCS#11 URI \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1497
+#: ../libnm-core/nm-keyfile.c:1500
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "無効�キー/証明書値 data:;base64, � base64 ���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:1506
+#: ../libnm-core/nm-keyfile.c:1509
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "無効�キー/証明書値 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1539
+#: ../libnm-core/nm-keyfile.c:1542
 msgid "invalid key/cert value is not a valid blob"
 msgstr "無効�キー/証明書値��有効�ブロブ���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:1641
+#: ../libnm-core/nm-keyfile.c:1644
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "無効�パリティー値 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:1658 ../libnm-core/nm-keyfile.c:3177
+#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
 #, c-format
 msgid "invalid setting: %s"
 msgstr "無効�設定: %s"
 
-#: ../libnm-core/nm-keyfile.c:1675
+#: ../libnm-core/nm-keyfile.c:1678
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "無効� team 設定を無視: %s"
 
-#: ../libnm-core/nm-keyfile.c:1753
+#: ../libnm-core/nm-keyfile.c:1756
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "無効� qdisc: %s"
 
-#: ../libnm-core/nm-keyfile.c:1799
+#: ../libnm-core/nm-keyfile.c:1802
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "無効� tfilter: %s"
 
-#: ../libnm-core/nm-keyfile.c:3021
+#: ../libnm-core/nm-keyfile.c:3042
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "設定値�ロード中�エラー�発生����: %s"
 
-#: ../libnm-core/nm-keyfile.c:3049 ../libnm-core/nm-keyfile.c:3060
-#: ../libnm-core/nm-keyfile.c:3078 ../libnm-core/nm-keyfile.c:3089
-#: ../libnm-core/nm-keyfile.c:3100 ../libnm-core/nm-keyfile.c:3152
-#: ../libnm-core/nm-keyfile.c:3163
+#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
+#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
+#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
+#: ../libnm-core/nm-keyfile.c:3184
 msgid "value cannot be interpreted as integer"
 msgstr "値�整数���解釈����ん"
 
-#: ../libnm-core/nm-keyfile.c:3198
+#: ../libnm-core/nm-keyfile.c:3219
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "無効�設定� '%s'"
 
-#: ../libnm-core/nm-keyfile.c:3243
+#: ../libnm-core/nm-keyfile.c:3264
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "無効�キー '%s.%s'"
 
-#: ../libnm-core/nm-keyfile.c:3258
+#: ../libnm-core/nm-keyfile.c:3279
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "キー '%s.%s' �ブール値���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:3315
+#: ../libnm-core/nm-keyfile.c:3336
 #, c-format
 msgid "invalid peer public key in section '%s'"
 msgstr "セクション '%s' �ピア公開��無効��"
 
-#: ../libnm-core/nm-keyfile.c:3327
+#: ../libnm-core/nm-keyfile.c:3348
 #, c-format
 msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
 msgstr "キー '%s.%s' ��base64 エンコード���る有効� 256 ビットキー���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:3340
+#: ../libnm-core/nm-keyfile.c:3361
 #, c-format
 msgid "key '%s.%s' is not a valid secret flag"
 msgstr "キー '%s.%s' ��有効�シークレットフラグ���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:3352
+#: ../libnm-core/nm-keyfile.c:3373
 #, c-format
 msgid "key '%s.%s' is not a integer in range 0 to 2^32"
 msgstr "キー '%s.%s' ��0 �ら 2^32 �範囲�整数���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:3364
+#: ../libnm-core/nm-keyfile.c:3385
 #, c-format
 msgid "key '%s.%s' is not a valid endpoint"
 msgstr "キー '%s.%s' ��有効�エンド�イント���り��ん"
 
-#: ../libnm-core/nm-keyfile.c:3386
+#: ../libnm-core/nm-keyfile.c:3407
 #, c-format
 msgid "key '%s.%s' has invalid allowed-ips"
 msgstr "キー '%s.%s' � allowed-ips �無効��"
 
-#: ../libnm-core/nm-keyfile.c:3398
+#: ../libnm-core/nm-keyfile.c:3419
 #, c-format
 msgid "peer '%s' is invalid: %s"
 msgstr "ピア '%s' �無効��: %s"
 
-#: ../libnm-core/nm-setting-6lowpan.c:93
+#: ../libnm-core/nm-setting-6lowpan.c:79
 #, c-format
 msgid "property is not specified"
 msgstr "プロパティー�指定�れ����ん"
 
-#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:301
-#: ../libnm-core/nm-setting-vlan.c:613
+#: ../libnm-core/nm-setting-6lowpan.c:101 ../libnm-core/nm-setting-macsec.c:287
+#: ../libnm-core/nm-setting-vlan.c:600
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
 msgstr "'%s' �値� '%s=%s' �一致���ん"
 
-#: ../libnm-core/nm-setting-6lowpan.c:126
-#: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
-#: ../libnm-core/nm-setting-vlan.c:624 ../libnm-core/nm-setting-vxlan.c:380
+#: ../libnm-core/nm-setting-6lowpan.c:112
+#: ../libnm-core/nm-setting-ip-tunnel.c:337
+#: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
+#: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "'%s' � UUID�インターフェース����れ�も�り��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:225
+#: ../libnm-core/nm-setting-8021x.c:213
 msgid "binary data missing"
 msgstr "�イナリーデータ��り��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:253
+#: ../libnm-core/nm-setting-8021x.c:241
 msgid "URI not NUL terminated"
 msgstr "URI � NUL �����終了����"
 
-#: ../libnm-core/nm-setting-8021x.c:262
+#: ../libnm-core/nm-setting-8021x.c:250
 msgid "URI is empty"
 msgstr "URI �空��"
 
-#: ../libnm-core/nm-setting-8021x.c:270
+#: ../libnm-core/nm-setting-8021x.c:258
 msgid "URI is not valid UTF-8"
 msgstr "URI �有効� UTF-8 ���り��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:288
+#: ../libnm-core/nm-setting-8021x.c:276
 msgid "data missing"
 msgstr "データ��り��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:311 ../libnm-core/nm-setting-8021x.c:678
+#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "証明書�無効��: %s"
 
-#: ../libnm-core/nm-setting-8021x.c:319
+#: ../libnm-core/nm-setting-8021x.c:307
 #, c-format
 msgid "certificate detected as invalid scheme"
 msgstr "証明書�無効�スキーム�検出�れ���"
 
-#: ../libnm-core/nm-setting-8021x.c:533
+#: ../libnm-core/nm-setting-8021x.c:521
 msgid "CA certificate must be in X.509 format"
 msgstr "CA 証明書� X.509 形���る必���り��"
 
-#: ../libnm-core/nm-setting-8021x.c:549
+#: ../libnm-core/nm-setting-8021x.c:537
 msgid "invalid certificate format"
 msgstr "無効�証明書形�"
 
-#: ../libnm-core/nm-setting-8021x.c:688
+#: ../libnm-core/nm-setting-8021x.c:676
 #, 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:2574 ../libnm-core/nm-setting-8021x.c:2591
-#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-core/nm-setting-8021x.c:2639
-#: ../libnm-core/nm-setting-8021x.c:2680 ../libnm-core/nm-setting-8021x.c:2692
-#: ../libnm-core/nm-setting-8021x.c:2710 ../libnm-core/nm-setting-8021x.c:2722
-#: ../libnm-core/nm-setting-8021x.c:2747 ../libnm-core/nm-setting-adsl.c:179
-#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-core/nm-setting-cdma.c:158
-#: ../libnm-core/nm-setting-connection.c:975
-#: ../libnm-core/nm-setting-connection.c:1023
-#: ../libnm-core/nm-setting-gsm.c:284 ../libnm-core/nm-setting-gsm.c:341
-#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
-#: ../libnm-core/nm-setting-ip-config.c:4912
-#: ../libnm-core/nm-setting-ip4-config.c:181
-#: ../libnm-core/nm-setting-ip4-config.c:188
-#: ../libnm-core/nm-setting-pppoe.c:151 ../libnm-core/nm-setting-pppoe.c:160
-#: ../libnm-core/nm-setting-vpn.c:539 ../libnm-core/nm-setting-vpn.c:549
-#: ../libnm-core/nm-setting-wimax.c:117
-#: ../libnm-core/nm-setting-wireless-security.c:960
-#: ../libnm-core/nm-setting-wireless-security.c:984
-#: ../libnm-core/nm-setting.c:1355
+#: ../libnm-core/nm-setting-8021x.c:2581 ../libnm-core/nm-setting-8021x.c:2598
+#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
+#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
+#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
+#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
+#: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
+#: ../libnm-core/nm-setting-connection.c:961
+#: ../libnm-core/nm-setting-connection.c:1009
+#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip4-config.c:167
+#: ../libnm-core/nm-setting-ip4-config.c:174
+#: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
+#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
+#: ../libnm-core/nm-setting-wimax.c:103
+#: ../libnm-core/nm-setting-wireless-security.c:945
+#: ../libnm-core/nm-setting-wireless-security.c:969
+#: ../libnm-core/nm-setting.c:1243
 msgid "property is empty"
 msgstr "プロパティー�空��"
 
-#: ../libnm-core/nm-setting-8021x.c:2604 ../libnm-core/nm-setting-8021x.c:2652
+#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "PKCS#12 � '%s' プロパティー�一致���れ��り��ん"
 
 #: ../libnm-core/nm-setting-8021x.c:2831
-#: ../libnm-core/nm-setting-bluetooth.c:108
-#: ../libnm-core/nm-setting-infiniband.c:176
-#: ../libnm-core/nm-setting-infiniband.c:186
-#: ../libnm-core/nm-setting-ip4-config.c:172
-#: ../libnm-core/nm-setting-ip6-config.c:221
-#: ../libnm-core/nm-setting-ip6-config.c:232
-#: ../libnm-core/nm-setting-olpc-mesh.c:127
-#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:126
-#: ../libnm-core/nm-setting-wired.c:799 ../libnm-core/nm-setting-wired.c:809
-#: ../libnm-core/nm-setting-wireless-security.c:1003
-#: ../libnm-core/nm-setting-wireless-security.c:1012
-#: ../libnm-core/nm-setting-wireless-security.c:1021
-#: ../libnm-core/nm-setting-wireless-security.c:1057
-#: ../libnm-core/nm-setting-wireless-security.c:1067
-#: ../libnm-core/nm-setting-wireless-security.c:1090
+msgid "can be enabled only on Ethernet connections"
+msgstr "イーサ�ット接続���有効化����"
+
+#: ../libnm-core/nm-setting-8021x.c:2849
+#: ../libnm-core/nm-setting-bluetooth.c:94
+#: ../libnm-core/nm-setting-infiniband.c:162
+#: ../libnm-core/nm-setting-infiniband.c:172
+#: ../libnm-core/nm-setting-ip4-config.c:158
+#: ../libnm-core/nm-setting-ip6-config.c:207
+#: ../libnm-core/nm-setting-ip6-config.c:218
+#: ../libnm-core/nm-setting-olpc-mesh.c:113
+#: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
+#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
+#: ../libnm-core/nm-setting-wireless-security.c:988
+#: ../libnm-core/nm-setting-wireless-security.c:997
+#: ../libnm-core/nm-setting-wireless-security.c:1006
+#: ../libnm-core/nm-setting-wireless-security.c:1016
+#: ../libnm-core/nm-setting-wireless-security.c:1026
+#: ../libnm-core/nm-setting-wireless-security.c:1049
+#: ../libnm-core/nm-setting-wireless-security.c:1087
 #: ../libnm-core/nm-setting-wireless-security.c:1128
-#: ../libnm-core/nm-setting-wireless-security.c:1169
-#: ../libnm-core/nm-setting-wireless.c:847
-#: ../libnm-core/nm-setting-wireless.c:856
-#: ../libnm-core/nm-setting-wireless.c:867 ../libnm-core/nm-setting-wpan.c:176
-#: ../libnm-core/nm-utils.c:4543
+#: ../libnm-core/nm-setting-wireless.c:830
+#: ../libnm-core/nm-setting-wireless.c:839
+#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
+#: ../libnm-core/nm-utils.c:4566
 msgid "property is invalid"
 msgstr "プロパティー�無効��"
 
-#: ../libnm-core/nm-setting-8021x.c:2858 ../libnm-core/nm-setting-8021x.c:2870
-#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2911
-#: ../libnm-core/nm-setting-8021x.c:2926 ../libnm-core/nm-setting-adsl.c:191
-#: ../libnm-core/nm-setting-adsl.c:203 ../libnm-core/nm-setting-bluetooth.c:136
-#: ../libnm-core/nm-setting-wireless-security.c:938
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
+#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
+#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
+#: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
+#: ../libnm-core/nm-setting-wireless-security.c:923
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "'%s' �プロパティー�有効�値���り��ん"
 
-#: ../libnm-core/nm-setting-8021x.c:2894
+#: ../libnm-core/nm-setting-8021x.c:2912
 msgid "invalid auth flags"
 msgstr "無効� auth フラグ"
 
-#: ../libnm-core/nm-setting-bluetooth.c:158
+#: ../libnm-core/nm-setting-bluetooth.c:144
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "'%s' 接続�� '%s' ��� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-bluetooth.c:204
+#: ../libnm-core/nm-setting-bluetooth.c:190
 #, c-format
 msgid "'%s' connection requires '%s' setting"
 msgstr "'%s' 接続�� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:541
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "無効�オプション '%s'������値 '%s' ��"
 
-#: ../libnm-core/nm-setting-bond.c:580
+#: ../libnm-core/nm-setting-bond.c:566
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "設定��る�� '%s' � '%s' �一�����"
 
-#: ../libnm-core/nm-setting-bond.c:593
+#: ../libnm-core/nm-setting-bond.c:579
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "必須オプション� '%s' ��り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:603
+#: ../libnm-core/nm-setting-bond.c:589
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "'%s' �有効� '%s' �値���り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:617
+#: ../libnm-core/nm-setting-bond.c:603
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "'%s=%s' � '%s > 0' ��互�性��り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:632
+#: ../libnm-core/nm-setting-bond.c:618
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "'%s' � '%s' オプション�無効��: %s"
 
-#: ../libnm-core/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:629
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "'%s' オプション� '%s=%s' �場���り有効��"
 
-#: ../libnm-core/nm-setting-bond.c:656
+#: ../libnm-core/nm-setting-bond.c:642
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "'%s=%s' � '%s' �有効�設定���り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:669 ../libnm-core/nm-setting-bond.c:678
-#: ../libnm-core/nm-setting-bond.c:698 ../libnm-core/nm-setting-bond.c:734
+#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
+#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "'%s' オプションを使用�る場���'%s' オプションを設定�る必���り��"
 
-#: ../libnm-core/nm-setting-bond.c:709
+#: ../libnm-core/nm-setting-bond.c:695
 #, c-format
 msgid "'%s' option is empty"
 msgstr "'%s' オプション�空白��"
 
-#: ../libnm-core/nm-setting-bond.c:721
+#: ../libnm-core/nm-setting-bond.c:707
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' � '%s' オプション用�有効� IPv4 アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-bond.c:749
+#: ../libnm-core/nm-setting-bond.c:735
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "'%s' オプション�モード '%s' ���有効��"
 
-#: ../libnm-core/nm-setting-bond.c:760
+#: ../libnm-core/nm-setting-bond.c:746
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "'%s' � '%s' �値�����る必���り��"
 
-#: ../libnm-core/nm-setting-bond.c:776
+#: ../libnm-core/nm-setting-bond.c:762
 #, c-format
 msgid "'%s' option should be string"
 msgstr "'%s' オプション�文字列��る必���り��"
 
-#: ../libnm-core/nm-setting-bond.c:792
+#: ../libnm-core/nm-setting-bond.c:778
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "'%s' オプション��'%s' モード��有効���り��ん。"
 
-#: ../libnm-core/nm-setting-bridge-port.c:315
-#: ../libnm-core/nm-setting-ovs-bridge.c:167
-#: ../libnm-core/nm-setting-ovs-interface.c:273
-#: ../libnm-core/nm-setting-ovs-port.c:186
-#: ../libnm-core/nm-setting-team-port.c:313
+#: ../libnm-core/nm-setting-bridge-port.c:301
+#: ../libnm-core/nm-setting-ovs-bridge.c:153
+#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-port.c:172
+#: ../libnm-core/nm-setting-team-port.c:299
 #, c-format
 msgid "missing setting"
 msgstr "設定��り��ん"
 
-#: ../libnm-core/nm-setting-bridge-port.c:326
-#: ../libnm-core/nm-setting-ovs-interface.c:294
-#: ../libnm-core/nm-setting-ovs-port.c:207
-#: ../libnm-core/nm-setting-team-port.c:324
+#: ../libnm-core/nm-setting-bridge-port.c:312
+#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-port.c:193
+#: ../libnm-core/nm-setting-team-port.c:310
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr "'%s' 設定�接続���スレーブタイプ� '%s' �設定�る必���り����'%s' �設定�れ����。"
 
-#: ../libnm-core/nm-setting-bridge.c:910
+#: ../libnm-core/nm-setting-bridge.c:896
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "値 '%d' � <%d-%d> �範囲外��"
 
-#: ../libnm-core/nm-setting-bridge.c:927
+#: ../libnm-core/nm-setting-bridge.c:913
 msgid "is not a valid MAC address"
 msgstr "�有効� MAC アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-bridge.c:968
+#: ../libnm-core/nm-setting-bridge.c:954
 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:945
+#: ../libnm-core/nm-setting-connection.c:931
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "タイプ '%s' �接続��設定�必���"
 
-#: ../libnm-core/nm-setting-connection.c:984
+#: ../libnm-core/nm-setting-connection.c:970
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' �有効� UUID ���り��ん"
 
-#: ../libnm-core/nm-setting-connection.c:1034
+#: ../libnm-core/nm-setting-connection.c:1020
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "接続タイプ '%s' �無効��"
 
-#: ../libnm-core/nm-setting-connection.c:1070
+#: ../libnm-core/nm-setting-connection.c:1056
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "�明�スレーブタイプ '%s'"
 
-#: ../libnm-core/nm-setting-connection.c:1081
+#: ../libnm-core/nm-setting-connection.c:1067
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "スレーブ接続��有効� '%s' プロパティー�必���"
 
-#: ../libnm-core/nm-setting-connection.c:1102
+#: ../libnm-core/nm-setting-connection.c:1088
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "'%s' を '%s' ���設定����ん"
 
-#: ../libnm-core/nm-setting-connection.c:1116
+#: ../libnm-core/nm-setting-connection.c:1102
 #, c-format
 msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "'%s' 接続��'%s' ���� '%s' �スレーブ化�れる必���り��"
 
-#: ../libnm-core/nm-setting-connection.c:1130
+#: ../libnm-core/nm-setting-connection.c:1116
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "測定値 %d �無効��"
 
-#: ../libnm-core/nm-setting-connection.c:1141
-#: ../libnm-core/nm-setting-connection.c:1152
-#: ../libnm-core/nm-setting-connection.c:1165
+#: ../libnm-core/nm-setting-connection.c:1127
+#: ../libnm-core/nm-setting-connection.c:1138
+#: ../libnm-core/nm-setting-connection.c:1151
 #, c-format
 msgid "value %d is not valid"
 msgstr "値 %d �無効��"
 
-#: ../libnm-core/nm-setting-connection.c:1178
+#: ../libnm-core/nm-setting-connection.c:1164
 #, c-format
 msgid "wait-device-timeout requires %s"
 msgstr "wait-device-timeout ���%s �必���"
 
-#: ../libnm-core/nm-setting-connection.c:1200
+#: ../libnm-core/nm-setting-connection.c:1186
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "プロパティータイプ� '%s' �設定�る必���り��"
 
-#: ../libnm-core/nm-setting-connection.c:1215
+#: ../libnm-core/nm-setting-connection.c:1201
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "スレーブタイプ '%s' �接続�� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-connection.c:1225
+#: ../libnm-core/nm-setting-connection.c:1211
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr "'%s' �設定�れ��ートタイプ� '%s' �スレーブ接続を検出���。'%s' � '%s' �設定�る必���り��"
 
-#: ../libnm-core/nm-setting-connection.c:1242
+#: ../libnm-core/nm-setting-connection.c:1228
 #, 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:506
+#: ../libnm-core/nm-setting-dcb.c:492
 msgid "flags invalid"
 msgstr "フラグ�無効��"
 
-#: ../libnm-core/nm-setting-dcb.c:515
+#: ../libnm-core/nm-setting-dcb.c:501
 msgid "flags invalid - disabled"
 msgstr "フラグ�無効�� - 無効"
 
-#: ../libnm-core/nm-setting-dcb.c:541 ../libnm-core/nm-setting-dcb.c:590
+#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
 msgid "property invalid (not enabled)"
 msgstr "プロパティー�無効�� (有効�������ん)"
 
-#: ../libnm-core/nm-setting-dcb.c:550
+#: ../libnm-core/nm-setting-dcb.c:536
 msgid "element invalid"
 msgstr "エレメント�無効��"
 
-#: ../libnm-core/nm-setting-dcb.c:565
+#: ../libnm-core/nm-setting-dcb.c:551
 msgid "sum not 100%"
 msgstr "�計� 100% ���り��ん"
 
-#: ../libnm-core/nm-setting-dcb.c:599 ../libnm-core/nm-setting-dcb.c:631
+#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
 msgid "property invalid"
 msgstr "プロパティー�無効��"
 
-#: ../libnm-core/nm-setting-dcb.c:621
+#: ../libnm-core/nm-setting-dcb.c:607
 msgid "property missing"
 msgstr "プロパティー��り��ん"
 
-#: ../libnm-core/nm-setting-ethtool.c:305
+#: ../libnm-core/nm-setting-ethtool.c:291
 msgid "unsupported offload feature"
 msgstr "サ�ート�れ����オフロード機能"
 
-#: ../libnm-core/nm-setting-ethtool.c:313
+#: ../libnm-core/nm-setting-ethtool.c:299
 msgid "offload feature has invalid variant type"
 msgstr "オフロード機能���無効��リアントタイプ��り��"
 
-#: ../libnm-core/nm-setting-ethtool.c:336
+#: ../libnm-core/nm-setting-ethtool.c:322
 #, c-format
 msgid "unknown ethtool option '%s'"
 msgstr "�明� ethtool オプション '%s'"
 
-#: ../libnm-core/nm-setting-gsm.c:297
+#: ../libnm-core/nm-setting-gsm.c:302
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "プロパティー値 '%s' �空白����長���� (>64)"
 
-#: ../libnm-core/nm-setting-gsm.c:329
+#: ../libnm-core/nm-setting-gsm.c:334
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "'%s' �無効�文字���れ���� ([A-Za-z._-] を使用������)"
 
-#: ../libnm-core/nm-setting-gsm.c:355
+#: ../libnm-core/nm-setting-gsm.c:361
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' �長��無効�� (5 ���� 6 ��������)"
 
-#: ../libnm-core/nm-setting-gsm.c:366
+#: ../libnm-core/nm-setting-gsm.c:372
 #, c-format
 msgid "'%s' is not a number"
 msgstr "'%s' �数字���り��ん"
 
-#: ../libnm-core/nm-setting-gsm.c:400
+#: ../libnm-core/nm-setting-gsm.c:406
 msgid "property is empty or wrong size"
 msgstr "プロパティー�空����間���サイズ��"
 
-#: ../libnm-core/nm-setting-gsm.c:410
+#: ../libnm-core/nm-setting-gsm.c:416
 msgid "property must contain only digits"
 msgstr "プロパティー��数字����る�������"
 
-#: ../libnm-core/nm-setting-infiniband.c:207
+#: ../libnm-core/nm-setting-gsm.c:428
+msgid "can't be enabled when manual configuration is present"
+msgstr "手動設定�存在�る場��有効化����ん"
+
+#: ../libnm-core/nm-setting-infiniband.c:193
 msgid "Must specify a P_Key if specifying parent"
 msgstr "親を指定���る場�� P_Key を指定�る必���り��"
 
-#: ../libnm-core/nm-setting-infiniband.c:217
+#: ../libnm-core/nm-setting-infiniband.c:203
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "InfiniBand P_Key 接続�親インターフェース��指定�れ����ん���"
 
-#: ../libnm-core/nm-setting-infiniband.c:255
+#: ../libnm-core/nm-setting-infiniband.c:241
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr "ソフトウェア infiniband デ�イス�インターフェース�� '%s' ��る��未設定��る必���り�� (実際�� '%s')"
 
-#: ../libnm-core/nm-setting-infiniband.c:279
+#: ../libnm-core/nm-setting-infiniband.c:265
 #, c-format
 msgid "mtu can be at most %u but it is %u"
 msgstr "mtu �最大� %u ��り得����%u ��"
 
-#: ../libnm-core/nm-setting-ip-config.c:134
+#: ../libnm-core/nm-setting-ip-config.c:120
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "IPv4 アドレス��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:134
+#: ../libnm-core/nm-setting-ip-config.c:120
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "IPv6 アドレス��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:139
+#: ../libnm-core/nm-setting-ip-config.c:125
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "無効� IPv4 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:139
+#: ../libnm-core/nm-setting-ip-config.c:125
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "無効� IPv6 アドレス '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:154
+#: ../libnm-core/nm-setting-ip-config.c:140
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "無効� IPv4 アドレスプレフィックス '%u'"
 
-#: ../libnm-core/nm-setting-ip-config.c:154
+#: ../libnm-core/nm-setting-ip-config.c:140
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "無効� IPv6 アドレスプレフィックス '%u'"
 
-#: ../libnm-core/nm-setting-ip-config.c:169
+#: ../libnm-core/nm-setting-ip-config.c:155
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "無効�ルーティングメトリック '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:417
+#: ../libnm-core/nm-setting-ip-config.c:1282
+#: ../libnm-core/nm-setting-sriov.c:409
 msgid "unknown attribute"
 msgstr "�明�属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:427
+#: ../libnm-core/nm-setting-ip-config.c:1292
+#: ../libnm-core/nm-setting-sriov.c:419
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "無効�属性タイプ '%s'"
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1303
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "属性� IPv4 ルート��無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1304
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "属性� IPv6 ルート��無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
+#: ../libnm-core/nm-setting-ip-config.c:1318
+#: ../libnm-core/nm-setting-ip-config.c:1346
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "'%s' �有効� IPv4 アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
+#: ../libnm-core/nm-setting-ip-config.c:1319
+#: ../libnm-core/nm-setting-ip-config.c:1347
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "'%s' �有効� IPv6 アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
+#: ../libnm-core/nm-setting-ip-config.c:1337
 #, c-format
 msgid "invalid prefix %s"
 msgstr "無効�プレフィックス %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2515
+#: ../libnm-core/nm-setting-ip-config.c:2513
 msgid "invalid priority"
 msgstr "無効�優先度"
 
-#: ../libnm-core/nm-setting-ip-config.c:2526
+#: ../libnm-core/nm-setting-ip-config.c:2524
 msgid "missing table"
 msgstr "テーブル��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2532
+#: ../libnm-core/nm-setting-ip-config.c:2530
 msgid "invalid action"
-msgstr "無効�アクション "
+msgstr "無効�アクション"
 
-#: ../libnm-core/nm-setting-ip-config.c:2539
+#: ../libnm-core/nm-setting-ip-config.c:2537
 msgid "has from/src but the prefix-length is zero"
 msgstr "from/src ����も�プレフィックス長�ゼロ��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2546
+#: ../libnm-core/nm-setting-ip-config.c:2544
 msgid "missing from/src for a non zero prefix-length"
 msgstr "ゼロ����プレフィックス長�� from/src ��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2551
+#: ../libnm-core/nm-setting-ip-config.c:2549
 msgid "invalid from/src"
 msgstr "無効� from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2556
+#: ../libnm-core/nm-setting-ip-config.c:2554
 msgid "invalid prefix length for from/src"
 msgstr "from/src �プレフィックス長�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2563
+#: ../libnm-core/nm-setting-ip-config.c:2561
 msgid "has to/dst but the prefix-length is zero"
 msgstr "to/dst ����も�プレフィックス長�ゼロ��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2570
+#: ../libnm-core/nm-setting-ip-config.c:2568
 msgid "missing to/dst for a non zero prefix-length"
 msgstr "ゼロ����プレフィックス長�� to/dst ��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2575
+#: ../libnm-core/nm-setting-ip-config.c:2573
 msgid "invalid to/dst"
 msgstr "無効� to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2580
+#: ../libnm-core/nm-setting-ip-config.c:2578
 msgid "invalid prefix length for to/dst"
 msgstr "to/dst �プレフィックス長�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2588
+#: ../libnm-core/nm-setting-ip-config.c:2586
 msgid "invalid iifname"
 msgstr "無効� iifname"
 
-#: ../libnm-core/nm-setting-ip-config.c:2596
+#: ../libnm-core/nm-setting-ip-config.c:2594
 msgid "invalid oifname"
 msgstr "無効� oifname"
 
-#: ../libnm-core/nm-setting-ip-config.c:2602
+#: ../libnm-core/nm-setting-ip-config.c:2600
 msgid "invalid source port range"
 msgstr "ソース�ート�範囲�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2606
 msgid "invalid destination port range"
 msgstr "接続先�ート�範囲�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2616
+#: ../libnm-core/nm-setting-ip-config.c:2614
 msgid "suppress_prefixlength out of range"
 msgstr "suppress_prefixlength �範囲外��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2621
+#: ../libnm-core/nm-setting-ip-config.c:2619
 msgid "suppress_prefixlength is only allowed with the to-table action"
 msgstr "suppress_prefixlength ��to-table アクション���許��れ��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2728
+#: ../libnm-core/nm-setting-ip-config.c:2726
 #, c-format
 msgid "duplicate key %s"
 msgstr "�複キー %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2742
+#: ../libnm-core/nm-setting-ip-config.c:2740
 #, c-format
 msgid "invalid key \"%s\""
 msgstr "無効�キー \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:2755
+#: ../libnm-core/nm-setting-ip-config.c:2753
 #, c-format
 msgid "invalid variant type '%s' for \"%s\""
 msgstr "\"%s\" ��リアントタイプ '%s' �無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2764
+#: ../libnm-core/nm-setting-ip-config.c:2762
 msgid "missing \""
 msgstr "\" ��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2770
+#: ../libnm-core/nm-setting-ip-config.c:2768
 msgid "invalid \""
 msgstr "\" �無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:2967
+#: ../libnm-core/nm-setting-ip-config.c:2965
 msgid "Unsupported to-string-flags argument"
 msgstr "to-string-flags 引数�サ�ート�れ����ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:2974
+#: ../libnm-core/nm-setting-ip-config.c:2972
 msgid "Unsupported extra-argument"
 msgstr "サ�ート���追加�引数"
 
-#: ../libnm-core/nm-setting-ip-config.c:3240
+#: ../libnm-core/nm-setting-ip-config.c:3239
 #, c-format
 msgid "unsupported key \"%s\""
 msgstr "サ�ート�れ����キー \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:3245
+#: ../libnm-core/nm-setting-ip-config.c:3244
 #, c-format
 msgid "duplicate key \"%s\""
 msgstr "�複キー \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:3250
+#: ../libnm-core/nm-setting-ip-config.c:3249
 #, c-format
 msgid "invalid value for \"%s\""
 msgstr "\"%s\" �値�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:3260
+#: ../libnm-core/nm-setting-ip-config.c:3259
 msgid "empty text does not describe a rule"
 msgstr "空�テキスト�ルールを説明�����ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:3266
+#: ../libnm-core/nm-setting-ip-config.c:3265
 #, c-format
 msgid "missing argument for \"%s\""
 msgstr "\"%s\" �引数��り��ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:3278
+#: ../libnm-core/nm-setting-ip-config.c:3277
 msgid "invalid \"from\" part"
 msgstr "\"from\" �部分�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:3292
+#: ../libnm-core/nm-setting-ip-config.c:3291
 msgid "invalid \"to\" part"
 msgstr "\"to\" �部分�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:3301
+#: ../libnm-core/nm-setting-ip-config.c:3300
 #, c-format
 msgid "cannot detect address family for rule"
 msgstr "ルール�アドレスファミリーを検出����ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:3361
-#: ../libnm-core/nm-setting-ip-config.c:3455
+#: ../libnm-core/nm-setting-ip-config.c:3360
+#: ../libnm-core/nm-setting-ip-config.c:3454
 #, c-format
 msgid "rule is invalid: %s"
 msgstr "ルール�無効��: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:3438
+#: ../libnm-core/nm-setting-ip-config.c:3437
 msgid "invalid address family"
 msgstr "アドレスファミリー�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:4707
+#: ../libnm-core/nm-setting-ip-config.c:4710
 #, c-format
 msgid "rule #%u is invalid: %s"
 msgstr "ルール #%u �無効��: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:4925
+#: ../libnm-core/nm-setting-ip-config.c:4966
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d. DNS サー�ーアドレス�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:4941
+#: ../libnm-core/nm-setting-ip-config.c:4982
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d. IP アドレス�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip-config.c:4994
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. IP アドレス���無効�タイプ� 'label' プロパティー��り��"
 
-#: ../libnm-core/nm-setting-ip-config.c:4962
+#: ../libnm-core/nm-setting-ip-config.c:5003
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d. IP アドレス���無効�ラベル '%s' ��り��"
 
-#: ../libnm-core/nm-setting-ip-config.c:4976
+#: ../libnm-core/nm-setting-ip-config.c:5017
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "アドレス�設定�れ��場���ゲートウェイを設定����ん"
 
-#: ../libnm-core/nm-setting-ip-config.c:4985
+#: ../libnm-core/nm-setting-ip-config.c:5026
 msgid "gateway is invalid"
 msgstr "ゲートウェイ�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:4999
+#: ../libnm-core/nm-setting-ip-config.c:5040
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ルート�無効��"
 
-#: ../libnm-core/nm-setting-ip-config.c:5008
-#, c-format
-msgid "%d. route cannot be a default route"
-msgstr "%d. ルートをデフォルトルート��る�������ん"
-
-#: ../libnm-core/nm-setting-ip-config.c:5024
+#: ../libnm-core/nm-setting-ip-config.c:5056
 #, c-format
 msgid "%u. rule has wrong address-family"
 msgstr "%u. ルール�アドレスファミリー�間������"
 
-#: ../libnm-core/nm-setting-ip-config.c:5033
+#: ../libnm-core/nm-setting-ip-config.c:5065
 #, c-format
 msgid "%u. rule is invalid: %s"
 msgstr "%u. ルール�無効��: %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:5046
+#: ../libnm-core/nm-setting-ip-config.c:5079
+#, c-format
+msgid "'%s' is not a valid IAID"
+msgstr "'%s' �有効� IAID ���り��ん"
+
+#: ../libnm-core/nm-setting-ip-config.c:5093
+#, c-format
+msgid "the property cannot be set when '%s' is disabled"
+msgstr "'%s' �無効�場��プロパティー�設定����ん"
+
+#: ../libnm-core/nm-setting-ip-config.c:5115
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "ゲートウェイ� '%s' �互�性��り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:339
+#: ../libnm-core/nm-setting-ip-tunnel.c:325
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr "'%d' �有効�トン�ルモード���り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:362
-#: ../libnm-core/nm-setting-ip-tunnel.c:382
+#: ../libnm-core/nm-setting-ip-tunnel.c:348
+#: ../libnm-core/nm-setting-ip-tunnel.c:368
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "'%s' �有効� IPv%c アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:399
+#: ../libnm-core/nm-setting-ip-tunnel.c:385
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "トン�ルキー� GRE トン�ル�対����指定����"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:412
-#: ../libnm-core/nm-setting-ip-tunnel.c:428
+#: ../libnm-core/nm-setting-ip-tunnel.c:398
+#: ../libnm-core/nm-setting-ip-tunnel.c:414
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "'%s' �有効�トン�ルキー���り��ん"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:440
+#: ../libnm-core/nm-setting-ip-tunnel.c:426
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "固定 TTL ��パス MTU 検出�有効�場���許��れ��"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:453
+#: ../libnm-core/nm-setting-ip-tunnel.c:439
 #, c-format
 msgid "some flags are invalid for the select mode: %s"
 msgstr "�択�れ�モード�対��一部�フラグ�無効��: %s"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:467
+#: ../libnm-core/nm-setting-ip-tunnel.c:453
 #, c-format
 msgid "wired setting not allowed for mode %s"
 msgstr "モード %s ��有線設定�許��れ����ん"
 
-#: ../libnm-core/nm-setting-ip4-config.c:126
-#: ../libnm-core/nm-setting-ip6-config.c:173
+#: ../libnm-core/nm-setting-ip4-config.c:112
+#: ../libnm-core/nm-setting-ip6-config.c:159
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "'%s=%s' ���プロパティーを空��る�������ん"
 
-#: ../libnm-core/nm-setting-ip4-config.c:138
-#: ../libnm-core/nm-setting-ip4-config.c:148
-#: ../libnm-core/nm-setting-ip4-config.c:160
-#: ../libnm-core/nm-setting-ip6-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:198
-#: ../libnm-core/nm-setting-ip6-config.c:208
+#: ../libnm-core/nm-setting-ip4-config.c:124
+#: ../libnm-core/nm-setting-ip4-config.c:134
+#: ../libnm-core/nm-setting-ip4-config.c:146
+#: ../libnm-core/nm-setting-ip6-config.c:174
+#: ../libnm-core/nm-setting-ip6-config.c:184
+#: ../libnm-core/nm-setting-ip6-config.c:194
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "��プロパティー� '%s=%s' ��許��れ����ん"
 
-#: ../libnm-core/nm-setting-ip4-config.c:197
+#: ../libnm-core/nm-setting-ip4-config.c:183
 #, c-format
 msgid "'%s' is not a valid FQDN"
 msgstr "'%s' �有効� FQDN ���り��ん"
 
-#: ../libnm-core/nm-setting-ip4-config.c:206
+#: ../libnm-core/nm-setting-ip4-config.c:192
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr "dhcp-hostname も設定�れ��る場���プロパティーを設定����ん"
 
-#: ../libnm-core/nm-setting-ip4-config.c:218
+#: ../libnm-core/nm-setting-ip4-config.c:204
+msgid "FQDN flags requires a FQDN set"
+msgstr "FQDN フラグ�� FQDN 設定�必���"
+
+#: ../libnm-core/nm-setting-ip4-config.c:216
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
 msgstr "'%s=%s' ��複数�アドレス�許��れ����ん"
 
-#: ../libnm-core/nm-setting-ip4-config.c:232
+#: ../libnm-core/nm-setting-ip4-config.c:230
 msgid "property should be TRUE when method is set to disabled"
 msgstr "メソッド�無効�設定�れ��る場���プロパティー� TRUE ����"
 
-#: ../libnm-core/nm-setting-ip6-config.c:247
+#: ../libnm-core/nm-setting-ip6-config.c:233
 msgid "value is not a valid token"
 msgstr "値�有効�トークン���り��ん"
 
-#: ../libnm-core/nm-setting-ip6-config.c:258
+#: ../libnm-core/nm-setting-ip6-config.c:244
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "EUI64 アドレス生�モード�����味�通���"
 
-#: ../libnm-core/nm-setting-ip6-config.c:269
+#: ../libnm-core/nm-setting-ip6-config.c:255
 msgid "invalid DUID"
 msgstr "無効� DUID"
 
-#: ../libnm-core/nm-setting-ip6-config.c:281
+#: ../libnm-core/nm-setting-ip6-config.c:267
 msgid "token is not in canonical form"
 msgstr "トークン�正�形����り��ん"
 
-#: ../libnm-core/nm-setting-ip6-config.c:294
+#: ../libnm-core/nm-setting-ip6-config.c:280
 msgid "property should be TRUE when method is set to ignore or disabled"
 msgstr "メソッド� ignore ���無効�設定�れ��る場���プロパティー� TRUE ����"
 
-#: ../libnm-core/nm-setting-macsec.c:245
+#: ../libnm-core/nm-setting-macsec.c:231
 msgid "the key is empty"
 msgstr "キー�空��"
 
-#: ../libnm-core/nm-setting-macsec.c:256
+#: ../libnm-core/nm-setting-macsec.c:242
 #, c-format
 msgid "the key must be %d characters"
 msgstr "キー� %d 文字��る必���り��"
 
-#: ../libnm-core/nm-setting-macsec.c:264
+#: ../libnm-core/nm-setting-macsec.c:250
 msgid "the key contains non-hexadecimal characters"
 msgstr "キー� 16 進数���文字���れ����"
 
-#: ../libnm-core/nm-setting-macsec.c:326 ../libnm-core/nm-setting-macvlan.c:155
-#: ../libnm-core/nm-setting-vlan.c:638
+#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
+#: ../libnm-core/nm-setting-vlan.c:625
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "プロパティー�よ� '%s:%s' ���れも指定�れ����ん"
 
-#: ../libnm-core/nm-setting-macsec.c:347
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "EAP キー管��� '%s' 設定�必���"
 
-#: ../libnm-core/nm-setting-macsec.c:356
+#: ../libnm-core/nm-setting-macsec.c:342
 msgid "must be either psk (0) or eap (1)"
 msgstr "PSK (0) ��� EAP (1) ���れ����れ��り��ん"
 
-#: ../libnm-core/nm-setting-macsec.c:365
+#: ../libnm-core/nm-setting-macsec.c:351
 #, c-format
 msgid "invalid port %d"
 msgstr "無効��ート %d"
 
-#: ../libnm-core/nm-setting-macsec.c:376
+#: ../libnm-core/nm-setting-macsec.c:362
 msgid "only valid for psk mode"
 msgstr "PSK モード���有効��"
 
-#: ../libnm-core/nm-setting-macvlan.c:166
+#: ../libnm-core/nm-setting-macvlan.c:152
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "�プロミスキャス�作�パススルーモード���許��れ��"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:108
-#: ../libnm-core/nm-setting-wireless.c:786
+#: ../libnm-core/nm-setting-olpc-mesh.c:94
+#: ../libnm-core/nm-setting-wireless.c:769
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "SSID �長��範囲外 <1-32> �イト��"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:117
-#: ../libnm-core/nm-setting-wireless.c:826
+#: ../libnm-core/nm-setting-olpc-mesh.c:103
+#: ../libnm-core/nm-setting-wireless.c:809
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "'%d' �無効��ャン�ル��"
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:176
+#: ../libnm-core/nm-setting-ovs-bridge.c:162
 #, c-format
 msgid "A connection with a '%s' setting must not have a master."
 msgstr "'%s' 設定�接続���マスター�必��り��ん。"
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:187
+#: ../libnm-core/nm-setting-ovs-bridge.c:173
 #, c-format
 msgid "'%s' is not allowed in fail_mode"
 msgstr "'%s' ��fail_mode ��利用����ん。"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:108
+#: ../libnm-core/nm-setting-ovs-interface.c:94
 #, c-format
 msgid "'%s' is not a valid interface type"
 msgstr "'%s' ��有効�インターフェースタイプ���り��ん"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:130
+#: ../libnm-core/nm-setting-ovs-interface.c:116
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr "'%s' 設定�接続���connection.type を明示的�設定�る必���り��"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:142
+#: ../libnm-core/nm-setting-ovs-interface.c:128
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
 msgstr "'%s' タイプ�接続���ovs-interface.type � \"system\" を設定����ん"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:154
+#: ../libnm-core/nm-setting-ovs-interface.c:140
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
 msgstr "'%s' タイプ�接続���ovs-interface.type � \"%s\" を設定����ん"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:159
 #, c-format
 msgid "A connection can not have both '%s' and '%s' settings at the same time"
 msgstr "接続��'%s' �よ� '%s' �両方を�時�設定�る�������ん"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:187
+#: ../libnm-core/nm-setting-ovs-interface.c:173
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
-msgstr ""
-"'%s' 設定�接続���connection.type � \"ovs-interface\" �設定�る必���り����\"%s\" "
-"�設定�れ����。"
+msgstr "'%s' 設定�接続���connection.type � \"ovs-interface\" �設定�る必���り����\"%s\" �設定�れ����。"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:199
+#: ../libnm-core/nm-setting-ovs-interface.c:185
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
 msgstr "'%s' 設定�接続���インターフェースタイプを '%s' ���� '%s' ��る必���り��。"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:215
+#: ../libnm-core/nm-setting-ovs-interface.c:201
 #, c-format
-msgid ""
-"A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
+msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr "ovs-interface.type '%s' 設定�接続���'ovs-patch' �設定�れ����。"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:235
+#: ../libnm-core/nm-setting-ovs-interface.c:221
 #, c-format
 msgid "Missing ovs interface setting"
 msgstr "ovs インターフェース設定��り��ん"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:241
+#: ../libnm-core/nm-setting-ovs-interface.c:227
 #, c-format
 msgid "Missing ovs interface type"
 msgstr "ovs インターフェース�タイプ��り��ん"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:282
-#: ../libnm-core/nm-setting-ovs-port.c:195
+#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-port.c:181
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
 msgstr "'%s' 設定�接続��マスター�必���。"
 
-#: ../libnm-core/nm-setting-ovs-patch.c:103
-#: ../libnm-core/nm-setting-vxlan.c:352
+#: ../libnm-core/nm-setting-ovs-patch.c:89 ../libnm-core/nm-setting-vxlan.c:338
 #, c-format
 msgid "'%s' is not a valid IP address"
 msgstr "'%s' ��有効� IP アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-ovs-port.c:220
+#: ../libnm-core/nm-setting-ovs-port.c:206
 #, c-format
 msgid "'%s' is not allowed in vlan_mode"
 msgstr "'%s' ��vlan_mode ��利用����ん"
 
-#: ../libnm-core/nm-setting-ovs-port.c:230
+#: ../libnm-core/nm-setting-ovs-port.c:216
 #, c-format
 msgid "the tag id must be in range 0-4094 but is %u"
 msgstr "タグ ID � 0 - 4094 �範囲内��る必���り����%u ��"
 
-#: ../libnm-core/nm-setting-ovs-port.c:240
+#: ../libnm-core/nm-setting-ovs-port.c:226
 #, c-format
 msgid "'%s' is not allowed in lacp"
 msgstr "'%s' ��lacp ��利用����ん"
 
-#: ../libnm-core/nm-setting-ovs-port.c:250
+#: ../libnm-core/nm-setting-ovs-port.c:236
 #, c-format
 msgid "'%s' is not allowed in bond_mode"
 msgstr "'%s' ��bond_mode ��利用����ん"
 
-#: ../libnm-core/nm-setting-ppp.c:350
+#: ../libnm-core/nm-setting-ppp.c:336
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "'%d' �有効�範囲 <128-16384> �外��り��"
 
-#: ../libnm-core/nm-setting-ppp.c:363
+#: ../libnm-core/nm-setting-ppp.c:349
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr "��プロパティーを設定�る��ゼロ以外� '%s' プロパティー�必���"
 
-#: ../libnm-core/nm-setting-proxy.c:146
+#: ../libnm-core/nm-setting-proxy.c:132
 #, c-format
 msgid "invalid proxy method"
 msgstr "無効�プロキシメソッド"
 
-#: ../libnm-core/nm-setting-proxy.c:156 ../libnm-core/nm-setting-proxy.c:165
+#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "��プロパティー��メソッド none ��許��れ����ん"
 
-#: ../libnm-core/nm-setting-proxy.c:176
+#: ../libnm-core/nm-setting-proxy.c:162
 #, c-format
 msgid "the script is too large"
 msgstr "スクリプト�長����"
 
-#: ../libnm-core/nm-setting-proxy.c:184
+#: ../libnm-core/nm-setting-proxy.c:170
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "スクリプト�有効� utf8 ���り��ん"
 
-#: ../libnm-core/nm-setting-proxy.c:192
+#: ../libnm-core/nm-setting-proxy.c:178
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "スクリプト�� FindProxyForURL 関数��り��ん"
 
-#: ../libnm-core/nm-setting-sriov.c:1074
+#: ../libnm-core/nm-setting-sriov.c:1066
 #, c-format
 msgid "VF with index %u, but the total number of VFs is %u"
 msgstr "インデックス %u を�� VF ����VF ��数� %u ��"
 
-#: ../libnm-core/nm-setting-sriov.c:1085
+#: ../libnm-core/nm-setting-sriov.c:1077
 #, c-format
 msgid "invalid VF %u: %s"
 msgstr "無効� VF %u: %s"
 
-#: ../libnm-core/nm-setting-sriov.c:1097
+#: ../libnm-core/nm-setting-sriov.c:1089
 #, c-format
 msgid "duplicate VF index %u"
 msgstr "VF インデックス %u を複製���"
 
-#: ../libnm-core/nm-setting-sriov.c:1118
+#: ../libnm-core/nm-setting-sriov.c:1110
 #, c-format
 msgid "VFs %d and %d are not sorted by ascending index"
 msgstr "VFs %d �よ� %d ��上昇�るインデックス�ソート�れ��ん"
 
-#: ../libnm-core/nm-setting-tc-config.c:70
-#: ../libnm-core/nm-setting-tc-config.c:436
-#: ../libnm-core/nm-setting-tc-config.c:706
+#: ../libnm-core/nm-setting-tc-config.c:56
+#: ../libnm-core/nm-setting-tc-config.c:422
+#: ../libnm-core/nm-setting-tc-config.c:692
 #, c-format
 msgid "kind is missing"
 msgstr "kind ��り��ん"
 
-#: ../libnm-core/nm-setting-tc-config.c:78
-#: ../libnm-core/nm-setting-tc-config.c:444
-#: ../libnm-core/nm-setting-tc-config.c:714
+#: ../libnm-core/nm-setting-tc-config.c:64
+#: ../libnm-core/nm-setting-tc-config.c:430
+#: ../libnm-core/nm-setting-tc-config.c:700
 #, c-format
 msgid "'%s' is not a valid kind"
 msgstr "'%s' �有効� kind ���り��ん。"
 
-#: ../libnm-core/nm-setting-tc-config.c:86
-#: ../libnm-core/nm-setting-tc-config.c:722
+#: ../libnm-core/nm-setting-tc-config.c:72
+#: ../libnm-core/nm-setting-tc-config.c:708
 msgid "parent handle missing"
 msgstr "親�ンドラー��り��ん。"
 
-#: ../libnm-core/nm-setting-tc-config.c:1292
+#: ../libnm-core/nm-setting-tc-config.c:1278
 msgid "there are duplicate TC qdiscs"
 msgstr "複製 TC qdiscs ��り��"
 
-#: ../libnm-core/nm-setting-tc-config.c:1312
+#: ../libnm-core/nm-setting-tc-config.c:1298
 msgid "there are duplicate TC filters"
 msgstr "複製 TC フィルター��り��"
 
-#: ../libnm-core/nm-setting-team.c:129 ../libnm-core/nm-setting-team.c:190
-#: ../libnm-core/nm-setting-team.c:312
+#: ../libnm-core/nm-setting-team.c:115 ../libnm-core/nm-setting-team.c:176
+#: ../libnm-core/nm-setting-team.c:298
 #, c-format
 msgid "%s is out of range [0, %d]"
 msgstr "%s � [0, %d] �範囲外��"
 
-#: ../libnm-core/nm-setting-team.c:172
+#: ../libnm-core/nm-setting-team.c:158
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
 msgstr "nsna_ping リンクウォッ�ャー� target-host ��り��ん"
 
-#: ../libnm-core/nm-setting-team.c:178 ../libnm-core/nm-setting-team.c:294
+#: ../libnm-core/nm-setting-team.c:164 ../libnm-core/nm-setting-team.c:280
 #, c-format
 msgid "target-host '%s' contains invalid characters"
 msgstr "target-host '%s' ��無効�文字���れ����。"
 
-#: ../libnm-core/nm-setting-team.c:287
+#: ../libnm-core/nm-setting-team.c:273
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
 msgstr "arp_ping リンクウォッ�ャー� %s ��り��ん"
 
-#: ../libnm-core/nm-setting-team.c:300
+#: ../libnm-core/nm-setting-team.c:286
 #, c-format
 msgid "source-host '%s' contains invalid characters"
 msgstr "source-host '%s' �無効�文字���れ����"
 
-#: ../libnm-core/nm-setting-team.c:318
+#: ../libnm-core/nm-setting-team.c:304
 msgid "vlanid is out of range [-1, 4094]"
 msgstr "vlanid � [-1, 4094] �範囲外��"
 
-#: ../libnm-core/nm-setting-tun.c:165
+#: ../libnm-core/nm-setting-tun.c:151
 #, c-format
 msgid "'%u': invalid mode"
 msgstr "'%u': 無効�モード"
 
-#: ../libnm-core/nm-setting-tun.c:175
+#: ../libnm-core/nm-setting-tun.c:161
 #, c-format
 msgid "'%s': invalid user ID"
 msgstr "'%s': 無効�ユーザー ID"
 
-#: ../libnm-core/nm-setting-tun.c:186
+#: ../libnm-core/nm-setting-tun.c:172
 #, c-format
 msgid "'%s': invalid group ID"
 msgstr "'%s': 無効�グループ ID"
 
-#: ../libnm-core/nm-setting-user.c:107
+#: ../libnm-core/nm-setting-user.c:93
 msgid "missing key"
 msgstr "キー��り��ん"
 
-#: ../libnm-core/nm-setting-user.c:113
+#: ../libnm-core/nm-setting-user.c:99
 msgid "key is too long"
 msgstr "キー�長����"
 
-#: ../libnm-core/nm-setting-user.c:118
+#: ../libnm-core/nm-setting-user.c:104
 msgid "key must be UTF8"
 msgstr "キー� UTF-8 ��る必���り��"
 
-#: ../libnm-core/nm-setting-user.c:141
+#: ../libnm-core/nm-setting-user.c:127
 msgid "key requires a '.' for a namespace"
 msgstr "キー��ームスペース� '.' �必���"
 
-#: ../libnm-core/nm-setting-user.c:154
+#: ../libnm-core/nm-setting-user.c:140
 msgid "key cannot contain \"..\""
 msgstr "キー� \"..\" を��る�������ん"
 
-#: ../libnm-core/nm-setting-user.c:159
+#: ../libnm-core/nm-setting-user.c:145
 msgid "key contains invalid characters"
 msgstr "キー�無効�文字���れ����"
 
-#: ../libnm-core/nm-setting-user.c:184
+#: ../libnm-core/nm-setting-user.c:170
 msgid "value is missing"
 msgstr "値��り��ん"
 
-#: ../libnm-core/nm-setting-user.c:191
+#: ../libnm-core/nm-setting-user.c:177
 msgid "value is too large"
 msgstr "値�長����"
 
-#: ../libnm-core/nm-setting-user.c:197
+#: ../libnm-core/nm-setting-user.c:183
 msgid "value is not valid UTF8"
 msgstr "値�有効� UTF-8 ���り��ん"
 
-#: ../libnm-core/nm-setting-user.c:327
+#: ../libnm-core/nm-setting-user.c:313
 msgid "maximum number of user data entries reached"
 msgstr "ユーザーデータエントリー�最大数������"
 
-#: ../libnm-core/nm-setting-user.c:368
+#: ../libnm-core/nm-setting-user.c:354
 #, c-format
 msgid "invalid key \"%s\": %s"
 msgstr "無効�キー '%s': %s"
 
-#: ../libnm-core/nm-setting-user.c:387
+#: ../libnm-core/nm-setting-user.c:373
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr "ユーザーデータエントリー�最大数������ (%u ���� %u)"
 
-#: ../libnm-core/nm-setting-vlan.c:649
+#: ../libnm-core/nm-setting-vlan.c:636
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "vlan id � 0 - 4094 �範囲内��る必���り����%u ��"
 
-#: ../libnm-core/nm-setting-vlan.c:659
+#: ../libnm-core/nm-setting-vlan.c:646
 msgid "flags are invalid"
 msgstr "フラグ�無効��"
 
-#: ../libnm-core/nm-setting-vlan.c:671
+#: ../libnm-core/nm-setting-vlan.c:658
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "vlan 設定�� Ethernet 設定も必���"
 
-#: ../libnm-core/nm-setting-vpn.c:560
+#: ../libnm-core/nm-setting-vpn.c:546
 msgid "cannot set connection.multi-connect for VPN setting"
 msgstr "VPN 設定用� connection.multi-connect を設定����ん"
 
-#: ../libnm-core/nm-setting-vpn.c:581
+#: ../libnm-core/nm-setting-vpn.c:567
 #, c-format
 msgid "secret was empty"
 msgstr "シークレット�空��"
 
-#: ../libnm-core/nm-setting-vpn.c:611
+#: ../libnm-core/nm-setting-vpn.c:597
 msgid "setting contained a secret with an empty name"
 msgstr "設定�空����シークレット���れ�����"
 
-#: ../libnm-core/nm-setting-vpn.c:619
+#: ../libnm-core/nm-setting-vpn.c:605
 #, c-format
 msgid "secret value was empty"
 msgstr "シークレット値�空���"
 
-#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2224
+#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
 msgid "not a secret property"
 msgstr "シークレットプロパティー���り��ん"
 
-#: ../libnm-core/nm-setting-vpn.c:672
+#: ../libnm-core/nm-setting-vpn.c:658
 msgid "secret is not of correct type"
 msgstr "シークレット�タイプ�正���り��ん"
 
-#: ../libnm-core/nm-setting-vpn.c:756
+#: ../libnm-core/nm-setting-vpn.c:742
 msgid "secret flags property not found"
 msgstr "シークレットフラグプロパティー�見��り��ん"
 
-#: ../libnm-core/nm-setting-vxlan.c:365
+#: ../libnm-core/nm-setting-vxlan.c:351
 #, c-format
 msgid "'%s' is not a valid IP%c address"
 msgstr "'%s' �有効� IP%c アドレス���り��ん"
 
-#: ../libnm-core/nm-setting-vxlan.c:392
+#: ../libnm-core/nm-setting-vxlan.c:378
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d �ローカル�ート�最大 %d よりも大����"
 
-#: ../libnm-core/nm-setting-wired.c:752
+#: ../libnm-core/nm-setting-wired.c:738
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' �有効� Ethernet �ート値���り��ん"
 
-#: ../libnm-core/nm-setting-wired.c:762
+#: ../libnm-core/nm-setting-wired.c:748
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "'%s' �有効�二�値���り��ん"
 
-#: ../libnm-core/nm-setting-wired.c:825
+#: ../libnm-core/nm-setting-wired.c:811
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "無効� '%s' �����値 '%s' ��"
 
-#: ../libnm-core/nm-setting-wired.c:863
+#: ../libnm-core/nm-setting-wired.c:849
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "Wake-on-LAN モード� 'default' � 'ignore' �排他的�フラグ��"
 
-#: ../libnm-core/nm-setting-wired.c:872
+#: ../libnm-core/nm-setting-wired.c:858
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "Wake-on-LAN パスワード��マジックパケットモード���使用����"
 
-#: ../libnm-core/nm-setting-wired.c:898
-msgid ""
-"both speed and duplex should have a valid value or both should be unset"
+#: ../libnm-core/nm-setting-wired.c:884
+msgid "both speed and duplex should have a valid value or both should be unset"
 msgstr "速度�二��両方�値�有効��る���������れ��両方�も未設定���れ��り��ん"
 
-#: ../libnm-core/nm-setting-wired.c:899
+#: ../libnm-core/nm-setting-wired.c:885
 msgid "both speed and duplex are required for static link configuration"
 msgstr "速度�二��両方��的リンク設定�必���"
 
-#: ../libnm-core/nm-setting-wireguard.c:778
+#: ../libnm-core/nm-setting-wireguard.c:764
 msgid "missing public-key for peer"
 msgstr "ピア�公開���り��ん"
 
-#: ../libnm-core/nm-setting-wireguard.c:782
+#: ../libnm-core/nm-setting-wireguard.c:768
 msgid "invalid public-key for peer"
 msgstr "ピア�公開��無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:791
+#: ../libnm-core/nm-setting-wireguard.c:777
 msgid "invalid preshared-key for peer"
 msgstr "ピア�共有��キー�無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:809
+#: ../libnm-core/nm-setting-wireguard.c:795
 msgid "invalid endpoint for peer"
 msgstr "ピア�エンド�イント�無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:819
+#: ../libnm-core/nm-setting-wireguard.c:805
 #, c-format
 msgid "invalid IP address \"%s\" for allowed-ip of peer"
-msgstr "ピア� allowed-ip � IP アドレス \"%s\" �無効�� "
+msgstr "ピア� allowed-ip � IP アドレス \"%s\" �無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:828
+#: ../libnm-core/nm-setting-wireguard.c:814
 msgid "invalid preshared-key-flags for peer"
 msgstr "ピア�共有��キーフラグ�無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:1604
+#: ../libnm-core/nm-setting-wireguard.c:1590
 #, c-format
 msgid "peer #%u has no public-key"
 msgstr "ピア #%u ��公開���り��ん"
 
-#: ../libnm-core/nm-setting-wireguard.c:1615
+#: ../libnm-core/nm-setting-wireguard.c:1601
 #, c-format
 msgid "peer #%u has invalid public-key"
 msgstr "ピア #%u �公開��無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:1629
+#: ../libnm-core/nm-setting-wireguard.c:1615
 #, c-format
 msgid "peer #%u has invalid endpoint"
 msgstr "ピア #%u �エンド�イント�無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:1659
+#: ../libnm-core/nm-setting-wireguard.c:1645
 #, c-format
 msgid "peer #%u has invalid allowed-ips setting"
 msgstr "ピア #%u � allowed-ips 設定�無効��"
 
-#: ../libnm-core/nm-setting-wireguard.c:1671
+#: ../libnm-core/nm-setting-wireguard.c:1657
 #, c-format
 msgid "peer #%u is invalid: %s"
 msgstr "ピア #%u �無効��: %s"
 
-#: ../libnm-core/nm-setting-wireguard.c:1742
-#: ../libnm-core/nm-setting-wireguard.c:1757
+#: ../libnm-core/nm-setting-wireguard.c:1728
+#: ../libnm-core/nm-setting-wireguard.c:1743
 #, c-format
 msgid "method \"%s\" is not supported for WireGuard"
 msgstr "メソッド \"%s\" ��WireGuard ��サ�ート�����ん"
 
-#: ../libnm-core/nm-setting-wireguard.c:1777
+#: ../libnm-core/nm-setting-wireguard.c:1763
 msgid "key must be 32 bytes base64 encoded"
 msgstr "キー� 32 �イト� base64 �エンコード�れ��る必���り��"
 
-#: ../libnm-core/nm-setting-wireguard.c:1913
+#: ../libnm-core/nm-setting-wireguard.c:1899
 msgid "invalid peer secrets"
 msgstr "無効�ピアシークレット"
 
-#: ../libnm-core/nm-setting-wireguard.c:1936
+#: ../libnm-core/nm-setting-wireguard.c:1922
 #, c-format
 msgid "peer #%u lacks public-key"
 msgstr "ピア #%u ��公開���り��ん"
 
-#: ../libnm-core/nm-setting-wireguard.c:1950
+#: ../libnm-core/nm-setting-wireguard.c:1936
 #, c-format
 msgid "non-existing peer '%s'"
 msgstr "ピア '%s' �存在���ん"
 
-#: ../libnm-core/nm-setting-wireless-security.c:928
+#: ../libnm-core/nm-setting-wireless-security.c:913
 #, c-format
 msgid "'%s' is not a valid value for '%s' mode connections"
 msgstr "'%s' � '%s' モード接続�有効�値���り��ん"
 
-#: ../libnm-core/nm-setting-wireless-security.c:951
+#: ../libnm-core/nm-setting-wireless-security.c:936
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "'%s' セキュリティー���'%s=%s' �必���"
 
-#: ../libnm-core/nm-setting-wireless-security.c:972
+#: ../libnm-core/nm-setting-wireless-security.c:957
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "'%s' セキュリティー���'%s' �設定�必���り��"
 
-#: ../libnm-core/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:978
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "'%d' �値� <0-3> �範囲外��り��"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1048
-#, c-format
-msgid "'%s' connections require '%s' in this property"
-msgstr "'%s' �接続�場����プロパティー� '%s' �必���り��"
-
-#: ../libnm-core/nm-setting-wireless-security.c:1078
+#: ../libnm-core/nm-setting-wireless-security.c:1037
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "'%s' � '%s=%s' (WEP) ���使用����ん"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1102
+#: ../libnm-core/nm-setting-wireless-security.c:1061
 #, c-format
 msgid ""
 "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
-msgstr "'%s' ��'wpa-eap'�'wpa-psk' ��� 'sae' �キー管����使用����"
+msgstr "'%s' ��'wpa-eap'�'wpa-psk' ��� 'sae' �キー管����使用���� "
 
-#: ../libnm-core/nm-setting-wireless.c:795
+#: ../libnm-core/nm-setting-wireless.c:778
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "'%s' �有効� Wi-Fi モード���り��ん"
 
-#: ../libnm-core/nm-setting-wireless.c:805
+#: ../libnm-core/nm-setting-wireless.c:788
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "'%s' �有効��ンド���り��ん"
 
-#: ../libnm-core/nm-setting-wireless.c:815
+#: ../libnm-core/nm-setting-wireless.c:798
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "'%s' �場���'%s' プロパティーを設定�る必���り��"
 
-#: ../libnm-core/nm-setting-wireless.c:837
+#: ../libnm-core/nm-setting-wireless.c:820
 #, c-format
 msgid "'%s' requires '%s' and '%s' property"
 msgstr "'%s' ���'%s' �よ� '%s' �プロパティー�必���"
 
-#: ../libnm-core/nm-setting-wireless.c:924 ../libnm-core/nm-team-utils.c:2004
+#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
 #, c-format
 msgid "invalid value"
 msgstr "無効�値"
 
-#: ../libnm-core/nm-setting-wireless.c:934
+#: ../libnm-core/nm-setting-wireless.c:917
 msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "Wake-on-WLAN モード� 'default' � 'ignore' �排他的�フラグ��"
 
-#: ../libnm-core/nm-setting-wireless.c:943
+#: ../libnm-core/nm-setting-wireless.c:926
 msgid "Wake-on-WLAN trying to set unknown flag"
 msgstr "Wake-on-WLAN ��未知�フラグ�設定を試�����"
 
-#: ../libnm-core/nm-setting-wireless.c:965
+#: ../libnm-core/nm-setting-wireless.c:948
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "mac-address-randomization � cloned-mac-address �値�競�"
 
-#: ../libnm-core/nm-setting-wpan.c:185
+#: ../libnm-core/nm-setting-wpan.c:171
 msgid "page must be defined along with a channel"
 msgstr "ページ��ャン�ル�共�定義�れる必���り��"
 
-#: ../libnm-core/nm-setting-wpan.c:194
+#: ../libnm-core/nm-setting-wpan.c:180
 #, c-format
 msgid "page must be between %d and %d"
 msgstr "ページ� %d �ら %d �間���れ��り��ん"
 
-#: ../libnm-core/nm-setting-wpan.c:205
+#: ../libnm-core/nm-setting-wpan.c:191
 #, c-format
 msgid "channel must not be between %d and %d"
 msgstr "�ャン�ル� %d �ら %d �間������り��ん"
 
-#: ../libnm-core/nm-setting.c:919
+#: ../libnm-core/nm-setting.c:806
 #, c-format
 msgid "duplicate property"
 msgstr "�複�るプロパティー"
 
-#: ../libnm-core/nm-setting.c:942
+#: ../libnm-core/nm-setting.c:829
 #, c-format
 msgid "unknown property"
 msgstr "�明�プロパティー"
 
-#: ../libnm-core/nm-setting.c:1013 ../libnm-core/nm-setting.c:1062
+#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "タイプ '%s' �プロパティーをタイプ '%s' �値�ら設定����ん"
 
-#: ../libnm-core/nm-setting.c:1032 ../libnm-core/nm-setting.c:1047
+#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:934
 #, c-format
 msgid "failed to set property: %s"
 msgstr "プロパティー�設定�失敗����: %s"
 
-#: ../libnm-core/nm-setting.c:1077
+#: ../libnm-core/nm-setting.c:964
 #, c-format
 msgid "can not set property: %s"
 msgstr "プロパティーを設定����ん: %s"
 
-#: ../libnm-core/nm-setting.c:2115
+#: ../libnm-core/nm-setting.c:2015
 msgid "secret not found"
 msgstr "シークレット�見��り��ん"
 
-#: ../libnm-core/nm-team-utils.c:1338 ../libnm-core/nm-team-utils.c:1353
+#: ../libnm-core/nm-team-utils.c:1324 ../libnm-core/nm-team-utils.c:1339
 #, c-format
 msgid "invalid D-Bus property \"%s\""
 msgstr "無効� D-Bus プロパティー \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:1363
+#: ../libnm-core/nm-team-utils.c:1349
 #, c-format
 msgid "duplicate D-Bus property \"%s\""
 msgstr "D-Bus プロパティー \"%s\" を複製���"
 
-#: ../libnm-core/nm-team-utils.c:1384
+#: ../libnm-core/nm-team-utils.c:1370
 #, c-format
 msgid "invalid D-Bus property \"%s\" for \"%s\""
 msgstr "\"%s\" �無効� D-Bus プロパティー \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:1442
+#: ../libnm-core/nm-team-utils.c:1428
 #, c-format
 msgid "unknown link-watcher name \"%s\""
 msgstr "�明�リンクウォッ�ャー� \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:1993
+#: ../libnm-core/nm-team-utils.c:1979
 #, c-format
 msgid "value out or range"
 msgstr "範囲外�値��"
 
-#: ../libnm-core/nm-team-utils.c:2023
+#: ../libnm-core/nm-team-utils.c:2009
 #, c-format
 msgid "invalid runner-tx-hash"
 msgstr "無効� runner-tx-hash"
 
-#: ../libnm-core/nm-team-utils.c:2050
+#: ../libnm-core/nm-team-utils.c:2036
 #, c-format
 msgid "%s is only allowed for runner %s"
 msgstr "%s �ランナー %s �対����利用�能��"
 
-#: ../libnm-core/nm-team-utils.c:2058
+#: ../libnm-core/nm-team-utils.c:2044
 #, c-format
 msgid "%s is only allowed for runners %s"
 msgstr "%s �ランナー %s �対����利用�能��"
 
-#: ../libnm-core/nm-team-utils.c:2075
+#: ../libnm-core/nm-team-utils.c:2061
 #, c-format
 msgid "cannot set parameters for lacp and activebackup runners together"
 msgstr "lacp ランナー�よ� activebackup ランナー�パラメーターを�時�設定����ん"
 
-#: ../libnm-core/nm-team-utils.c:2084
+#: ../libnm-core/nm-team-utils.c:2070
 #, c-format
 msgid "missing link watcher"
 msgstr "リンクウォッ�ャー��り��ん"
 
-#: ../libnm-core/nm-team-utils.c:2106
+#: ../libnm-core/nm-team-utils.c:2092
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "team 設定�制�サイズを超�����"
 
-#: ../libnm-core/nm-team-utils.c:2112
+#: ../libnm-core/nm-team-utils.c:2098
 #, c-format
 msgid "team config is not valid UTF-8"
 msgstr "team 設定�有効� UTF-8 ���り��ん"
 
-#: ../libnm-core/nm-team-utils.c:2118
-#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9014
+#: ../libnm-core/nm-team-utils.c:2104
+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
 #, c-format
 msgid "invalid json"
 msgstr "無効� json"
 
-#: ../libnm-core/nm-team-utils.c:2272
+#: ../libnm-core/nm-team-utils.c:2258
 #, c-format
 msgid "invalid D-Bus type \"%s\""
 msgstr "無効� D-Bus タイプ \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:2311
+#: ../libnm-core/nm-team-utils.c:2297
 #, c-format
 msgid "invalid link-watchers: %s"
 msgstr "無効�リンクウオッ�ャー: %s"
 
-#: ../libnm-core/nm-utils.c:2327
+#: ../libnm-core/nm-utils.c:2330
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "'%s' �有効��ンドラー��り��ん。"
 
-#: ../libnm-core/nm-utils.c:2455
+#: ../libnm-core/nm-utils.c:2458
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "予期�� '%s': 親�����択�れ����。"
 
-#: ../libnm-core/nm-utils.c:2471
+#: ../libnm-core/nm-utils.c:2474
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "無効��ンドラー: '%s'"
 
-#: ../libnm-core/nm-utils.c:2493
+#: ../libnm-core/nm-utils.c:2496
 msgid "parent not specified."
 msgstr "親�指定�れ����ん。"
 
-#: ../libnm-core/nm-utils.c:2555
+#: ../libnm-core/nm-utils.c:2558
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "サ�ート�れ���� qdisc オプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2677
+#: ../libnm-core/nm-utils.c:2680
 msgid "action name missing."
 msgstr "アクション���り��ん。"
 
-#: ../libnm-core/nm-utils.c:2703
+#: ../libnm-core/nm-utils.c:2706
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "サ�ート�れ����アクション�オプション: '%s'"
 
-#: ../libnm-core/nm-utils.c:2841
+#: ../libnm-core/nm-utils.c:2844
 msgid "invalid action: "
 msgstr "無効�アクション: "
 
-#: ../libnm-core/nm-utils.c:2845
+#: ../libnm-core/nm-utils.c:2848
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "サ�ート�れ���� tfilter オプション: '%s'."
 
-#: ../libnm-core/nm-utils.c:3446
+#: ../libnm-core/nm-utils.c:3449
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "ファイル %s �対�る stat �実行�失敗����: %s"
 
-#: ../libnm-core/nm-utils.c:3455
+#: ../libnm-core/nm-utils.c:3458
 #, c-format
 msgid "not a file (%s)"
 msgstr "ファイル���り��ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3466
+#: ../libnm-core/nm-utils.c:3469
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "%2$s �無効�ファイル所有者 %1$d"
 
-#: ../libnm-core/nm-utils.c:3477
+#: ../libnm-core/nm-utils.c:3480
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s �ファイルパーミッション"
 
-#: ../libnm-core/nm-utils.c:3487
+#: ../libnm-core/nm-utils.c:3490
 #, c-format
 msgid "reject %s"
 msgstr "%s �拒�"
 
-#: ../libnm-core/nm-utils.c:3506
+#: ../libnm-core/nm-utils.c:3509
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "パス�絶対パス���り��ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3520
+#: ../libnm-core/nm-utils.c:3523
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "プラグインファイル�存在���ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3528
+#: ../libnm-core/nm-utils.c:3531
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "プラグイン�有効�ファイル���り��ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3538
+#: ../libnm-core/nm-utils.c:3541
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "libtool アーカイブ�サ�ート�れ����ん (%s)"
 
-#: ../libnm-core/nm-utils.c:3620
+#: ../libnm-core/nm-utils.c:3623
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "\"%s\" �イナリーを見��る�������ん���"
 
-#: ../libnm-core/nm-utils.c:4494
+#: ../libnm-core/nm-utils.c:4517
 msgid "unknown secret flags"
 msgstr "�明�シークレットフラグ"
 
-#: ../libnm-core/nm-utils.c:4504
+#: ../libnm-core/nm-utils.c:4527
 msgid "conflicting secret flags"
 msgstr "競��るシークレットフラグ"
 
-#: ../libnm-core/nm-utils.c:4515
+#: ../libnm-core/nm-utils.c:4538
 msgid "secret flags must not be \"not-required\""
 msgstr "シークレットフラグ� \"not-required\" ������り��ん"
 
-#: ../libnm-core/nm-utils.c:4523
+#: ../libnm-core/nm-utils.c:4546
 msgid "unsupported secret flags"
 msgstr "サ�ート�れ����シークレットフラグ"
 
-#: ../libnm-core/nm-utils.c:4553
+#: ../libnm-core/nm-utils.c:4576
 msgid "can't be simultaneously disabled and enabled"
 msgstr "�時�無効���有効��る�������ん"
 
-#: ../libnm-core/nm-utils.c:4561
+#: ../libnm-core/nm-utils.c:4584
 msgid "WPS is required"
 msgstr "WPS �必���"
 
-#: ../libnm-core/nm-utils.c:4627
+#: ../libnm-core/nm-utils.c:4650
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "%lld �場所��マスク�有効� Ethernet  MAC アドレス���り��ん"
 
-#: ../libnm-core/nm-utils.c:4642
+#: ../libnm-core/nm-utils.c:4665
 #, 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:4702
+#: ../libnm-core/nm-utils.c:4725
 msgid "interface name is missing"
 msgstr "インターフェース���り��ん"
 
-#: ../libnm-core/nm-utils.c:4708
+#: ../libnm-core/nm-utils.c:4731
 msgid "interface name is too short"
 msgstr "インターフェース��短����"
 
-#: ../libnm-core/nm-utils.c:4717
+#: ../libnm-core/nm-utils.c:4740
 msgid "interface name is reserved"
 msgstr "インターフェース��予約�れ����"
 
-#: ../libnm-core/nm-utils.c:4729
+#: ../libnm-core/nm-utils.c:4752
 msgid "interface name contains an invalid character"
 msgstr "インターフェース��無効�文字���れ����"
 
-#: ../libnm-core/nm-utils.c:4735
+#: ../libnm-core/nm-utils.c:4758
 msgid "interface name is longer than 15 characters"
 msgstr "インターフェース�� 15 文字を超�����"
 
-#: ../libnm-core/nm-utils.c:5402
+#: ../libnm-core/nm-utils.c:5425
 msgid "not valid utf-8"
 msgstr "utf-8 ���り��ん"
 
-#: ../libnm-core/nm-utils.c:5423 ../libnm-core/nm-utils.c:5476
+#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
 msgid "is not a JSON object"
 msgstr "JSON オブジェクト���り��ん"
 
-#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
+#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
 msgid "value is NULL"
 msgstr "値� NULL ��"
 
-#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
+#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
 msgid "value is empty"
 msgstr "値�空��"
 
-#: ../libnm-core/nm-utils.c:5464
+#: ../libnm-core/nm-utils.c:5487
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "%d (%s) �無効� JSON"
 
-#: ../libnm-core/nm-utils.c:5584 ../libnm-core/nm-utils.c:5604
+#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
 msgid "unterminated escape sequence"
 msgstr "未終了�エスケープシーケンス"
 
-#: ../libnm-core/nm-utils.c:5629
+#: ../libnm-core/nm-utils.c:5694
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "�明�属性 '%s'"
 
-#: ../libnm-core/nm-utils.c:5644
+#: ../libnm-core/nm-utils.c:5709
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "'%s' �後��キー/値�セパレーター '%c' ��り��ん"
 
-#: ../libnm-core/nm-utils.c:5660
+#: ../libnm-core/nm-utils.c:5725
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "属性 '%s' �無効� uint32 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:5669
+#: ../libnm-core/nm-utils.c:5734
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "属性 '%s' �無効� uint8 値 '%s'"
 
-#: ../libnm-core/nm-utils.c:5679
+#: ../libnm-core/nm-utils.c:5744
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "属性 '%s' �無効�ブール値 '%s'"
 
-#: ../libnm-core/nm-utils.c:5689
+#: ../libnm-core/nm-utils.c:5754
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "タイプ '%s' �サ�ート�れ����属性 '%s'"
 
-#: ../libnm-core/nm-utils.c:6038
+#: ../libnm-core/nm-utils.c:6119
 #, c-format
 msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
 msgstr "ブリッジ VLANs %d �よ� %d ��上昇�る vid �ソート�れ��ん"
 
-#: ../libnm-core/nm-utils.c:6062
+#: ../libnm-core/nm-utils.c:6143
 #, c-format
 msgid "duplicate bridge VLAN vid %u"
 msgstr "ブリッジ VLAN vid %u を複製���"
 
-#: ../libnm-core/nm-utils.c:6074
+#: ../libnm-core/nm-utils.c:6155
 msgid "only one VLAN can be the PVID"
 msgstr "PVID ��れる�� 1 �� VLAN ����"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:295
+#: ../libnm-core/nm-utils.c:6205
+#, c-format
+msgid "unknown flags 0x%x"
+msgstr "�明�フラグ 0x%x"
+
+#: ../libnm-core/nm-utils.c:6215
+msgid ""
+"'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
+msgstr "'fqdn-no-update' フラグ�よ� 'fqdn-serv-update' フラグを�時�設定�る�������ん"
+
+#: ../libnm-core/nm-utils.c:6226
+msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
+msgstr "'fqdn-clear-flags' フラグ�他� FQDN フラグ�互�性��り��ん"
+
+#: ../libnm-core/nm-utils.c:6235
+msgid "DHCPv6 does not support the E (encoded) FQDN flag"
+msgstr "DHCPv6 � E (エンコード済�) FQDN フラグをサ�ート���ん"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:281
 #, c-format
 msgid "cannot load plugin \"%s\": %s"
 msgstr "プラグイン '%s' を読�込���ん: %s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:306
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr "%s (%s) �ら� nm_vpn_editor_plugin_factory() �ロード�失敗����"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:331
+#: ../libnm-core/nm-vpn-editor-plugin.c:317
 #, c-format
 msgid "unknown error initializing plugin %s"
 msgstr "プラグイン %s ��期化中��明�エラー�発生����"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:348
+#: ../libnm-core/nm-vpn-editor-plugin.c:334
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr "'%s' � VPN プラグインをロード����ん: プラグイン���り��ん"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:357
+#: ../libnm-core/nm-vpn-editor-plugin.c:343
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr "'%s' � VPN プラグインをロード����ん: サービス��無効��"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:500
+#: ../libnm-core/nm-vpn-editor-plugin.c:486
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "プラグイン�イン�ート機能をサ�ート���ん"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:520
+#: ../libnm-core/nm-vpn-editor-plugin.c:506
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "プラグイン�エクス�ート機能をサ�ート���ん"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:107
+#: ../libnm-core/nm-vpn-plugin-info.c:93
 #, c-format
 msgid "missing filename"
 msgstr "ファイル���り��ん"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:115
+#: ../libnm-core/nm-vpn-plugin-info.c:101
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "ファイル��絶対パス��る必���り�� (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:124
+#: ../libnm-core/nm-vpn-plugin-info.c:110
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "ファイル��形��無効�� (%s)"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:447
+#: ../libnm-core/nm-vpn-plugin-info.c:433
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "競��るプラグイン (%s) �存在��� (�� %s.%s 値を����)。"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:485
+#: ../libnm-core/nm-vpn-plugin-info.c:471
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "���� (%s) �競��るプラグイン�存在���"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1067
+#: ../libnm-core/nm-vpn-plugin-info.c:1053
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "\"plugin\" 設定��り��ん"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1077
+#: ../libnm-core/nm-vpn-plugin-info.c:1063
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s: 以��失敗��プラグイン�ロード��試行��������"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1153
+#: ../libnm-core/nm-vpn-plugin-info.c:1139
 msgid "missing filename to load VPN plugin info"
 msgstr "VPN プラグイン情報をロード�るファイル���り��ん"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1165
+#: ../libnm-core/nm-vpn-plugin-info.c:1151
 msgid "missing name for VPN plugin info"
 msgstr "VPN プラグイン情報�����り��ん"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1160
 msgid "missing service for VPN plugin info"
 msgstr "VPN プラグイン情報�サービス��り��ん"
 
-#: ../libnm/nm-device-adsl.c:68
+#: ../libnm/nm-client.c:3584
+#, c-format
+msgid "request succeeded with %s but object is in an unsuitable state"
+msgstr "%s �よりリクエスト��功������オブジェクト���切�状態��り��"
+
+#: ../libnm/nm-client.c:3675
+#, c-format
+msgid "operation succeeded but object %s does not exist"
+msgstr "�作��功������オブジェクト %s �存在���ん"
+
+#: ../libnm/nm-device-adsl.c:64
 msgid "The connection was not an ADSL connection."
 msgstr "接続��ADSL 接続���り��ん���。"
 
-#: ../libnm/nm-device-bond.c:108
+#: ../libnm/nm-device-bond.c:104
 msgid "The connection was not a bond connection."
 msgstr "接続��ボンド接続���り��ん���。"
 
-#: ../libnm/nm-device-bridge.c:112
+#: ../libnm/nm-device-bridge.c:108
 msgid "The connection was not a bridge connection."
 msgstr "接続��ブリッジ接続���り��ん���。"
 
-#: ../libnm/nm-device-bt.c:134
+#: ../libnm/nm-device-bt.c:130
 #, c-format
 msgid "The connection was not a Bluetooth connection."
 msgstr "接続��Bluetooth 接続���り��ん���。"
 
-#: ../libnm/nm-device-bt.c:140
+#: ../libnm/nm-device-bt.c:136
 #, c-format
 msgid "The connection is of Bluetooth NAP type."
 msgstr "接続��Bluetooth NAP タイプ��。"
 
-#: ../libnm/nm-device-bt.c:149
+#: ../libnm/nm-device-bt.c:145
 msgid "Invalid device Bluetooth address."
 msgstr "無効�デ�イス Bluetooth アドレス��。"
 
-#: ../libnm/nm-device-bt.c:155
+#: ../libnm/nm-device-bt.c:151
 msgid "The Bluetooth addresses of the device and the connection didn't match."
 msgstr "デ�イス�接続� Bluetooth アドレス�一致���ん���。"
 
-#: ../libnm/nm-device-bt.c:164
+#: ../libnm/nm-device-bt.c:160
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "デ�イス���接続�必�� Bluetooth 機能��り��ん。"
 
-#: ../libnm/nm-device-dummy.c:74
+#: ../libnm/nm-device-dummy.c:68
 msgid "The connection was not a dummy connection."
 msgstr "接続��ダミー接続���り��ん���。"
 
-#: ../libnm/nm-device-dummy.c:81 ../libnm/nm-device-generic.c:95
-#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
-#: ../libnm/nm-device-ovs-port.c:96
+#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
+#: ../libnm/nm-device-ovs-port.c:84
 msgid "The connection did not specify an interface name."
 msgstr "接続��インターフェース��指定�れ��ん���。"
 
-#: ../libnm/nm-device-ethernet.c:203
+#: ../libnm/nm-device-ethernet.c:187
 msgid "The connection was not an Ethernet or PPPoE connection."
 msgstr "接続��Ethernet ��� PPPoE 接続���り��ん���。"
 
-#: ../libnm/nm-device-ethernet.c:218
+#: ../libnm/nm-device-ethernet.c:202
 msgid "The connection and device differ in S390 subchannels."
 msgstr "接続�デ�イス��S390 サブ�ャ�ル�異�り��。"
 
-#: ../libnm/nm-device-ethernet.c:233
+#: ../libnm/nm-device-ethernet.c:217
 #, c-format
 msgid "Invalid device MAC address %s."
 msgstr "無効�デ�イス MAC アドレス %s。"
 
-#: ../libnm/nm-device-ethernet.c:238
+#: ../libnm/nm-device-ethernet.c:222
 msgid "The MACs of the device and the connection do not match."
 msgstr "デ�イス�接続� MAC アドレス�一致���ん���。"
 
-#: ../libnm/nm-device-ethernet.c:248
+#: ../libnm/nm-device-ethernet.c:232
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
 msgstr "ブラックリスト�無効� MAC: %s。"
 
-#: ../libnm/nm-device-ethernet.c:254
+#: ../libnm/nm-device-ethernet.c:238
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "デ�イス MAC (%s) ��接続�よりブラックリスト化�れ����。"
 
-#: ../libnm/nm-device-generic.c:88
+#: ../libnm/nm-device-generic.c:84
 msgid "The connection was not a generic connection."
 msgstr "接続�汎用的�接続���り��ん���。"
 
-#: ../libnm/nm-device-infiniband.c:90
+#: ../libnm/nm-device-infiniband.c:86
 msgid "The connection was not an InfiniBand connection."
 msgstr "接続� InfiniBand 接続���り��ん���。"
 
-#: ../libnm/nm-device-infiniband.c:98 ../libnm/nm-device-wifi.c:621
-#: ../libnm/nm-device-wimax.c:321
+#: ../libnm/nm-device-infiniband.c:94 ../libnm/nm-device-wifi.c:470
 msgid "Invalid device MAC address."
 msgstr "無効�デ�イス MAC アドレス��。"
 
-#: ../libnm/nm-device-infiniband.c:106 ../libnm/nm-device-wifi.c:628
-#: ../libnm/nm-device-wimax.c:328
+#: ../libnm/nm-device-infiniband.c:102 ../libnm/nm-device-wifi.c:477
 msgid "The MACs of the device and the connection didn't match."
 msgstr "デ�イス�接続� MAC アドレス�一致���ん���。"
 
-#: ../libnm/nm-device-ip-tunnel.c:268
+#: ../libnm/nm-device-ip-tunnel.c:264
 msgid "The connection was not an IP tunnel connection."
 msgstr "接続� IP トン�ル接続���り��ん���。"
 
-#: ../libnm/nm-device-macvlan.c:154
+#: ../libnm/nm-device-macvlan.c:151
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "接続� MAC-VLAN 接続���り��ん���。"
 
-#: ../libnm/nm-device-modem.c:178
+#: ../libnm/nm-device-modem.c:175
 msgid "The connection was not a modem connection."
 msgstr "接続�モデム接続���り��ん���。"
 
-#: ../libnm/nm-device-modem.c:186
+#: ../libnm/nm-device-modem.c:183
 msgid "The connection was not a valid modem connection."
 msgstr "接続�有効�モデム接続���り��ん���。"
 
-#: ../libnm/nm-device-modem.c:193
+#: ../libnm/nm-device-modem.c:190
 msgid "The device is lacking capabilities required by the connection."
 msgstr "デ�イス��接続�必��機能��り��ん。"
 
-#: ../libnm/nm-device-olpc-mesh.c:111
+#: ../libnm/nm-device-olpc-mesh.c:107
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "接続� OLPC メッシュ接続���り��ん���。"
 
-#: ../libnm/nm-device-ovs-bridge.c:89
+#: ../libnm/nm-device-ovs-bridge.c:77
 msgid "The connection was not a ovs_bridge connection."
 msgstr "接続��ovs_bridge 接続���り��ん���。"
 
-#: ../libnm/nm-device-ovs-interface.c:60
+#: ../libnm/nm-device-ovs-interface.c:45
 msgid "The connection was not a ovs_interface connection."
 msgstr "接続��ovs_interface 接続���り��ん���。"
 
-#: ../libnm/nm-device-ovs-port.c:89
+#: ../libnm/nm-device-ovs-port.c:77
 msgid "The connection was not a ovs_port connection."
 msgstr "接続��ovs_port 接続���り��ん���。"
 
-#: ../libnm/nm-device-team.c:135
+#: ../libnm/nm-device-team.c:131
 msgid "The connection was not a team connection."
 msgstr "接続� team 接続���り��ん���。"
 
-#: ../libnm/nm-device-tun.c:206
+#: ../libnm/nm-device-tun.c:202
 msgid "The connection was not a tun connection."
 msgstr "接続� tun 接続���り��ん���。"
 
-#: ../libnm/nm-device-tun.c:215
+#: ../libnm/nm-device-tun.c:211
 msgid "The mode of the device and the connection didn't match"
 msgstr "デ�イス�接続�モード�一致���ん���"
 
-#: ../libnm/nm-device-vlan.c:125
+#: ../libnm/nm-device-vlan.c:121
 msgid "The connection was not a VLAN connection."
 msgstr "接続� VLAN 接続���り��ん���。"
 
-#: ../libnm/nm-device-vlan.c:132
+#: ../libnm/nm-device-vlan.c:128
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr "デ�イス�接続� VLAN ID �一致���ん���。"
 
-#: ../libnm/nm-device-vlan.c:147
+#: ../libnm/nm-device-vlan.c:143
 msgid "The hardware address of the device and the connection didn't match."
 msgstr "デ�イス�接続��ードウェアアドレス�一致���ん���。"
 
-#: ../libnm/nm-device-vxlan.c:383
+#: ../libnm/nm-device-vxlan.c:381
 msgid "The connection was not a VXLAN connection."
 msgstr "接続� VXLAN 接続���り��ん���。"
 
-#: ../libnm/nm-device-vxlan.c:390
+#: ../libnm/nm-device-vxlan.c:388
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "デ�イス�接続� VXLAN ID �一致���ん���。"
 
-#: ../libnm/nm-device-wifi-p2p.c:326
+#: ../libnm/nm-device-wifi-p2p.c:268
 msgid "The connection was not a Wi-Fi P2P connection."
 msgstr "接続� Wi-Fi P2P 接続���り��ん���。"
 
-#: ../libnm/nm-device-wifi.c:612
+#: ../libnm/nm-device-wifi.c:461
 msgid "The connection was not a Wi-Fi connection."
 msgstr "接続� Wi-Fi 接続���り��ん���。"
 
-#: ../libnm/nm-device-wifi.c:648
+#: ../libnm/nm-device-wifi.c:496
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "デ�イス��接続�必�� WPA 機能��り��ん。"
 
-#: ../libnm/nm-device-wifi.c:655
-msgid ""
-"The device is lacking WPA2/RSN capabilities required by the connection."
+#: ../libnm/nm-device-wifi.c:503
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "デ�イス��接続�必�� WPA2/RSN 機能��り��ん。"
 
-#: ../libnm/nm-device-wimax.c:312
-msgid "The connection was not a WiMAX connection."
-msgstr "接続� WiMAX 接続���り��ん���。"
-
-#: ../libnm/nm-device-wpan.c:81
+#: ../libnm/nm-device-wpan.c:64
 msgid "The connection was not a wpan connection."
 msgstr "接続� WPAN 接続���り��ん���。"
 
-#: ../libnm/nm-device.c:1383
+#: ../libnm/nm-device.c:1459
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../libnm/nm-device.c:1385
+#: ../libnm/nm-device.c:1461
 msgid "OLPC Mesh"
 msgstr "OLPC メッシュ"
 
-#: ../libnm/nm-device.c:1387
+#: ../libnm/nm-device.c:1463
 msgid "Open vSwitch Interface"
 msgstr "Open vSwitch インターフェース"
 
-#: ../libnm/nm-device.c:1389
+#: ../libnm/nm-device.c:1465
 msgid "Open vSwitch Port"
 msgstr "Open vSwitch �ート"
 
-#: ../libnm/nm-device.c:1391
+#: ../libnm/nm-device.c:1467
 msgid "Open vSwitch Bridge"
 msgstr "Open vSwitch ブリッジ"
 
-#: ../libnm/nm-device.c:1393
+#: ../libnm/nm-device.c:1469
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm/nm-device.c:1407
+#: ../libnm/nm-device.c:1483
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm/nm-device.c:1409
+#: ../libnm/nm-device.c:1485
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm/nm-device.c:1411
+#: ../libnm/nm-device.c:1487
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm/nm-device.c:1413
+#: ../libnm/nm-device.c:1489
 msgid "IPTunnel"
 msgstr "IPTunnel"
 
-#: ../libnm/nm-device.c:1415
+#: ../libnm/nm-device.c:1491
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm/nm-device.c:1417
+#: ../libnm/nm-device.c:1493
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm/nm-device.c:1419
+#: ../libnm/nm-device.c:1495
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1421
+#: ../libnm/nm-device.c:1497
 msgid "Dummy"
 msgstr "ダミー"
 
-#: ../libnm/nm-device.c:1423
+#: ../libnm/nm-device.c:1499
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1425
+#: ../libnm/nm-device.c:1501
 msgid "IEEE 802.15.4"
 msgstr "IEEE 802.15.4"
 
-#: ../libnm/nm-device.c:1427
+#: ../libnm/nm-device.c:1503
 msgid "6LoWPAN"
 msgstr "6LoWPAN"
 
-#: ../libnm/nm-device.c:1429
+#: ../libnm/nm-device.c:1505
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: ../libnm/nm-device.c:1431
+#: ../libnm/nm-device.c:1507
 msgid "Wi-Fi P2P"
 msgstr "Wi-Fi P2P"
 
-#: ../libnm/nm-device.c:1463
+#: ../libnm/nm-device.c:1539
 msgid "Wired"
 msgstr "有線"
 
-#: ../libnm/nm-device.c:1494
+#: ../libnm/nm-device.c:1571
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm/nm-device.c:1496
+#: ../libnm/nm-device.c:1573
 msgid "USB"
 msgstr "USB"
 
@@ -12637,36 +12014,24 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#. 
-#: ../libnm/nm-device.c:1809 ../libnm/nm-device.c:1828
+#.
+#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm/nm-device.c:2551
+#: ../libnm/nm-device.c:2569
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "接続�有効���り��ん���: %s"
 
-#: ../libnm/nm-device.c:2560
+#: ../libnm/nm-device.c:2578
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "デ�イス�接続�インターフェース��一致���ん���。"
 
-#: ../libnm/nm-manager.c:271
-msgid "Checkpoint was removed before it was initialized"
-msgstr "�ェック�イント��期化��削除�れ���"
-
-#: ../libnm/nm-manager.c:998
-msgid "Active connection removed before it was initialized"
-msgstr "アクティブ�接続��期化��削除�れ���"
-
-#: ../libnm/nm-remote-settings.c:284
-msgid "Connection removed before it was initialized"
-msgstr "接続��期化��削除�れ���"
-
-#: ../libnm/nm-vpn-plugin-old.c:845 ../libnm/nm-vpn-service-plugin.c:1044
+#: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
 msgid "No service name specified"
 msgstr "サービス��指定�れ����ん"
 
@@ -12680,11 +12045,11 @@ msgstr "システム�リシー�よりシステム��ットワーキング
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid "Reload NetworkManager configuration"
-msgstr "NetworkManager 設定をリロード"
+msgstr "NetworkManager 設定��ロード"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents reloading NetworkManager"
-msgstr "システム�リシー�より NetworkManager �リロード�回��れ��"
+msgstr "システム�リシー� NetworkManager ��ロードを阻止���"
 
 #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:5
 msgid ""
@@ -12812,79 +12177,79 @@ msgstr "接続確�を有効���無効��る"
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr "システム�リシー�より�接続確�を有効化���無効化����ん"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1500
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "オブジェクトクラス '%s' ���'%s' ������プロパティー��り��ん"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1507
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "プロパティー '%s' (オブジェクトクラス '%s') �書�込��能���り��ん"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1514
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "コンストラクトプロパティー \"%s\" (オブジェクト '%s') �構築後�設定����ん"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1522
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "'%s::%s' �有効�プロパティー����り��ん。'%s' � GObject サブタイプ���り��ん"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1531
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' �値�ら設定����ん"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1542
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr "値 \"%s\" (タイプ '%s') ��プロパティー '%s' (タイプ '%s') �対��無効���範囲外��"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
 #, c-format
 msgid "'%s' is not valid: properties should be specified as 'key=value'"
 msgstr "'%s' �無効��。プロパティー� 'key=value' �指定�れる必���り��"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:251
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
 #, c-format
 msgid "'%s' is not a valid key"
 msgstr "'%s' �有効�キー���り��ん"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:257
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:242
 #, c-format
 msgid "duplicate key '%s'"
 msgstr "�複キー '%s'"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:271
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:256
 #, c-format
 msgid "number for '%s' is out of range"
 msgstr "'%s' �番��範囲外��"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:274
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:259
 #, c-format
 msgid "value for '%s' must be a number"
 msgstr "'%s' �値�番����れ��り��ん"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:285
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:270
 #, c-format
 msgid "value for '%s' must be a boolean"
 msgstr "'%s' �値�ブール値���れ��り��ん"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:294
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:279
 msgid "missing 'name' attribute"
 msgstr "'name' 属性��り��ん"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:301
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:286
 #, c-format
 msgid "invalid 'name' \"%s\""
 msgstr "'name' \"%s\" �無効��"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:313
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:298
 #, c-format
 msgid "attribute '%s' is invalid for \"%s\""
 msgstr "属性 '%s' � \"%s\" ��無効��"
@@ -12893,543 +12258,573 @@ msgstr "属性 '%s' � \"%s\" ��無効��"
 #. * 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:121
+#: ../src/NetworkManagerUtils.c:107
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %u"
 msgstr "%s %u"
 
-#: ../src/main.c:176 ../src/main.c:341
+#: ../src/main.c:163 ../src/main.c:335
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "設定�読�込��失敗����: %s\n"
 
 #. Logging/debugging
-#: ../src/main.c:190 ../src/nm-iface-helper.c:292
+#: ../src/main.c:184 ../src/nm-iface-helper.c:295
 msgid "Print NetworkManager version and exit"
 msgstr "NetworkManager ��ージョンを表示��終了�る"
 
-#: ../src/main.c:191 ../src/nm-iface-helper.c:293
+#: ../src/main.c:185 ../src/nm-iface-helper.c:296
 msgid "Don't become a daemon"
 msgstr "デーモン����"
 
-#: ../src/main.c:192 ../src/nm-iface-helper.c:295
+#: ../src/main.c:186 ../src/nm-iface-helper.c:298
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "ログレベル: [%s] ���れ�"
 
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:188 ../src/nm-iface-helper.c:300
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "',' �区切��ログドメイン: [%s] �組����"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:299
+#: ../src/main.c:190 ../src/nm-iface-helper.c:302
 msgid "Make all warnings fatal"
 msgstr "����警告を致命的��る"
 
-#: ../src/main.c:197
+#: ../src/main.c:191
 msgid "Specify the location of a PID file"
 msgstr "PID ファイル�場所を指定�る"
 
-#: ../src/main.c:199
+#: ../src/main.c:193
 msgid "Print NetworkManager configuration and exit"
 msgstr "NetworkManager �設定を表示��終了�る"
 
-#: ../src/main.c:209
+#: ../src/main.c:203
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
 "specify wireless access points which wireless cards in the computer\n"
 "should associate with."
-msgstr ""
-"NetworkManager �より�����ットワーク接続�監視�れ�\n"
+msgstr "NetworkManager �より�����ットワーク接続�監視�れ�\n"
 "使用�最��接続�自動的��択�れ��。���コンピューター内�\n"
 "ワイヤレスカードを関連付�る��ワイヤレスアクセス�イント�\n"
 "ユーザー�よる指定も許��れ��。"
 
-#: ../src/main.c:331 ../src/main-utils.c:289 ../src/nm-iface-helper.c:440
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s  --help を使用��有効�オプション�一覧を確�������。\n"
 
-#: ../src/main.c:364 ../src/nm-iface-helper.c:453
+#: ../src/main.c:358 ../src/nm-iface-helper.c:456
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "デーモン化����ん���: %s [エラー %u]\n"
 
-#: ../src/main-utils.c:99
+#: ../src/main-utils.c:85
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "%s �オープン�失敗����: %s\n"
 
-#: ../src/main-utils.c:106
+#: ../src/main-utils.c:92
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "%s ��書�込��失敗����: %s\n"
 
-#: ../src/main-utils.c:112
+#: ../src/main-utils.c:98
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "%s �クローズ�失敗����: %s\n"
 
-#: ../src/main-utils.c:151 ../src/main-utils.c:162
+#: ../src/main-utils.c:137 ../src/main-utils.c:148
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "'%s' を作�����ん: %s"
 
-#: ../src/main-utils.c:215
+#: ../src/main-utils.c:201
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s ����実行中�� (pid %ld)\n"
 
-#: ../src/main-utils.c:225
+#: ../src/main-utils.c:211
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "%s を実行�る�� root ��る必���り��!\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:301
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:303
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager �作��れ����\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:312
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
 #, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
 "\n"
 msgstr "# %s �らマージ�れ����\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:209
+#: ../src/devices/bluetooth/nm-bluez-manager.c:1341
 #, c-format
 msgid "%s Network"
 msgstr "%s �ットワーク"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:271
+#: ../src/devices/bluetooth/nm-device-bt.c:298
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN ��求�れ�����Bluetooth デ�イス� NAP をサ�ート���ん"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:281
+#: ../src/devices/bluetooth/nm-device-bt.c:311
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr "PAN 接続��GSM�CDMA����シリアル設定を指定����ん"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:294
+#: ../src/devices/bluetooth/nm-device-bt.c:324
 msgid "PAN connection"
 msgstr "PAN 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:301
+#: ../src/devices/bluetooth/nm-device-bt.c:331
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN ��求�れ�����Bluetooth デ�イス� DUN をサ�ート���ん"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:311
+#: ../src/devices/bluetooth/nm-device-bt.c:342
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 接続���GSM ��� CDMA 設定���れる必���り��"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:321
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:352
+#: ../src/devices/wwan/nm-modem-broadband.c:784
 msgid "GSM connection"
 msgstr "GSM 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:323
-#: ../src/devices/wwan/nm-modem-broadband.c:730
+#: ../src/devices/bluetooth/nm-device-bt.c:354
+#: ../src/devices/wwan/nm-modem-broadband.c:809
 msgid "CDMA connection"
 msgstr "CDMA 接続"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:331
+#: ../src/devices/bluetooth/nm-device-bt.c:362
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "�明�/未処�� Bluetooth 接続タイプ"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:353
+#: ../src/devices/bluetooth/nm-device-bt.c:384
 msgid "connection does not match device"
 msgstr "接続�デ�イス�一致���ん"
 
-#: ../src/devices/nm-device-6lowpan.c:191
+#: ../src/devices/nm-device-6lowpan.c:177
 msgid "6LOWPAN connection"
 msgstr "6LOWPAN 接続"
 
-#: ../src/devices/nm-device-bond.c:70
+#: ../src/devices/nm-device-bond.c:56
 msgid "Bond connection"
 msgstr "ボンド接続"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:147
 msgid "Bridge connection"
 msgstr "ブリッジ接続"
 
-#: ../src/devices/nm-device-dummy.c:66
+#: ../src/devices/nm-device-dummy.c:58
 msgid "Dummy connection"
 msgstr "ダミー接続"
 
-#: ../src/devices/nm-device-ethernet.c:1415
+#: ../src/devices/nm-device-ethernet.c:1506
 msgid "PPPoE connection"
 msgstr "PPPoE 接続"
 
-#: ../src/devices/nm-device-ethernet.c:1415
+#: ../src/devices/nm-device-ethernet.c:1506
 msgid "Wired connection"
 msgstr "有線接続"
 
-#: ../src/devices/nm-device-ethernet-utils.c:32
+#: ../src/devices/nm-device-ethernet-utils.c:20
 #, c-format
 msgid "Wired connection %d"
 msgstr "有線接続 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:421
+#: ../src/devices/nm-device-ip-tunnel.c:407
 msgid "IP tunnel connection"
 msgstr "IP トン�ル接続"
 
-#: ../src/devices/nm-device-macvlan.c:364
+#: ../src/devices/nm-device-macvlan.c:365
 msgid "MACVLAN connection"
 msgstr "MACVLAN 接続"
 
-#: ../src/devices/nm-device-tun.c:156
+#: ../src/devices/nm-device-tun.c:142
 msgid "TUN connection"
 msgstr "TUN 接続"
 
-#: ../src/devices/nm-device-wpan.c:68
+#: ../src/devices/nm-device-wpan.c:54
 msgid "WPAN connection"
 msgstr "WPAN 接続"
 
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:87
 msgid "Team connection"
 msgstr "team 接続"
 
-#: ../src/devices/wifi/nm-device-wifi.c:964
-msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr "WPA アドホック�カー�ル�グ���無効��り���"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:42
+#: ../src/devices/wifi/nm-wifi-utils.c:28
 #, c-format
 msgid "%s is incompatible with static WEP keys"
 msgstr "%s ��的 WEP キー�互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:76
+#: ../src/devices/wifi/nm-wifi-utils.c:62
 msgid "LEAP authentication requires a LEAP username"
 msgstr "LEAP �証�� LEAP ユーザー��必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:86
+#: ../src/devices/wifi/nm-wifi-utils.c:72
 msgid "LEAP username requires 'leap' authentication"
 msgstr "LEAP ユーザー��� 'leap' �証�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:99
+#: ../src/devices/wifi/nm-wifi-utils.c:85
 msgid "LEAP authentication requires IEEE 802.1x key management"
 msgstr "LEAP �証�� IEEE 802.1x キー管��必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:119
+#: ../src/devices/wifi/nm-wifi-utils.c:105
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
 msgstr "LEAP �証�アドホックモード�互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:131
+#: ../src/devices/wifi/nm-wifi-utils.c:117
 msgid "LEAP authentication is incompatible with 802.1x setting"
 msgstr "LEAP �証� 802.1x 設定�互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:153
+#: ../src/devices/wifi/nm-wifi-utils.c:139
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr "'%s' �証を使用���る接続� WPA キー管�を使用����ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:164
+#: ../src/devices/wifi/nm-wifi-utils.c:150
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr "'%s' �証を使用���る接続� WPA プロトコルを指定����ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:180
-#: ../src/devices/wifi/nm-wifi-utils.c:197
+#: ../src/devices/wifi/nm-wifi-utils.c:166
+#: ../src/devices/wifi/nm-wifi-utils.c:183
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
-msgstr "'%s' �証を使用���る接続� WPA 暗�を指定����ん"
+msgstr "'%s' �証を使用���る接続� WPA 暗�文を指定����ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:209
+#: ../src/devices/wifi/nm-wifi-utils.c:195
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr "'%s' �証を使用���る接続� WPA パスワードを指定����ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:240
+#: ../src/devices/wifi/nm-wifi-utils.c:226
 msgid "Dynamic WEP requires an 802.1x setting"
 msgstr "動的 WEP �� 802.1x 設定�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:250
-#: ../src/devices/wifi/nm-wifi-utils.c:278
+#: ../src/devices/wifi/nm-wifi-utils.c:236
+#: ../src/devices/wifi/nm-wifi-utils.c:264
 msgid "Dynamic WEP requires 'open' authentication"
 msgstr "動的 WEP �� 'open' �証�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:265
+#: ../src/devices/wifi/nm-wifi-utils.c:251
 msgid "Dynamic WEP requires 'ieee8021x' key management"
 msgstr "動的 WEP �� 'ieee8021x' キー管��必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:312
+#: ../src/devices/wifi/nm-wifi-utils.c:298
 msgid "WPA-PSK authentication is incompatible with 802.1x"
 msgstr "WPA-PSK �証� 802.1x �互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:322
+#: ../src/devices/wifi/nm-wifi-utils.c:308
 msgid "WPA-PSK requires 'open' authentication"
 msgstr "WPA-PSK �� 'open' �証�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:334
-msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr "WPA アドホック�証��アドホックモード AP �必���"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:347
-msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "WPA アドホック�証�� 'wpa' プロトコル�必���"
+#: ../src/devices/wifi/nm-wifi-utils.c:320
+msgid "Access point does not support PSK but setting requires it"
+msgstr "アクセス�イント� PSK をサ�ート���ん��設定�� PSK �必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:359
-msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "WPA アドホック�証�� 'none' ペア暗��必���"
+#: ../src/devices/wifi/nm-wifi-utils.c:333
+msgid "WPA Ad-Hoc authentication requires 'rsn' protocol"
+msgstr "WPA アドホック��証�� 'rsn' プロトコル�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:371
-msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "WPA アドホック�証�� 'tkip' グループ暗��必���"
+#: ../src/devices/wifi/nm-wifi-utils.c:344
+msgid "WPA Ad-Hoc authentication requires 'ccmp' pairwise cipher"
+msgstr "WPA アドホック �証���'ccmp' ペア暗�文�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:385
-msgid "Access point does not support PSK but setting requires it"
-msgstr "アクセス�イント� PSK をサ�ート���ん��設定�� PSK �必���"
+#: ../src/devices/wifi/nm-wifi-utils.c:355
+msgid "WPA Ad-Hoc requires 'ccmp' group cipher"
+msgstr "WPA アドホック�� 'ccmp' グループ暗�文�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:415
+#: ../src/devices/wifi/nm-wifi-utils.c:384
 msgid "WPA-EAP authentication requires an 802.1x setting"
 msgstr "WPA-EAP �証�� 802.1x 設定�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:425
+#: ../src/devices/wifi/nm-wifi-utils.c:394
 msgid "WPA-EAP requires 'open' authentication"
 msgstr "WPA-EAP �� 'open' �証�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:436
+#: ../src/devices/wifi/nm-wifi-utils.c:405
 msgid "802.1x setting requires 'wpa-eap' key management"
 msgstr "802.1x 設定�� 'wpa-eap' キー管��必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:449
+#: ../src/devices/wifi/nm-wifi-utils.c:418
 msgid "Access point does not support 802.1x but setting requires it"
 msgstr "アクセス�イント� 802.1x をサ�ート���ん��設定�� 802.1x 必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:477
-msgid ""
-"Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr "アクセス�イントモード�アドホック����設定��インフラストラク�ャーセキュリティー�必���"
+#: ../src/devices/wifi/nm-wifi-utils.c:448
+msgid "Ad-Hoc mode requires 'none' or 'wpa-psk' key management"
+msgstr "アドホックモード���'none' ��� 'wpa-psk' �キー管��必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:487
+#: ../src/devices/wifi/nm-wifi-utils.c:458
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
 msgstr "アドホックモード� 802.1x セキュリティー�互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:496
+#: ../src/devices/wifi/nm-wifi-utils.c:467
 msgid "Ad-Hoc mode is incompatible with LEAP security"
 msgstr "アドホックモード� LEAP セキュリティー�互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:506
+#: ../src/devices/wifi/nm-wifi-utils.c:477
 msgid "Ad-Hoc mode requires 'open' authentication"
 msgstr "アドホックモード�� 'open' �証�必���"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:516
-msgid ""
-"Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr "アクセス�イントモード�インフラストラク�ャー����設定��アドホックセキュリティー�必���"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:559
-#: ../src/devices/wifi/nm-wifi-utils.c:591
+#: ../src/devices/wifi/nm-wifi-utils.c:519
+#: ../src/devices/wifi/nm-wifi-utils.c:551
 #, c-format
 msgid "connection does not match access point"
 msgstr "接続�アクセス�イント�一致���ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:645
+#: ../src/devices/wifi/nm-wifi-utils.c:605
 #, c-format
 msgid "connection does not match mesh point"
 msgstr "接続�メッシュ�イント�一致���ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:662
+#: ../src/devices/wifi/nm-wifi-utils.c:622
 msgid "Access point is unencrypted but setting specifies security"
 msgstr "アクセス�イント�暗�化�れ����ん��設定��セキュリティー�指定�れ����"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:751
+#: ../src/devices/wifi/nm-wifi-utils.c:711
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr "WPA �証��� EAP (オリジナル) LEAP ���動的 WEP �互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:761
+#: ../src/devices/wifi/nm-wifi-utils.c:721
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr "WPA �証��共有キー�証�互�性��り��ん"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:814
+#: ../src/devices/wifi/nm-wifi-utils.c:776
 msgid "Failed to determine AP security information"
 msgstr "AP セキュリティー情報�決定�失敗����。"
 
-#: ../src/nm-config.c:580
+#: ../src/nm-config.c:572
 #, c-format
 msgid "Bad '%s' option: "
 msgstr "�正� '%s' オプション: "
 
-#: ../src/nm-config.c:593
+#: ../src/nm-config.c:585
 msgid "Config file location"
 msgstr "設定ファイル�場所"
 
-#: ../src/nm-config.c:594
+#: ../src/nm-config.c:586
 msgid "Config directory location"
 msgstr "設定ディレクトリ�場所"
 
-#: ../src/nm-config.c:595
+#: ../src/nm-config.c:587
 msgid "System config directory location"
 msgstr "システム設定ディレクトリー�場所"
 
-#: ../src/nm-config.c:596
+#: ../src/nm-config.c:588
 msgid "Internal config file location"
 msgstr "内部設定ファイル�場所"
 
-#: ../src/nm-config.c:597
+#: ../src/nm-config.c:589
 msgid "State file location"
 msgstr "状態ファイル�場所"
 
-#: ../src/nm-config.c:598
+#: ../src/nm-config.c:590
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default デ�イス�状態ファイル"
 
-#: ../src/nm-config.c:599
+#: ../src/nm-config.c:591
 msgid "List of plugins separated by ','"
 msgstr "複数�プラグインを ',' �区切��一覧"
 
-#: ../src/nm-config.c:600
+#: ../src/nm-config.c:592
 msgid "Quit after initial configuration"
 msgstr "�期設定後�終了�る"
 
-#: ../src/nm-config.c:601 ../src/nm-iface-helper.c:294
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
 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:604
+#: ../src/nm-config.c:596
 msgid "An http(s) address for checking internet connectivity"
 msgstr "インター�ット�接続性を確��る��� http(s) アドレス"
 
-#: ../src/nm-config.c:605
+#: ../src/nm-config.c:597
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "接続性�ェック�間隔 (秒��)"
 
-#: ../src/nm-config.c:606
+#: ../src/nm-config.c:598
 msgid "The expected start of the response"
 msgstr "期待�れ��る応答�開始点"
 
-#: ../src/nm-config.c:613
+#: ../src/nm-config.c:605
 msgid "NetworkManager options"
 msgstr "NetworkManager オプション"
 
-#: ../src/nm-config.c:613
+#: ../src/nm-config.c:605
 msgid "Show NetworkManager options"
 msgstr "NetworkManager オプションを表示"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:274
+#: ../src/nm-iface-helper.c:277
 msgid "The interface to manage"
 msgstr "管��るインターフェース"
 
-#: ../src/nm-iface-helper.c:275
+#: ../src/nm-iface-helper.c:278
 msgid "Connection UUID"
 msgstr "接続 UUID"
 
-#: ../src/nm-iface-helper.c:276
+#: ../src/nm-iface-helper.c:279
 msgid "Connection Token for Stable IDs"
 msgstr "安定 ID �接続トークン"
 
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:280
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "IPv6 SLAAC を管��る����"
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:281
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC ��功�る必���る����"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:282
 msgid "Use an IPv6 temporary privacy address"
 msgstr "IPv6 一時プライ�シーアドレス�使用"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:283
 msgid "Current DHCPv4 address"
 msgstr "�在� DHCPv4 アドレス"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:284
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 ��功�る必���る����"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:285
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "16 進エンコード�れ� DHCPv4 クライアント ID"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:286
 msgid "Hostname to send to DHCP server"
 msgstr "DHCP サー�ー��信�るホスト�"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:286
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:287
 msgid "FQDN to send to DHCP server"
 msgstr "DHCP サー�ー��信�る FQDN"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:287
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:288
 msgid "Route priority for IPv4"
 msgstr "IPv4 �ルート優先度"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:288
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:289
 msgid "Route priority for IPv6"
 msgstr "IPv6 �ルート優先度"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:289
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:290
 msgid "Hex-encoded Interface Identifier"
 msgstr "16 進エンコード�れ�インターフェース ID"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:291
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC アドレス生�モード"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:292
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr "ロギング�ックエンド設定値。NetworkManager.conf � logging.backend を�照������"
 
-#: ../src/nm-iface-helper.c:309
+#: ../src/nm-iface-helper.c:312
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr "nm-iface-helper ���一��ットワークインターフェースを管��る���スタンドアロンプロセス��。"
 
-#: ../src/nm-iface-helper.c:420
+#: ../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:427
+#: ../src/nm-iface-helper.c:430
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "%s (%s) �インターフェースインデックス�検出�失敗����\n"
 
-#: ../src/nm-iface-helper.c:445
+#: ../src/nm-iface-helper.c:448
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "コマンドライン�渡�れ�未�識�ログドメイン '%s' を無視���。\n"
 
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:489
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "(%s): 無効� IID %s\n"
 
-#: ../src/nm-iface-helper.c:497
+#: ../src/nm-iface-helper.c:500
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "(%s): 無効� DHCP client-id %s\n"
 
-#: ../src/nm-logging.c:298
+#: ../src/nm-logging.c:253
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "�明�ログレベル '%s'"
 
-#: ../src/nm-logging.c:408
+#: ../src/nm-logging.c:363
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "�明�ログドメイン '%s'"
+
+#~ msgid "Unknown parameter: %s\n"
+#~ msgstr "�明�パラメーター: %s\n"
+
+#~ msgid "Unknown parameter: %s"
+#~ msgstr "�明�パラメーター: %s"
+
+#~ msgid "Error: Device activation failed: device was disconnected"
+#~ msgstr ""
+#~ "エラー: デ�イス�アクティベート�失敗����: デ�イス�切断�れ���"
+
+#~ msgid "Error: Unknown parameter %s."
+#~ msgstr "エラー: �明�パラメータ %s ��。"
+
+#~ msgid "%d. route cannot be a default route"
+#~ msgstr "%d. ルートをデフォルトルート��る�������ん"
+
+#~ msgid "'%s' connections require '%s' in this property"
+#~ msgstr "'%s' �接続�場����プロパティー� '%s' �必���り��"
+
+#~ msgid "The connection was not a WiMAX connection."
+#~ msgstr "接続� WiMAX 接続���り��ん���。"
+
+#~ msgid "Checkpoint was removed before it was initialized"
+#~ msgstr "�ェック�イント��期化��削除�れ���"
+
+#~ msgid "Active connection removed before it was initialized"
+#~ msgstr "アクティブ�接続��期化��削除�れ���"
+
+#~ msgid "Connection removed before it was initialized"
+#~ msgstr "接続��期化��削除�れ���"
+
+#~ msgid "WPA Ad-Hoc disabled due to kernel bugs"
+#~ msgstr "WPA アドホック�カー�ル�グ���無効��り���"
+
+#~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
+#~ msgstr "WPA アドホック�証��アドホックモード AP �必���"
+
+#~ msgid ""
+#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
+#~ msgstr ""
+#~ "アクセス�イントモード�アドホック����設定��インフラストラク�ャーセ"
+#~ "キュリティー�必���"
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 203b62bb..c931be3f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-31 17:50+0200\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-12-23 18:47+0100\n"
 "PO-Revision-Date: 2019-08-15 12:20+0000\n"
 "Last-Translator: tfu <tfu@redhat.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../clients/cli/agent.c:39
+#: ../clients/cli/agent.c:23
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -41,7 +41,7 @@ msgstr "用法：nmcli agent { 命令 | help }\n"
 "命令 := { secret | polkit | all }\n"
 "\n"
 
-#: ../clients/cli/agent.c:47
+#: ../clients/cli/agent.c:31
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -51,15 +51,13 @@ msgid ""
 "running\n"
 "and if a password is required asks the user for it.\n"
 "\n"
-msgstr ""
-"用法：nmcli agent secret { help }\n"
+msgstr "用法：nmcli agent secret { help }\n"
 "\n"
 "将 nmcli 作为网络管�器（NetworkManager）的密钥（secret）代��行。当 NetworkManager �求密�时，它将请求\n"
 "注册的代��供。这个命令将使 nmcli ���行，如果�求密�则会请求用户�供。\n"
 "\n"
-"\n"
 
-#: ../clients/cli/agent.c:57
+#: ../clients/cli/agent.c:41
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -69,68 +67,66 @@ msgid ""
 "gives\n"
 "the response back to polkit.\n"
 "\n"
-msgstr ""
-"用法：nmcli agent polkit { help }\n"
+msgstr "用法：nmcli agent polkit { help }\n"
 "\n"
 "将 nmcli 注册为用于用户会�的 polkit �作。\n"
 "当 polkit 守护进程�求授�时，nmcli 询问用户�将其�应返回 polkit。\n"
 "\n"
 
-#: ../clients/cli/agent.c:67
+#: ../clients/cli/agent.c:51
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
 "\n"
 "Runs nmcli as both NetworkManager secret and a polkit agent.\n"
 "\n"
-msgstr ""
-"用法：nmcli agent all { help }\n"
+msgstr "用法：nmcli agent all { help }\n"
 "\n"
 "将 nmcli �时作为网络管�器（NetworkManager）的密钥（secret）代�� polkit 代��行。\n"
 "\n"
 
-#: ../clients/cli/agent.c:159
+#: ../clients/cli/agent.c:143
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr "nmcli 已�功地注册为网络管�器（NetworkManager）的密钥（secret）代�。\n"
 
-#: ../clients/cli/agent.c:161
+#: ../clients/cli/agent.c:145
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "错误：密钥（secret）代��始化失败"
 
-#: ../clients/cli/agent.c:180
+#: ../clients/cli/agent.c:164
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "错误：polkit 代��始化失败：%s"
 
-#: ../clients/cli/agent.c:188
+#: ../clients/cli/agent.c:172
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli 已�功地注册为 polkit 代�。\n"
 
-#: ../clients/cli/common.c:360 ../clients/cli/common.c:361
-#: ../clients/cli/common.c:392 ../clients/cli/common.c:393
-#: ../clients/cli/connections.c:1503
+#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
+#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
+#: ../clients/cli/connections.c:1495
 msgid "GROUP"
 msgstr "组"
 
-#: ../clients/cli/common.c:644
+#: ../clients/cli/common.c:628
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "错误：openconnect 失败：%s\n"
 
-#: ../clients/cli/common.c:651
+#: ../clients/cli/common.c:635
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "错误：openconnect 失败，状�为 %d\n"
 
-#: ../clients/cli/common.c:653
+#: ../clients/cli/common.c:637
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "错误：openconnect 失败，信�为 %d\n"
 
-#: ../clients/cli/common.c:741
+#: ../clients/cli/common.c:725
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -138,139 +134,148 @@ msgid ""
 msgstr "警告：\"passwd-file\" 里没有给定 \"%s\" 的密�而且 nmcli 没有 \"--ask\" 选项就无法进行\n"
 "询问。\n"
 
-#: ../clients/cli/common.c:1241
+#: ../clients/cli/common.c:1227
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "错误：无法创建 NMClient 对象：%s。"
 
-#: ../clients/cli/common.c:1261
+#: ../clients/cli/common.c:1246
 msgid "Error: NetworkManager is not running."
 msgstr "错误：网络管�器（NetworkManager）未�行。"
 
-#: ../clients/cli/common.c:1357
+#: ../clients/cli/common.c:1339
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "错误：�能�解�数 \"%s\"。试下��传递 --help �数。"
 
-#: ../clients/cli/common.c:1367
+#: ../clients/cli/common.c:1347
 msgid "Error: missing argument. Try passing --help."
 msgstr "错误：缺少�数。试下传递 --help �数。"
 
-#: ../clients/cli/common.c:1436
+#: ../clients/cli/common.c:1414
 msgid "access denied"
 msgstr "访问�到拒�"
 
-#: ../clients/cli/common.c:1444 ../clients/cli/connections.c:80
-#: ../clients/cli/connections.c:89 ../clients/cli/devices.c:438
-#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:537
-#: ../clients/cli/general.c:40 ../clients/cli/general.c:130
-#: ../clients/cli/general.c:135 ../clients/common/nm-client-utils.c:264
-#: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:281
-#: ../clients/common/nm-client-utils.c:286
-#: ../clients/common/nm-meta-setting-desc.c:1711
-#: ../clients/common/nm-meta-setting-desc.c:1742
-#: ../clients/common/nm-meta-setting-desc.c:2674
-#: ../clients/common/nm-meta-setting-desc.c:2732
+#: ../clients/cli/common.c:1416
+msgid "NetworkManager is not running"
+msgstr "NetworkManaer 未�行"
+
+#: ../clients/cli/common.c:1442
+#, c-format
+msgid "Error: error connecting to system bus: %s"
+msgstr "错误：连接到系统总线时出错： %s"
+
+#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
+#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
+#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
+#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
+#: ../clients/common/nm-client-utils.c:263
+#: ../clients/common/nm-client-utils.c:267
+#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-meta-setting-desc.c:1724
+#: ../clients/common/nm-meta-setting-desc.c:1755
+#: ../clients/common/nm-meta-setting-desc.c:2687
+#: ../clients/common/nm-meta-setting-desc.c:2745
 msgid "unknown"
 msgstr "未知"
 
-#: ../clients/cli/common.c:1445
+#: ../clients/cli/common.c:1469
 msgid "none"
 msgstr "æ— "
 
-#: ../clients/cli/common.c:1446
+#: ../clients/cli/common.c:1470
 msgid "portal"
 msgstr "入�"
 
-#: ../clients/cli/common.c:1447
+#: ../clients/cli/common.c:1471
 msgid "limited"
 msgstr "��"
 
-#: ../clients/cli/common.c:1448
+#: ../clients/cli/common.c:1472
 msgid "full"
 msgstr "完全"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:64
+#: ../clients/cli/connections.c:50
 msgid "Setting name? "
-msgstr "设置�称？"
+msgstr "设置�称？ "
 
-#: ../clients/cli/connections.c:65
+#: ../clients/cli/connections.c:51
 msgid "Property name? "
-msgstr "属性�称？"
+msgstr "属性�称？ "
 
-#: ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:52
 msgid "Enter connection type: "
-msgstr "输入连接类型："
+msgstr "输入连接类型： "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:56
 msgid "Connection (name, UUID, or path): "
-msgstr "连接（�称�UUID 或路径）："
+msgstr "连接（�称�UUID 或路径）： "
 
-#: ../clients/cli/connections.c:71
+#: ../clients/cli/connections.c:57
 msgid "VPN connection (name, UUID, or path): "
-msgstr "VPN 连接（�称�UUID 或路径）："
+msgstr "VPN 连接（�称�UUID 或路径）： "
 
-#: ../clients/cli/connections.c:72
+#: ../clients/cli/connections.c:58
 msgid "Connection(s) (name, UUID, or path): "
-msgstr "连接（�称�UUID 或路径）："
+msgstr "连接（�称�UUID 或路径）： "
 
 # apath = active path
-#: ../clients/cli/connections.c:73
+#: ../clients/cli/connections.c:59
 msgid "Connection(s) (name, UUID, path or apath): "
-msgstr "连接（�称�UUID�路径或活动路径）："
+msgstr "连接（�称�UUID�路径或活动路径）： "
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:67
 msgid "activating"
 msgstr "激活中"
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:68
 msgid "activated"
 msgstr "已激活"
 
-#: ../clients/cli/connections.c:83 ../clients/common/nm-client-utils.c:275
+#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
 msgid "deactivating"
 msgstr "�用中"
 
-#: ../clients/cli/connections.c:84
+#: ../clients/cli/connections.c:70
 msgid "deactivated"
 msgstr "已�用"
 
-#: ../clients/cli/connections.c:90
+#: ../clients/cli/connections.c:76
 msgid "VPN connecting (prepare)"
 msgstr "VPN 连接中（准备）"
 
-#: ../clients/cli/connections.c:91
+#: ../clients/cli/connections.c:77
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 连接中（需�验�）"
 
-#: ../clients/cli/connections.c:92
+#: ../clients/cli/connections.c:78
 msgid "VPN connecting"
 msgstr "VPN 连接中"
 
-#: ../clients/cli/connections.c:93
+#: ../clients/cli/connections.c:79
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 连接中（获� IP �置中）"
 
-#: ../clients/cli/connections.c:94
+#: ../clients/cli/connections.c:80
 msgid "VPN connected"
 msgstr "VPN 已连接"
 
-#: ../clients/cli/connections.c:95
+#: ../clients/cli/connections.c:81
 msgid "VPN connection failed"
 msgstr "VPN 连接失败"
 
-#: ../clients/cli/connections.c:96
+#: ../clients/cli/connections.c:82
 msgid "VPN disconnected"
 msgstr "VPN 已断开"
 
-#: ../clients/cli/connections.c:558
+#: ../clients/cli/connections.c:544
 msgid "never"
 msgstr "从�"
 
-#: ../clients/cli/connections.c:911
+#: ../clients/cli/connections.c:904
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -286,8 +291,8 @@ msgid ""
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
+"([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
 "<value>)+\n"
@@ -309,25 +314,20 @@ msgid ""
 "\n"
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
-msgstr ""
-"Usage: nmcli connection { COMMAND | help }\n"
+msgstr "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | clone | edit | delete | "
-"monitor | reload | load | import | export }\n"
+"COMMAND := { show | up | down | add | modify | clone | edit | delete | monitor | reload | load | import | export }\n"
 "\n"
 "  show [--active] [--order <order spec>]\n"
 "  show [--active] [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
-"<file with passwords>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file <file with passwords>]\n"
 "\n"
 "  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
-"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-"
-"]<setting>.<property> <value>)+]\n"
+"  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
-"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
-"<value>)+\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
 "  clone [--temporary] [id | uuid | path ] <ID> <new name>\n"
 "\n"
@@ -347,7 +347,7 @@ msgstr ""
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:926
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -372,8 +372,7 @@ msgid ""
 "When --active option is specified, only the active profiles are taken into\n"
 "account. Use global --show-secrets option to reveal associated secrets as "
 "well.\n"
-msgstr ""
-"用法：nmcli connection show { �数 | help }\n"
+msgstr "用法：nmcli connection show { �数 | help }\n"
 "\n"
 "�数 := [--active] [--order <排�规则>]\n"
 "\n"
@@ -387,7 +386,7 @@ msgstr ""
 "局的 \"--fields\" 选项过滤输出。更多信�请�考手册页。当指定 --active 选项时，�\n"
 "会考虑活动的�置集。请使用全局的 --show-secrets 选项以�时显示关�的密钥（secret）。\n"
 
-#: ../clients/cli/connections.c:954
+#: ../clients/cli/connections.c:947
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -410,11 +409,9 @@ msgid ""
 "nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
 "passwd-file - file with password(s) required to activate the connection\n"
 "\n"
-msgstr ""
-"用法：nmcli connection up { �数 | help }\n"
+msgstr "用法：nmcli connection up { �数 | help }\n"
 "\n"
-"�数 := [id | uuid | path] <ID> [ifname <接��>] [ap <BSSID>] [nsp <�称>] [passwd-"
-"file <密�文件>]\n"
+"�数 := [id | uuid | path] <ID> [ifname <接��>] [ap <BSSID>] [nsp <�称>] [passwd-file <密�文件>]\n"
 "\n"
 "激活设备上的连接。�激活的�置集由它的�称�UUID 或 D-Bus 路径�确定。\n"
 "\n"
@@ -427,7 +424,7 @@ msgstr ""
 "nsp         - 指定�连接的 NSP（�对 WiMAX 有效）\n"
 "passwd-file - 激活连接所需的密�文件\n"
 
-#: ../clients/cli/connections.c:975
+#: ../clients/cli/connections.c:968
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -439,8 +436,7 @@ msgid ""
 "name,\n"
 "UUID or D-Bus path.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection down { �数 | help }\n"
+msgstr "用法：nmcli connection down { �数 | help }\n"
 "\n"
 "�数 := [id | uuid | path | apath] <ID> ...\n"
 "\n"
@@ -448,13 +444,13 @@ msgstr ""
 "D-Bus 路径�确定。\n"
 "\n"
 
-#: ../clients/cli/connections.c:987
+#: ../clients/cli/connections.c:980
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS "
+"[-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -541,8 +537,8 @@ msgid ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -605,11 +601,9 @@ msgid ""
 "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
-msgstr ""
-"Usage: nmcli connection add { ARGUMENTS | help }\n"
+msgstr "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-"
-"- ([+|-]<setting>.<property> <value>)+]\n"
+"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- ([+|-]<setting>.<property> <value>)+]\n"
 "\n"
 "  COMMON_OPTIONS:\n"
 "                  type <type>\n"
@@ -663,10 +657,8 @@ msgstr ""
 "                  [egress <egress priority mapping>]\n"
 "                  [mtu <MTU>]\n"
 "\n"
-"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) "
-"| broadcast (3) |\n"
-"                        802.3ad    (4) | balance-tlb   (5) | balance-alb "
-"(6)]\n"
+"    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+"                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
 "                  [primary <ifname>]\n"
 "                  [miimon <num>]\n"
 "                  [downdelay <num>]\n"
@@ -696,8 +688,7 @@ msgstr ""
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type "
-"vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
@@ -761,7 +752,7 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:1111
+#: ../clients/cli/connections.c:1104
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -776,16 +767,15 @@ msgid ""
 "\n"
 "Examples:\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
 "nmcli con mod bond0 +bond.options mii=500\n"
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
-msgstr ""
-"用法：nmcli connection modify { �数 | help }\n"
+msgstr "用法：nmcli connection modify { �数 | help }\n"
 "\n"
 "�数 := [id | uuid | path] <ID> ([+|-]<设置>.<属性> <值>)+\n"
 "\n"
@@ -795,8 +785,7 @@ msgstr ""
 "\n"
 "示例：\n"
 "nmcli con mod home-wifi wifi.ssid rakosnicek\n"
-"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
 "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
 "nmcli con mod em1-1 -ipv4.dns 1\n"
 "nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
@@ -804,7 +793,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1134
+#: ../clients/cli/connections.c:1127
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -812,11 +801,11 @@ msgid ""
 "ARGUMENTS := [--temporary] [id | uuid | path] <ID> <new name>\n"
 "\n"
 "Clone an existing connection profile. The newly created connection will be\n"
-"the exact copy of the <ID>, except the uuid property (will be generated) and\n"
+"the exact copy of the <ID>, except the uuid property (will be generated) "
+"and\n"
 "id (provided as <new name> argument).\n"
 "\n"
-msgstr ""
-"用法：nmcli connection clone { �数 | help }\n"
+msgstr "用法：nmcli connection clone { �数 | help }\n"
 "\n"
 "�数 := [--temporary] [id | uuid | path] <ID> <新�称>\n"
 "\n"
@@ -824,7 +813,7 @@ msgstr ""
 "�）和 ID（由 <新�称> �数�供）��。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1146
+#: ../clients/cli/connections.c:1139
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -838,8 +827,7 @@ msgid ""
 "\n"
 "Add a new connection profile in an interactive editor.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection edit { �数 | help }\n"
+msgstr "用法：nmcli connection edit { �数 | help }\n"
 "\n"
 "�数 := [id | uuid | path] <ID>\n"
 "\n"
@@ -851,7 +839,7 @@ msgstr ""
 "在交互�编辑器中添加新的连接�置文件。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1161
+#: ../clients/cli/connections.c:1154
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -861,8 +849,7 @@ msgid ""
 "Delete a connection profile.\n"
 "The profile is identified by its name, UUID or D-Bus path.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection delete { �数 | help }\n"
+msgstr "用法：nmcli connection delete { �数 | help }\n"
 "\n"
 "�数 := [id | uuid | path] <ID>\n"
 "\n"
@@ -870,7 +857,7 @@ msgstr ""
 "�置集由其�称�UUID 或 D-Bus 路径�确定。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1172
+#: ../clients/cli/connections.c:1165
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -881,8 +868,7 @@ msgid ""
 "This command prints a line whenever the specified connection changes.\n"
 "Monitors all connection profiles in case none is specified.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection monitor { �数 | help }\n"
+msgstr "用法：nmcli connection monitor { �数 | help }\n"
 "\n"
 "�数 := [id | uuid | path] <ID> ...\n"
 "\n"
@@ -890,7 +876,7 @@ msgstr ""
 "�当指定的连接修改时，这个命令将其打�出�。如果没有指定则监视所有的连接。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1184
+#: ../clients/cli/connections.c:1177
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -902,7 +888,7 @@ msgstr "用法：nmcli connection reload { help }\n"
 "从�盘�新载入所有的连接文件。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1192
+#: ../clients/cli/connections.c:1185
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -914,8 +900,7 @@ msgid ""
 "latest\n"
 "state.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection load { �数 | help }\n"
+msgstr "用法：nmcli connection load { �数 | help }\n"
 "\n"
 "�数 := <文件�> [<文件�>...]\n"
 "\n"
@@ -923,7 +908,7 @@ msgstr ""
 "网络管�器（NetworkManager）能注�到它的最新状�。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1204
+#: ../clients/cli/connections.c:1197
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -936,8 +921,7 @@ msgid ""
 "Only VPN configurations are supported at the moment. The configuration\n"
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection import { �数 | help }\n"
+msgstr "用法：nmcli connection import { �数 | help }\n"
 "\n"
 "�数 := [--temporary] type <类型> file <�导入的文件>\n"
 "\n"
@@ -945,7 +929,7 @@ msgstr ""
 "目��支� VPN �置。�置通过 NetworkManager VPN �件导入。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1217
+#: ../clients/cli/connections.c:1210
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -955,424 +939,425 @@ msgid ""
 "Export a connection. Only VPN connections are supported at the moment.\n"
 "The data are directed to standard output or to a file if a name is given.\n"
 "\n"
-msgstr ""
-"用法：nmcli connection export { �数 | help }\n"
+msgstr "用法：nmcli connection export { �数 | help }\n"
 "\n"
 "�数 := [id | uuid | path] <ID> [<输出文件>]\n"
 "\n"
 "导出连接。目��支� VPN 连接。数�会导出到标准输出或文件（如果给定了）。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1307
+#: ../clients/cli/connections.c:1301
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "更新 %s 的密钥时出错：%s\n"
 
-#: ../clients/cli/connections.c:1356
+#: ../clients/cli/connections.c:1348
 msgid "Connection profile details"
 msgstr "连接�置集详情"
 
-#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1454
+#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "错误：\"connection show\"：%s"
 
-#: ../clients/cli/connections.c:1444
+#: ../clients/cli/connections.c:1436
 msgid "Activate connection details"
 msgstr "激活连接详情"
 
-#: ../clients/cli/connections.c:1552 ../clients/cli/devices.c:1452
-#: ../clients/cli/devices.c:1466 ../clients/cli/devices.c:1481
-#: ../clients/cli/devices.c:1539 ../clients/cli/devices.c:1641
+#: ../clients/cli/connections.c:1544 ../clients/cli/devices.c:1485
+#: ../clients/cli/devices.c:1499 ../clients/cli/devices.c:1513
+#: ../clients/cli/devices.c:1528 ../clients/cli/devices.c:1586
+#: ../clients/cli/devices.c:1688
 msgid "NAME"
 msgstr "�称"
 
-#: ../clients/cli/connections.c:1645
+#: ../clients/cli/connections.c:1637
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "无效字段 \"%s\"；�许的字段为 %s 和 %s，或 %s,%s"
 
-#: ../clients/cli/connections.c:1655 ../clients/cli/connections.c:1663
+#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "\"%s\" 必须是�独的"
 
-#: ../clients/cli/connections.c:1923
+#: ../clients/cli/connections.c:1915
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "\"--order\" 选项的字符串 \"%s\" 错误"
 
-#: ../clients/cli/connections.c:1948
+#: ../clients/cli/connections.c:1940
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "\"--order\" 选项里有错误项 \"%s\""
 
-#: ../clients/cli/connections.c:1986
+#: ../clients/cli/connections.c:1978
 msgid "No connection specified"
 msgstr "未指定连接"
 
-#: ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:1989
 #, c-format
 msgid "%s argument is missing"
 msgstr "缺少 %s �数"
 
-#: ../clients/cli/connections.c:2015
+#: ../clients/cli/connections.c:2007
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "未知的连接 \"%s\""
 
-#: ../clients/cli/connections.c:2044
+#: ../clients/cli/connections.c:2036
 msgid "'--order' argument is missing"
 msgstr "缺少 \"--order\" �数"
 
-#: ../clients/cli/connections.c:2104
+#: ../clients/cli/connections.c:2096
 msgid "NetworkManager active profiles"
 msgstr "网络管�器活动的�置集"
 
-#: ../clients/cli/connections.c:2105
+#: ../clients/cli/connections.c:2097
 msgid "NetworkManager connection profiles"
 msgstr "网络管�器连接�置集"
 
-#: ../clients/cli/connections.c:2157 ../clients/cli/connections.c:2902
-#: ../clients/cli/connections.c:2914 ../clients/cli/connections.c:2926
-#: ../clients/cli/connections.c:3155 ../clients/cli/connections.c:8873
-#: ../clients/cli/connections.c:8894 ../clients/cli/devices.c:2974
-#: ../clients/cli/devices.c:2986 ../clients/cli/devices.c:2999
-#: ../clients/cli/devices.c:3193 ../clients/cli/devices.c:3204
-#: ../clients/cli/devices.c:3222 ../clients/cli/devices.c:3231
-#: ../clients/cli/devices.c:3252 ../clients/cli/devices.c:3263
-#: ../clients/cli/devices.c:3281 ../clients/cli/devices.c:3725
-#: ../clients/cli/devices.c:3735 ../clients/cli/devices.c:3743
-#: ../clients/cli/devices.c:3755 ../clients/cli/devices.c:3770
-#: ../clients/cli/devices.c:3778 ../clients/cli/devices.c:3953
-#: ../clients/cli/devices.c:3964 ../clients/cli/devices.c:4135
+#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
+#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
+#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
+#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
+#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
+#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
+#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
+#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
+#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
+#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
+#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
+#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
+#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
+#: ../clients/cli/devices.c:4495
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "错误：缺少 %s �数。"
 
-#: ../clients/cli/connections.c:2185
+#: ../clients/cli/connections.c:2177
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "错误：%s - 没有这样的连接�置集。"
 
-#: ../clients/cli/connections.c:2276 ../clients/cli/connections.c:2889
-#: ../clients/cli/connections.c:2953 ../clients/cli/connections.c:8417
-#: ../clients/cli/connections.c:8508 ../clients/cli/connections.c:8994
-#: ../clients/cli/devices.c:1726 ../clients/cli/devices.c:1993
-#: ../clients/cli/devices.c:2166 ../clients/cli/devices.c:2274
-#: ../clients/cli/devices.c:2466 ../clients/cli/devices.c:3916
-#: ../clients/cli/devices.c:4141 ../clients/cli/general.c:896
+#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
+#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
+#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
+#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
+#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
+#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
+#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
+#: ../clients/cli/general.c:982
 #, c-format
 msgid "Error: %s."
 msgstr "错误：%s。"
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "设备 \"%s\" 上没有活动的连接"
 
-#: ../clients/cli/connections.c:2377
+#: ../clients/cli/connections.c:2369
 msgid "no active connection or device"
 msgstr "没有活动的连接或设备"
 
-#: ../clients/cli/connections.c:2397
+#: ../clients/cli/connections.c:2389
 #, c-format
 msgid "device '%s' not compatible with connection '%s': "
 msgstr "设备 '%s' 与连接 '%s' �兼容： "
 
-#: ../clients/cli/connections.c:2430
+#: ../clients/cli/connections.c:2422
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "设备 \"%s\" 与连接 \"%s\" �兼容"
 
-#: ../clients/cli/connections.c:2433
+#: ../clients/cli/connections.c:2425
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "没有找到�用于连接 \"%s\" 的设备"
 
-#: ../clients/cli/connections.c:2484
+#: ../clients/cli/connections.c:2476
 #, c-format
 msgid "Hint: use '%s' to get more details."
 msgstr "�示：使用 '%s' �获得更详细的信�。"
 
-#: ../clients/cli/connections.c:2502
+#: ../clients/cli/connections.c:2494
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "连接已�功激活（%s）（D-Bus 活动路径：%s）\n"
 
-#: ../clients/cli/connections.c:2506 ../clients/cli/connections.c:2656
-#: ../clients/cli/connections.c:6738
+#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
+#: ../clients/cli/connections.c:6798
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "连接已�功激活（D-Bus 活动路径：%s）\n"
 
-#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2635
+#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "错误：连接激活失败：%s"
 
-#: ../clients/cli/connections.c:2550
+#: ../clients/cli/connections.c:2542
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "错误：超时时间已到（%d 秒）"
 
-#: ../clients/cli/connections.c:2718
+#: ../clients/cli/connections.c:2709
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "读� passwd-file \"%s\" 失败：%s"
 
-#: ../clients/cli/connections.c:2731
+#: ../clients/cli/connections.c:2722
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "\"password\" �目 \"%s\" 缺失了冒�"
 
-#: ../clients/cli/connections.c:2739
+#: ../clients/cli/connections.c:2730
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "\"password\" �目 \"%s\" 缺失了点�"
 
-#: ../clients/cli/connections.c:2752
+#: ../clients/cli/connections.c:2743
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "\"password\" �目 \"%s\" 里出现无效的设置�称"
 
-#: ../clients/cli/connections.c:2806
+#: ../clients/cli/connections.c:2800
 #, c-format
 msgid "unknown device '%s'."
 msgstr "未知设备 \"%s\"。"
 
-#: ../clients/cli/connections.c:2811
+#: ../clients/cli/connections.c:2805
 msgid "neither a valid connection nor device given"
 msgstr "没有给定有效的连接或设备"
 
-#: ../clients/cli/connections.c:2936 ../clients/cli/devices.c:1685
-#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3294
-#: ../clients/cli/devices.c:3970
+#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
+#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
+#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
+#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
+#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
+#: ../clients/cli/devices.c:4505
 #, c-format
-msgid "Unknown parameter: %s\n"
-msgstr "未知�数：%s\n"
+msgid "Error: invalid extra argument '%s'."
+msgstr "错误：无效的�外�数 \"%s\"。"
 
-#: ../clients/cli/connections.c:2961
+#: ../clients/cli/connections.c:2955
 msgid "preparing"
 msgstr "准备中"
 
-#: ../clients/cli/connections.c:3070
+#: ../clients/cli/connections.c:3064
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "�功删除连接 \"%s\" (%s)。\n"
 
-#: ../clients/cli/connections.c:3086
+#: ../clients/cli/connections.c:3080
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "�功�用连接 \"%s\"（D-Bus 活动路径：%s）\n"
-"\n"
 
-#: ../clients/cli/connections.c:3137 ../clients/cli/connections.c:8604
-#: ../clients/cli/connections.c:8635 ../clients/cli/connections.c:8794
+#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
+#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
 #, c-format
 msgid "Error: No connection specified."
 msgstr "错误：未指定连接。"
 
-#: ../clients/cli/connections.c:3167
+#: ../clients/cli/connections.c:3161
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "错误：\"%s\" �是活动的连接。\n"
 
-#: ../clients/cli/connections.c:3168
+#: ../clients/cli/connections.c:3162
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "错误：未找到所有的活动连接。"
 
-#: ../clients/cli/connections.c:3176
+#: ../clients/cli/connections.c:3170
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "错误：未�供活动连接。"
 
-#: ../clients/cli/connections.c:3207
+#: ../clients/cli/connections.c:3201
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "错误：�用连接 \"%s\" 失败：%s\n"
 
-#: ../clients/cli/connections.c:3458 ../clients/cli/connections.c:3515
-#: ../clients/common/nm-client-utils.c:225
+#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
+#: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "\"%s\" �在 [%s] 中"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3478 ../clients/cli/connections.c:3538
-#: ../clients/common/nm-client-utils.c:293
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
+#: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../clients/cli/connections.c:3672
+#: ../clients/cli/connections.c:3675
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告：master=\"%s\" 没有引用任何现有的�置集。\n"
 
-#: ../clients/cli/connections.c:4027
+#: ../clients/cli/connections.c:4038
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "错误：无效的属性 \"%s\"：%s。"
 
-#: ../clients/cli/connections.c:4041
+#: ../clients/cli/connections.c:4053
 #, c-format
 msgid "Error: failed to %s %s.%s: %s."
 msgstr "错误：%s %s.%s 失败 : %s."
 
-#: ../clients/cli/connections.c:4076
+#: ../clients/cli/connections.c:4095
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "错误：设置 \"%s\" 是必填的。"
 
-#: ../clients/cli/connections.c:4103
+#: ../clients/cli/connections.c:4122
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "错误：无效的从属类型；%s。"
 
-#: ../clients/cli/connections.c:4111
+#: ../clients/cli/connections.c:4130
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "错误：无效的连接类型；%s。"
 
-#: ../clients/cli/connections.c:4188
+#: ../clients/cli/connections.c:4207
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "错误：错误的连接类型：%s"
 
-#: ../clients/cli/connections.c:4234
+#: ../clients/cli/connections.c:4263
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "错误：\"%s\"：%s"
 
-#: ../clients/cli/connections.c:4255
+#: ../clients/cli/connections.c:4290
 msgid "Error: master is required"
 msgstr "错误：需�主连接"
 
-#: ../clients/cli/connections.c:4314
+#: ../clients/cli/connections.c:4359
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "错误：添加绑定（bond）选项 \"%s=%s\" 时出错。"
 
-#: ../clients/cli/connections.c:4345
+#: ../clients/cli/connections.c:4390
 #, 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:4376
+#: ../clients/cli/connections.c:4421
 #, 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:4625
+#: ../clients/cli/connections.c:4686
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "错误：缺少 \"%s\" 的值。"
 
-#: ../clients/cli/connections.c:4671
+#: ../clients/cli/connections.c:4730
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "错误：缺少 <设置>.<属性> �数。"
 
-#: ../clients/cli/connections.c:4694
+#: ../clients/cli/connections.c:4756
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "错误：无效或��许的设置 \"%s\"：%s。"
 
-#: ../clients/cli/connections.c:4742 ../clients/cli/connections.c:4758
+#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "错误：\"%s\" �明确（%s.%s 或 %s.%s）。"
 
-#: ../clients/cli/connections.c:4776
+#: ../clients/cli/connections.c:4837
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Error: invalid <setting>.<property> '%s'."
 
-#: ../clients/cli/connections.c:4815 ../clients/cli/connections.c:8456
+#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "错误：添加 \"%s\" 连接失败：%s"
 
-#: ../clients/cli/connections.c:4833
+#: ../clients/cli/connections.c:4894
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
 "connection by its uuid '%2$s'\n"
-msgid_plural ""
-"Warning: There are %3$u other connections with the name '%1$s'. Reference "
-"the connection by its uuid '%2$s'\n"
+msgid_plural "Warning: There are %3$u other connections with the name '%1$s'. Reference the connection by its uuid '%2$s'\n"
 msgstr[0] "警告：�为 '%1$s' 的连接已存在。使用 uuid '%2$s' �指代连接\n"
 
-#: ../clients/cli/connections.c:4842
+#: ../clients/cli/connections.c:4903
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "连接 \"%s\" (%s) 已�功添加。\n"
 
-#: ../clients/cli/connections.c:4904 ../clients/cli/connections.c:6861
-#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:529
-#: ../clients/cli/devices.c:536 ../clients/cli/devices.c:1206
-#: ../clients/cli/general.c:137 ../clients/cli/utils.h:297
-#: ../clients/common/nm-client-utils.c:283
-#: ../clients/common/nm-meta-setting-desc.c:871
-#: ../clients/common/nm-meta-setting-desc.c:2669
+#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
+#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
+#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
+#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
+#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-meta-setting-desc.c:866
+#: ../clients/common/nm-meta-setting-desc.c:2682
 msgid "no"
 msgstr "�"
 
-#: ../clients/cli/connections.c:4905 ../clients/cli/connections.c:6861
-#: ../clients/cli/connections.c:6862 ../clients/cli/devices.c:528
-#: ../clients/cli/devices.c:535 ../clients/cli/devices.c:1206
-#: ../clients/cli/general.c:136 ../clients/cli/utils.h:297
-#: ../clients/common/nm-client-utils.c:282
-#: ../clients/common/nm-meta-setting-desc.c:871
-#: ../clients/common/nm-meta-setting-desc.c:2666
+#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
+#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
+#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
+#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
+#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-meta-setting-desc.c:866
+#: ../clients/common/nm-meta-setting-desc.c:2679
 msgid "yes"
 msgstr "是"
 
-#: ../clients/cli/connections.c:4991
+#: ../clients/cli/connections.c:5052
 #, c-format
 msgid ""
-"You can specify this option more than once. Press <Enter> when you're done."
-"\n"
+"You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr "您�以多次指定此选项。按下 <回车键> 以完�。\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5093
+#: ../clients/cli/connections.c:5154
 #, 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:5099
+#: ../clients/cli/connections.c:5160
 #, 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:5231 ../clients/cli/utils.c:293
+#: ../clients/cli/connections.c:5292 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "错误：需� \"%s\" �数的值。"
 
-#: ../clients/cli/connections.c:5238
+#: ../clients/cli/connections.c:5299
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "错误：\"save\"：%s。"
 
-#: ../clients/cli/connections.c:5324 ../clients/cli/connections.c:5335
+#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "错误：需� \"%s\" �数。"
 
-#: ../clients/cli/connections.c:6294
+#: ../clients/cli/connections.c:6354
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[\"%s\" 设置值]\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:6403
+#.
+#: ../clients/cli/connections.c:6463
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1389,8 +1374,7 @@ msgid ""
 "help/?   [<command>]                 :: print this help\n"
 "nmcli    <conf-option> <value>       :: nmcli configuration\n"
 "quit                                 :: exit nmcli\n"
-msgstr ""
-"---[ 主�� ]---\n"
+msgstr "---[ 主�� ]---\n"
 "goto     [<设置> | <属性>]        :: 转到设置或属性\n"
 "remove   <设置>[.<属性>] | <属性> :: 移除设置或�置属性值\n"
 "set      [<设置>.<属性> <值>]     :: 设置属性值\n"
@@ -1404,7 +1388,7 @@ msgstr ""
 "nmcli    <�置选项> <值>          :: nmcli configuration\n"
 "quit                              :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:6430
+#: ../clients/cli/connections.c:6490
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1414,8 +1398,7 @@ msgid ""
 "Examples: nmcli> goto connection\n"
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
-msgstr ""
-"goto <设置>[.<属性>] | <属性>  :: 进入设置/属性进行编辑\n"
+msgstr "goto <设置>[.<属性>] | <属性>  :: 进入设置/属性进行编辑\n"
 "\n"
 "该命令进入设置或属性�进行编辑。\n"
 "\n"
@@ -1423,25 +1406,25 @@ msgstr ""
 "      nmcli connection> goto secondaries\n"
 "      nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6437
+#: ../clients/cli/connections.c:6497
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
-msgstr ""
-"remove <设置>[.<属性>]  :: 移除设置或�置属性值\n"
+msgstr "remove <设置>[.<属性>]  :: 移除设置或�置属性值\n"
 "\n"
 "该命令移除�自连接的输入项设置，或者如果给定属性，�置该属性为默认值。\n"
 "\n"
 "示例：nmcli> remove wifi-sec\n"
 "      nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6444
+#: ../clients/cli/connections.c:6504
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1449,26 +1432,24 @@ msgid ""
 "This command sets property value.\n"
 "\n"
 "Example: nmcli> set con.id My connection\n"
-msgstr ""
-"set [<设置>.<属性> <值>]  :: 设置属性值\n"
+msgstr "set [<设置>.<属性> <值>]  :: 设置属性值\n"
 "\n"
 "该命令用于设置属性值。\n"
 "\n"
 "示例：nmcli> set con.id 我的连接\n"
 
-#: ../clients/cli/connections.c:6449
+#: ../clients/cli/connections.c:6509
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
 "\n"
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
-msgstr ""
-"describe [<设置>.<属性>]  :: �述属性\n"
+msgstr "describe [<设置>.<属性>]  :: �述属性\n"
 "\n"
 "显示属性�述。您�以�阅 nm-settings(5) 手册页�查看全部的网络管�器（NetworkManager）设置和属性。\n"
 
-#: ../clients/cli/connections.c:6454
+#: ../clients/cli/connections.c:6514
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1482,20 +1463,20 @@ msgstr "print [all]  :: 输出设置或连接值\n"
 "\n"
 "示例：nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6459
+#: ../clients/cli/connections.c:6519
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
 "Verifies whether the setting or connection is valid and can be saved later.\n"
-"It indicates invalid values on error. Some errors may be fixed automatically\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
 "by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
 "          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
-msgstr ""
-"verify [all | fix]  :: 验�设置或连接的有效性\n"
+msgstr "verify [all | fix]  :: 验�设置或连接的有效性\n"
 "\n"
 "验�设置或连接是�有效和�以���存。�生错误时它会指出无效的值。有些错误�以\n"
 "通过 \"fix\" 选项自动修�。\n"
@@ -1504,7 +1485,7 @@ msgstr ""
 "      nmcli> verify fix\n"
 "      nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6468
+#: ../clients/cli/connections.c:6528
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1518,8 +1499,7 @@ msgid ""
 "restart. If you want to fully remove the persistent connection, the "
 "connection\n"
 "profile must be deleted.\n"
-msgstr ""
-"save [persistent|temporary]  :: �存连接\n"
+msgstr "save [persistent|temporary]  :: �存连接\n"
 "\n"
 "��连接�置集到网络管�器（NetworkManager），�以选择永久�存或者是��存在内存里。�带�数\n"
 "的 \"save\" 表示 \"save persistent\"。\n"
@@ -1527,7 +1507,7 @@ msgstr ""
 "�以是临时的，也�以是永久的，但任何临时的修改在���都会�原。如果您想完全删\n"
 "除永久性连接，连接�置集就必须被删除。\n"
 
-#: ../clients/cli/connections.c:6479
+#: ../clients/cli/connections.c:6539
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1538,8 +1518,7 @@ msgid ""
 "<ifname>    - device the connection will be activated on\n"
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
-msgstr ""
-"activate [<接��>] [/<ap>|<nsp>]  :: 激活连接\n"
+msgstr "activate [<接��>] [/<ap>|<nsp>]  :: 激活连接\n"
 "\n"
 "激活连接。\n"
 "\n"
@@ -1547,21 +1526,23 @@ msgstr ""
 "<接��>    - 将激活连接的设备。\n"
 "/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)（未指定 <接��> 时�置 / 符�。）\n"
 
-#: ../clients/cli/connections.c:6486 ../clients/cli/connections.c:6644
+#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
 #, c-format
-msgid "back  :: go to upper menu level\n"
+msgid ""
+"back  :: go to upper menu level\n"
 "\n"
 msgstr "back  :: 转到上层��\n"
 "\n"
 
-#: ../clients/cli/connections.c:6489
+#: ../clients/cli/connections.c:6549
 #, c-format
-msgid "help/? [<command>]  :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
 msgstr "help/? [<命令>]  :: nmcli 命令的帮助\n"
 "\n"
 
-#: ../clients/cli/connections.c:6492
+#: ../clients/cli/connections.c:6552
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1575,8 +1556,7 @@ msgid ""
 "Examples: nmcli> nmcli status-line yes\n"
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
-msgstr ""
-"nmcli [<conf-option> <value>]  :: nmcli configuration\n"
+msgstr "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
 "Configures nmcli. The following options are available:\n"
 "status-line yes | no          [default: no]\n"
@@ -1588,7 +1568,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6514 ../clients/cli/connections.c:6650
+#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1599,16 +1579,16 @@ msgstr "quit  :: 退出 nmcli\n"
 "\n"
 "此命令用于退出 nmcli。当被编辑的连接没有�存时，会询问用户确定�作。\n"
 
-#: ../clients/cli/connections.c:6519 ../clients/cli/connections.c:6655
-#: ../clients/cli/connections.c:7061 ../clients/cli/connections.c:8043
+#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
+#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "未知命令：\"%s\"\n"
 
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
-#. 
-#: ../clients/cli/connections.c:6584
+#.
+#: ../clients/cli/connections.c:6644
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1622,8 +1602,7 @@ msgid ""
 "back                             :: go to upper level\n"
 "help/?   [<command>]             :: print this help or command description\n"
 "quit                             :: exit nmcli\n"
-msgstr ""
-"---[ 属性�� ]---\n"
+msgstr "---[ 属性�� ]---\n"
 "set      [<值>]                  :: 设置新值\n"
 "add      [<值>]                  :: 添加新选项到属性\n"
 "change                           :: 更改当�值\n"
@@ -1634,7 +1613,7 @@ msgstr ""
 "help/?   [<命令>]                :: 输出该帮助或命令�述\n"
 "quit                             :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:6609
+#: ../clients/cli/connections.c:6669
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1644,7 +1623,7 @@ msgstr "set [<值>]  :: 设置新值\n"
 "\n"
 "此命令用于设置�供的 <值> 到该属性\n"
 
-#: ../clients/cli/connections.c:6613
+#: ../clients/cli/connections.c:6673
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1652,13 +1631,11 @@ msgid ""
 "This command adds provided <value> to this property, if the property is of a "
 "container type. For single-valued properties the property value is replaced "
 "(same as 'set').\n"
-msgstr ""
-"add [<值>]  :: 附加新值到这个属性\n"
+msgstr "add [<值>]  :: 附加新值到这个属性\n"
 "\n"
 "如果该属性为容器类型，则这个命令在这个属性中添加�供的 <值>。对于�值属性，它会替�该值（和 \"set\" 一样）。\n"
-"\n"
 
-#: ../clients/cli/connections.c:6619
+#: ../clients/cli/connections.c:6679
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1668,7 +1645,7 @@ msgstr "change  :: 更改当�值\n"
 "\n"
 "显示当�值并�许编辑它。\n"
 
-#: ../clients/cli/connections.c:6623
+#: ../clients/cli/connections.c:6683
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1686,8 +1663,7 @@ msgid ""
 "          nmcli ipv4.dns> remove 2\n"
 "          nmcli bond.options> remove downdelay\n"
 "\n"
-msgstr ""
-"remove [<值>|<目录>|<选项�称>]  :: 删除属性值\n"
+msgstr "remove [<值>|<目录>|<选项�称>]  :: 删除属性值\n"
 "\n"
 "移除属性值。对于�值属性，将属性设置回其默认值。对于容器类属性，这将删除该属性\n"
 "的所有值，或者您�以指定�数�删除�项或选项。�数�以是�删除项的值或索引，�\n"
@@ -1698,19 +1674,18 @@ msgstr ""
 "      nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6634
+#: ../clients/cli/connections.c:6694
 #, c-format
 msgid ""
 "describe  :: describe property\n"
 "\n"
 "Shows property description. You can consult nm-settings(5) manual page to "
 "see all NM settings and properties.\n"
-msgstr ""
-"describe  :: �述属性\n"
+msgstr "describe  :: �述属性\n"
 "\n"
 "显示属性�述。您�以�阅 nm-settings(5) 手册页�查看所有的网络管�器（NetworkManager）设置和属性。\n"
 
-#: ../clients/cli/connections.c:6639
+#: ../clients/cli/connections.c:6699
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1718,100 +1693,100 @@ msgid ""
 "\n"
 "Shows property value. Providing an argument you can also display values for "
 "the whole setting or connection.\n"
-msgstr ""
-"print [property|setting|connection]  :: 输出属性（设置�连接）值\n"
+msgstr "print [property|setting|connection]  :: 输出属性（设置�连接）值\n"
 "\n"
 "显示属性。�供�数您也�以显示整个设置或连接的值。\n"
 
-#: ../clients/cli/connections.c:6647
+#: ../clients/cli/connections.c:6707
 #, c-format
-msgid "help/? [<command>]  :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for nmcli commands\n"
 "\n"
 msgstr "help/? [<命令>]  :: nmcli 命令的帮助\n"
 "\n"
 
-#: ../clients/cli/connections.c:6744
+#: ../clients/cli/connections.c:6804
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "错误：连接激活失败。\n"
 
-#: ../clients/cli/connections.c:6841
+#: ../clients/cli/connections.c:6901
 #, 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:6859
+#: ../clients/cli/connections.c:6919
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ 类型：%s | �称：%s | UUID：%s | �动：%s | 临时：%s ]\n"
 
-#: ../clients/cli/connections.c:6895
+#: ../clients/cli/connections.c:6955
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "连接未�存。您真的�退出�？%s"
 
-#: ../clients/cli/connections.c:6936
+#: ../clients/cli/connections.c:6996
 #, 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"
 
-#: ../clients/cli/connections.c:6970 ../clients/cli/connections.c:7359
-#: ../clients/cli/connections.c:7418
+#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
+#: ../clients/cli/connections.c:7488
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "\"%s\" 属性�许的值：%s\n"
 
-#: ../clients/cli/connections.c:6974 ../clients/cli/connections.c:7363
-#: ../clients/cli/connections.c:7422
+#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
+#: ../clients/cli/connections.c:7492
 #, c-format
 msgid "Enter '%s' value: "
-msgstr "输入 \"%s\" 值："
+msgstr "输入 \"%s\" 值： "
 
-#: ../clients/cli/connections.c:6988 ../clients/cli/connections.c:7001
-#: ../clients/cli/connections.c:7367 ../clients/cli/connections.c:7433
+#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
+#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "错误：设置 \"%s\" 属性失败：%s\n"
 
-#: ../clients/cli/connections.c:6997
+#: ../clients/cli/connections.c:7057
 #, c-format
 msgid "Edit '%s' value: "
-msgstr "编辑 \"%s\" 值："
+msgstr "编辑 \"%s\" 值： "
 
-#: ../clients/cli/connections.c:7015 ../clients/cli/settings.c:414
+#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误：%s\n"
 
-#: ../clients/cli/connections.c:7034
+#: ../clients/cli/connections.c:7099
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "未知的命令�数：\"%s\"\n"
 
-#: ../clients/cli/connections.c:7125
+#: ../clients/cli/connections.c:7190
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "有效设置：%s\n"
 
-#: ../clients/cli/connections.c:7137
+#: ../clients/cli/connections.c:7202
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "错误：无效的设置�称；%s\n"
 
-#: ../clients/cli/connections.c:7155
+#: ../clients/cli/connections.c:7220
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "有效属性：%s\n"
 
-#: ../clients/cli/connections.c:7163
+#: ../clients/cli/connections.c:7228
 #, c-format
 msgid "Error: property %s\n"
 msgstr "错误：属性 %s\n"
 
-#: ../clients/cli/connections.c:7208
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1820,463 +1795,462 @@ msgid ""
 msgstr "使用 \"autoconnect=yes\" �存该连接。这样会立�激活该连接。\n"
 "您���存�？ %s"
 
-#: ../clients/cli/connections.c:7293
+#: ../clients/cli/connections.c:7358
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "您�编辑下列设置：%s\n"
 
-#: ../clients/cli/connections.c:7324
+#: ../clients/cli/connections.c:7389
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr "此连接�置集已被其他客户端移除了。您�以输入 \"save\" �还原它。\n"
 
-#: ../clients/cli/connections.c:7371 ../clients/cli/connections.c:7625
-#: ../clients/cli/connections.c:7657
+#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
+#: ../clients/cli/connections.c:7741
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "错误：未选择设置；有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7372
+#: ../clients/cli/connections.c:7442
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "先使用 \"goto <设置>\"，或 \"set <设置>.<属性>\"\n"
 
-#: ../clients/cli/connections.c:7387 ../clients/cli/connections.c:7557
-#: ../clients/cli/connections.c:7647
+#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
+#: ../clients/cli/connections.c:7731
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "错误：无效的设置�数 \"%s\"；有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7396
+#: ../clients/cli/connections.c:7466
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "错误：缺少 \"%s\" 属性的设置\n"
 
-#: ../clients/cli/connections.c:7403
+#: ../clients/cli/connections.c:7473
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "错误：无效的属性：%s\n"
 
-#: ../clients/cli/connections.c:7465
+#: ../clients/cli/connections.c:7537
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "错误：未知的设置 \"%s\"\n"
 
-#: ../clients/cli/connections.c:7490
+#: ../clients/cli/connections.c:7562
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "您�以编辑下列属性：%s\n"
 
-#: ../clients/cli/connections.c:7530 ../clients/cli/connections.c:7580
+#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "错误：移除 \"%s\" 的值失败：%s\n"
 
-#: ../clients/cli/connections.c:7535
+#: ../clients/cli/connections.c:7612
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "错误：未给定�数：有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7554
+#: ../clients/cli/connections.c:7631
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "设置 \"%s\" 在连接里未�供。\n"
 
-#: ../clients/cli/connections.c:7601
+#: ../clients/cli/connections.c:7685
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "错误：%s 属性，也�是设置�称。\n"
 
-#: ../clients/cli/connections.c:7626 ../clients/cli/connections.c:7658
+#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "先使用 \"goto <设置>\"，或 \"describe <设置>.<属性>\"\n"
 
-#: ../clients/cli/connections.c:7681
+#: ../clients/cli/connections.c:7765
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "错误：无效的属性：%s，也�是有效的设置�称。\n"
 
-#: ../clients/cli/connections.c:7711
+#: ../clients/cli/connections.c:7795
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "错误：未知的设置：\"%s\"\n"
 
-#: ../clients/cli/connections.c:7716
+#: ../clients/cli/connections.c:7800
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "错误：设置 \"%s\" 在连接里未�供。\n"
 
-#: ../clients/cli/connections.c:7747
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "错误：无效的属性：%s%s\n"
 
-#: ../clients/cli/connections.c:7749
+#: ../clients/cli/connections.c:7833
 msgid ", neither a valid setting name"
 msgstr "，也�是有效的设置�称"
 
-#: ../clients/cli/connections.c:7765
+#: ../clients/cli/connections.c:7849
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "无效的验�选项：%s\n"
 
-#: ../clients/cli/connections.c:7773
+#: ../clients/cli/connections.c:7858
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "验�设置 \"%s\"：%s\n"
 
-#: ../clients/cli/connections.c:7788
+#: ../clients/cli/connections.c:7874
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "验�连接：%s\n"
 
-#: ../clients/cli/connections.c:7791
+#: ../clients/cli/connections.c:7877
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "错误无法自动修�。\n"
 
-#: ../clients/cli/connections.c:7812
+#: ../clients/cli/connections.c:7897
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "错误：无效的�数 \"%s\"\n"
 
-#: ../clients/cli/connections.c:7862
+#: ../clients/cli/connections.c:7947
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "错误：�存 \"%s\" (%s) 连接失败：%s\n"
 
-#: ../clients/cli/connections.c:7868
+#: ../clients/cli/connections.c:7953
 #, c-format
 msgid "Error: Timeout saving '%s' (%s) connection\n"
 msgstr "错误：�存 '%s' (%s) 连接超时\n"
 
-#: ../clients/cli/connections.c:7873
+#: ../clients/cli/connections.c:7958
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "连接 \"%s\" (%s) 已�功�存。\n"
 
-#: ../clients/cli/connections.c:7874
+#: ../clients/cli/connections.c:7959
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "�功地更新了连接 \"%s\" (%s)。\n"
 
-#: ../clients/cli/connections.c:7907
+#: ../clients/cli/connections.c:7992
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "错误：连接验�失败：%s。\n"
 
-#: ../clients/cli/connections.c:7908
+#: ../clients/cli/connections.c:7993
 msgid "(unknown error)"
 msgstr "（未知错误）"
 
-#: ../clients/cli/connections.c:7909
+#: ../clients/cli/connections.c:7994
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "您�以�行 \"verify fix\" �修�错误。\n"
 
-#: ../clients/cli/connections.c:7931
+#. TRANSLATORS: do not translate 'save', leave it as it is
+#: ../clients/cli/connections.c:8017
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "错误：连接还未�存。先输入 \"save\"。\n"
 
-#: ../clients/cli/connections.c:7935
+#: ../clients/cli/connections.c:8021
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "错误：连接是无效的：%s\n"
 
-#: ../clients/cli/connections.c:7945
+#: ../clients/cli/connections.c:8031
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "错误：无法激活连接：%s。\n"
 
-#: ../clients/cli/connections.c:7954
+#: ../clients/cli/connections.c:8040
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "错误：激活 \"%s\" (%s) 连接失败：%s\n"
 
-#: ../clients/cli/connections.c:7961
+#: ../clients/cli/connections.c:8047
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "正在监视连接激活（按任�键继续）\n"
 
-#: ../clients/cli/connections.c:7997
+#: ../clients/cli/connections.c:8083
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "错误：status-line：%s\n"
 
-#: ../clients/cli/connections.c:8005
+#: ../clients/cli/connections.c:8091
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "错误：save-confirmation：%s\n"
 
-#: ../clients/cli/connections.c:8013
+#: ../clients/cli/connections.c:8099
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "错误：show-secrets：%s\n"
 
-#: ../clients/cli/connections.c:8020
+#: ../clients/cli/connections.c:8106
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "当� nmcli �置：\n"
 
-#: ../clients/cli/connections.c:8028
+#: ../clients/cli/connections.c:8114
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "无效的�置选项 \"%s\"；�许 [%s]\n"
 
-#: ../clients/cli/connections.c:8249
+#: ../clients/cli/connections.c:8335
 #, c-format
 msgid "Error: only one of 'id', 'filename', uuid, or 'path' can be provided."
 msgstr "错误：�能�供 \"id\"�\"filename\"�\"uuid\" 或 \"path\" 之一。"
 
-#: ../clients/cli/connections.c:8263 ../clients/cli/connections.c:8424
+#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "错误：未知连接 \"%s\"。"
 
-#: ../clients/cli/connections.c:8279
+#: ../clients/cli/connections.c:8365
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告：正在编辑已有的连接 \"%s\"；\"type\" �数已忽略\n"
 
-#: ../clients/cli/connections.c:8282
+#: ../clients/cli/connections.c:8368
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告：正在编辑已有的连接 \"%s\"；\"con-name\" �数已忽略\n"
 
-#: ../clients/cli/connections.c:8309
+#: ../clients/cli/connections.c:8395
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有效的连接类型：%s\n"
 
-#: ../clients/cli/connections.c:8311
+#: ../clients/cli/connections.c:8397
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "错误：无效的连接类型；%s\n"
 
-#: ../clients/cli/connections.c:8347
+#: ../clients/cli/connections.c:8433
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli 交互�连接编辑器 |==="
 
-#: ../clients/cli/connections.c:8350
+#: ../clients/cli/connections.c:8436
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "正在编辑已有的连接 \"%s\"：\"%s\""
 
-#: ../clients/cli/connections.c:8352
+#: ../clients/cli/connections.c:8438
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "正在添加新的 \"%s\" 连接"
 
-#: ../clients/cli/connections.c:8354
+#. TRANSLATORS: do not translate 'help', leave it as it is
+#: ../clients/cli/connections.c:8441
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "输入 \"help\" 或 \"?\" 查看�用的命令。"
 
-#: ../clients/cli/connections.c:8356
+#. TRANSLATORS: do not translate 'print', leave it as it is
+#: ../clients/cli/connections.c:8444
 #, c-format
 msgid "Type 'print' to show all the connection properties."
 msgstr "输入 \"print\" �显示所有的连接属性。"
 
-#: ../clients/cli/connections.c:8358
+#. TRANSLATORS: do not translate 'describe', leave it as it is
+#: ../clients/cli/connections.c:8447
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr "输入 \"describe [<设置>.<属性>]\" �获得详细的属性�述。"
 
-#: ../clients/cli/connections.c:8386
+#: ../clients/cli/connections.c:8475
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "错误：修改连接 \"%s\" 失败：%s"
 
-#: ../clients/cli/connections.c:8392
+#: ../clients/cli/connections.c:8481
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "连接 \"%s\" (%s) 已�功修改。\n"
 
-#: ../clients/cli/connections.c:8460
+#: ../clients/cli/connections.c:8549
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) 已克隆为 %s (%s)。\n"
 
-#: ../clients/cli/connections.c:8519
+#: ../clients/cli/connections.c:8608
 msgid "New connection name: "
-msgstr "新连接�称："
+msgstr "新连接�称： "
 
-#: ../clients/cli/connections.c:8521
+#: ../clients/cli/connections.c:8610
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "错误：缺少 <新�称> �数。"
 
-#: ../clients/cli/connections.c:8526 ../clients/cli/connections.c:9005
+#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "错误：未知的�外�数：\"%s\"。"
 
-#: ../clients/cli/connections.c:8559
+#: ../clients/cli/connections.c:8648
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "错误：未删除所有的连接。"
 
-#: ../clients/cli/connections.c:8560
+#: ../clients/cli/connections.c:8649
 #, c-format
 msgid "Error: Connection deletion failed: %s\n"
 msgstr "错误：连接删除失败：%s\n"
 
-#: ../clients/cli/connections.c:8616 ../clients/cli/connections.c:8737
+#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
 #, c-format
 msgid "Error: %s.\n"
 msgstr "错误：%s。\n"
 
-#: ../clients/cli/connections.c:8617 ../clients/cli/connections.c:8738
+#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
 #, c-format
 msgid "Error: not all connections found."
 msgstr "错误：未找到所有连接。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8668
+#: ../clients/cli/connections.c:8757
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "错误：无法删除未知连接：%s。"
 
-#: ../clients/cli/connections.c:8678
+#: ../clients/cli/connections.c:8767
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s：连接�置集已改动\n"
 
-#: ../clients/cli/connections.c:8704
+#: ../clients/cli/connections.c:8793
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s：连接�置集已创建\n"
 
-#: ../clients/cli/connections.c:8713
+#: ../clients/cli/connections.c:8802
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s：连接�置集已移除\n"
 
-#: ../clients/cli/connections.c:8776
+#: ../clients/cli/connections.c:8873
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "错误：�新加载连接失败：%s。"
 
-#: ../clients/cli/connections.c:8809
+#: ../clients/cli/connections.c:8905
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "错误：加载连接失败：%s。"
 
-#: ../clients/cli/connections.c:8817
+#: ../clients/cli/connections.c:8913
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "无法加载文件 \"%s\"\n"
 
-#: ../clients/cli/connections.c:8824
+#: ../clients/cli/connections.c:8920
 msgid "File to import: "
-msgstr "�导入的文件："
+msgstr "�导入的文件： "
 
-#: ../clients/cli/connections.c:8857
+#: ../clients/cli/connections.c:8953
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "错误：未�供�数。"
 
-#: ../clients/cli/connections.c:8888
+#: ../clients/cli/connections.c:8984
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告：已指定 \"type\"，忽略�外的�数。\n"
 
-#: ../clients/cli/connections.c:8902
+#: ../clients/cli/connections.c:8998
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告：已指定 \"file\"，忽略�外的�数。\n"
 
-#: ../clients/cli/connections.c:8904
-#, c-format
-msgid "Unknown parameter: %s"
-msgstr "未知�数：%s"
-
-#: ../clients/cli/connections.c:8915
+#: ../clients/cli/connections.c:9011
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "错误：需� \"type\" �数。"
 
-#: ../clients/cli/connections.c:8919
+#: ../clients/cli/connections.c:9015
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "错误：需� \"file\" �数。"
 
-#: ../clients/cli/connections.c:8928
+#: ../clients/cli/connections.c:9024
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "错误：查找用于 %s 的 VPN �件失败。"
 
-#: ../clients/cli/connections.c:8935 ../clients/cli/connections.c:9026
+#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "错误：加载 VPN �件失败：%s。"
 
-#: ../clients/cli/connections.c:8944
+#: ../clients/cli/connections.c:9040
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "错误：导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败：%s。"
 
-#: ../clients/cli/connections.c:9012
+#: ../clients/cli/connections.c:9108
 msgid "Output file name: "
-msgstr "输出文件�称："
+msgstr "输出文件�称： "
 
-#: ../clients/cli/connections.c:9017
+#: ../clients/cli/connections.c:9113
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "错误：连接�是 VPN。"
 
-#: ../clients/cli/connections.c:9039
+#: ../clients/cli/connections.c:9135
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "错误：创建临时文件 %s 失败。"
 
-#: ../clients/cli/connections.c:9047
+#: ../clients/cli/connections.c:9143
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "错误：导出 \"%s\" 失败：%s。"
 
-#: ../clients/cli/connections.c:9059
+#: ../clients/cli/connections.c:9155
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "错误：读�临时文件 \"%s\" 失败：%s。"
 
 #. define some prompts
-#: ../clients/cli/devices.c:37
+#: ../clients/cli/devices.c:23
 msgid "Interface: "
-msgstr "接�："
+msgstr "接�： "
 
-#: ../clients/cli/devices.c:38
+#: ../clients/cli/devices.c:24
 msgid "Interface(s): "
-msgstr "接�："
+msgstr "接�： "
 
-#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:1234
+#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
 msgid "(none)"
 msgstr "（无）"
 
-#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:185
+#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: ../clients/cli/devices.c:333
+#: ../clients/cli/devices.c:322
 #, c-format
 msgid "<invisible> | %s"
 msgstr "<invisible> | %s"
 
-#: ../clients/cli/devices.c:334
+#: ../clients/cli/devices.c:323
 msgid "<invisible>"
 msgstr "<invisible>"
 
-#: ../clients/cli/devices.c:435
+#: ../clients/cli/devices.c:424
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/devices.c:693
+#: ../clients/cli/devices.c:725
 #, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
@@ -2314,13 +2288,13 @@ msgid ""
 "\n"
 "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
+"  wifi show-password [ifname <ifname>]\n"
+"\n"
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
-msgstr ""
-"Usage: nmcli device { COMMAND | help }\n"
+msgstr "用法：nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | set | connect | reapply | modify | disconnect | "
-"delete | monitor | wifi | lldp }\n"
+"COMMAND := { status | show | set | connect | reapply | modify | disconnect | delete | monitor | wifi | lldp }\n"
 "\n"
 "  status\n"
 "\n"
@@ -2342,21 +2316,20 @@ msgstr ""
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
 "\n"
-"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
-"[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no] "
-"[hidden yes|no]\n"
+"  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n"
 "\n"
-"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
-"[channel <channel>] [password <password>]\n"
+"  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] [channel <channel>] [password <password>]\n"
 "\n"
 "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
+"  wifi show-password [ifname <ifname>]\n"
+"\n"
 "  lldp [list [ifname <ifname>]]\n"
 "\n"
 
 # 大写的 DEVICE�TYPE�STATE�CONNECTION 找�到具体对应的翻译�置，这是在 CLI 是显示的列表项，所以没有翻译。
-#: ../clients/cli/devices.c:716
+#: ../clients/cli/devices.c:749
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2367,11 +2340,12 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
 "\n"
-msgstr ""
-"用法：nmcli device status { help }\n"
+msgstr "用法：nmcli device status { help }\n"
 "\n"
 "显示所有设备的状�。\n"
 "默认情况下，显示下列�目：\n"
@@ -2381,8 +2355,9 @@ msgstr ""
 " CONNECTION - 设备上激活的连接（如果有的�）\n"
 "显示哪些�目�以通过 \"--fields\" 全局选项改�。\"status\" 是默认命令，也就是说 \n"
 "\"nmcli device\" 会调用 \"nmcli device status\"。\n"
+"\n"
 
-#: ../clients/cli/devices.c:731
+#: ../clients/cli/devices.c:764
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2392,8 +2367,7 @@ msgid ""
 "Show details of device(s).\n"
 "The command lists details for all devices, or for a given device.\n"
 "\n"
-msgstr ""
-"用法：nmcli device show { �数 | help }\n"
+msgstr "用法：nmcli device show { �数 | help }\n"
 "\n"
 "�数 := [<接��>]\n"
 "\n"
@@ -2401,7 +2375,7 @@ msgstr ""
 "该命令列出所有设备或者给定设备的详情。\n"
 "\n"
 
-#: ../clients/cli/devices.c:742
+#: ../clients/cli/devices.c:775
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2409,12 +2383,11 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
-msgstr ""
-"用法：nmcli device connect { �数 | help }\n"
+msgstr "用法：nmcli device connect { �数 | help }\n"
 "\n"
 "�数 := <接��>\n"
 "\n"
@@ -2422,7 +2395,7 @@ msgstr ""
 "网络管�器（NetworkManager）将�试查找将激活的�适连接，包括那些没有设定为自动连接的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:754
+#: ../clients/cli/devices.c:787
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2432,15 +2405,14 @@ msgid ""
 "Attempts to update device with changes to the currently active connection\n"
 "made since it was last applied.\n"
 "\n"
-msgstr ""
-"Usage: nmcli device reapply { ARGUMENTS | help }\n"
+msgstr "Usage: nmcli device reapply { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := <ifname>\n"
 "\n"
 "�试将自上次应用以�对当�活跃连接所�出的改�应用到设备中。\n"
 "\n"
 
-#: ../clients/cli/devices.c:765
+#: ../clients/cli/devices.c:798
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2455,13 +2427,12 @@ msgid ""
 "The '-' sign allows removing selected items instead of the whole value.\n"
 "\n"
 "Examples:\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
 "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
-msgstr ""
-"Usage: nmcli device modify { ARGUMENTS | --help }\n"
+msgstr "Usage: nmcli device modify { ARGUMENTS | --help }\n"
 "\n"
 "ARGUMENTS := <ifname> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
@@ -2469,13 +2440,12 @@ msgstr ""
 "效。对于多值属性，您�以在属性����选的 \"+\" 或 \"-\" 符�。\"+\" 符��许附加项\n"
 "而�是是替�掉整个值。\"-\" 符��许移除选中项而�是整个值。\n"
 "例如：\n"
-"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/"
-"8\"\n"
+"nmcli dev mod em1 ipv4.method manual ipv4.addr \"192.168.1.2/24, 10.10.1.5/8\"\n"
 "nmcli dev mod em1 +ipv4.dns 8.8.4.4\n"
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:785
+#: ../clients/cli/devices.c:818
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2486,8 +2456,7 @@ msgid ""
 "The command disconnects the device and prevents it from auto-activating\n"
 "further connections without user/manual intervention.\n"
 "\n"
-msgstr ""
-"用法：nmcli device disconnect { �数 | help }\n"
+msgstr "用法：nmcli device disconnect { �数 | help }\n"
 "\n"
 "�数 := <接��>\n"
 "\n"
@@ -2495,7 +2464,7 @@ msgstr ""
 "该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:797
+#: ../clients/cli/devices.c:830
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2507,8 +2476,7 @@ msgid ""
 "(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
 "command.\n"
 "\n"
-msgstr ""
-"用法：nmcli device delete { �数 | help }\n"
+msgstr "用法：nmcli device delete { �数 | help }\n"
 "\n"
 "�数 := <接��> ...\n"
 "\n"
@@ -2517,7 +2485,7 @@ msgstr ""
 "令�删除。\n"
 "\n"
 
-#: ../clients/cli/devices.c:810
+#: ../clients/cli/devices.c:843
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2529,8 +2497,7 @@ msgid ""
 "\n"
 "Modify device properties.\n"
 "\n"
-msgstr ""
-"用法：nmcli device set { �数 | help }\n"
+msgstr "用法：nmcli device set { �数 | help }\n"
 "\n"
 "�数 := 设备 { 属性 [ 属性 ... ] }\n"
 "设备 := [ifname] <接��> \n"
@@ -2540,7 +2507,7 @@ msgstr ""
 "修改设备属性。\n"
 "\n"
 
-#: ../clients/cli/devices.c:823
+#: ../clients/cli/devices.c:856
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2551,8 +2518,7 @@ msgid ""
 "This command prints a line whenever the specified devices change state.\n"
 "Monitors all devices in case no interface is specified.\n"
 "\n"
-msgstr ""
-"用法：nmcli device monitor { �数 | help }\n"
+msgstr "用法：nmcli device monitor { �数 | help }\n"
 "\n"
 "�数 := [<接��>] ...\n"
 "\n"
@@ -2560,21 +2526,22 @@ msgstr ""
 "�当指定的连接修改时，这个命令会将其打�出�。如果没有指定则监视所有的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:835
+#: ../clients/cli/devices.c:868
 #, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Perform operation on Wi-Fi devices.\n"
 "\n"
-"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|auto]]\n"
+"ARGUMENTS := [list [ifname <ifname>] [bssid <BSSID>] [--rescan yes|no|"
+"auto]]\n"
 "\n"
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID. The\n"
 "--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
 "                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
 "yes|no]\n"
 "\n"
@@ -2601,16 +2568,17 @@ msgid ""
 "\n"
 "ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
 "SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
 "be\n"
 "given. Note that this command does not show the APs,\n"
 "use 'nmcli device wifi list' for that.\n"
 "\n"
-msgstr ""
-"Usage: nmcli device wifi { ARGUMENTS | help }\n"
+msgstr "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
 "Perform operation on Wi-Fi devices.\n"
 "\n"
@@ -2620,10 +2588,8 @@ msgstr ""
 "used to list APs for a particular interface, or with a specific BSSID. The\n"
 "--rescan flag tells whether a new Wi-Fi scan should be triggered.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-"                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
-"yes|no]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [ifname <ifname>]\n"
+"                     [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n"
 "\n"
 "Connect to a Wi-Fi network specified by SSID or BSSID. The command finds a\n"
 "matching connection or creates one and then activates it on a device. This\n"
@@ -2651,469 +2617,488 @@ msgstr ""
 "Request that NetworkManager immediately re-scan for available access points.\n"
 "NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
 "be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
-"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
-"be\n"
+"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can be\n"
 "given. Note that this command does not show the APs,\n"
 "use 'nmcli device wifi list' for that.\n"
 "\n"
 
-#: ../clients/cli/devices.c:882
+#: ../clients/cli/devices.c:915
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [list [ifname <ifname>]]\n"
 "\n"
-"List neighboring devices discovered through LLDP. The 'ifname' option can be\n"
+"List neighboring devices discovered through LLDP. The 'ifname' option can "
+"be\n"
 "used to list neighbors for a particular interface.\n"
 "\n"
-msgstr ""
-"用法：nmcli device lldp { �数 | help }\n"
+msgstr "用法：nmcli device lldp { �数 | help }\n"
 "\n"
 "�数 := [list [ifname <接��>]]\n"
 "\n"
 "列出通过 LLDP �现的邻居设备。�使用 \"ifname\" 选项列出具体接�的邻居设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:980
+#: ../clients/cli/devices.c:1013
 #, c-format
 msgid "Error: No interface specified."
 msgstr "错误：没有指定接�。"
 
-#: ../clients/cli/devices.c:1003
+#: ../clients/cli/devices.c:1036
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告：��的�数 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:1006
+#: ../clients/cli/devices.c:1039
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "错误：没有找到设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:1007
+#: ../clients/cli/devices.c:1040
 #, c-format
 msgid "Error: not all devices found."
 msgstr "错误：未找到所有设备。"
 
-#: ../clients/cli/devices.c:1038
+#: ../clients/cli/devices.c:1071
 msgid "No interface specified"
 msgstr "没有指定接�"
 
-#: ../clients/cli/devices.c:1057
+#: ../clients/cli/devices.c:1090
 #, c-format
 msgid "Device '%s' not found"
 msgstr "未找到设备 \"%s\""
 
-#: ../clients/cli/devices.c:1153
+#: ../clients/cli/devices.c:1186
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1154
+#: ../clients/cli/devices.c:1187
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../clients/cli/devices.c:1193
+#: ../clients/cli/devices.c:1226
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:1194
+#: ../clients/cli/devices.c:1227
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:1195 ../src/devices/wifi/nm-device-olpc-mesh.c:133
+#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../clients/cli/devices.c:1196
+#: ../clients/cli/devices.c:1229
 msgid "N/A"
 msgstr "��用"
 
-#: ../clients/cli/devices.c:1391
+#: ../clients/cli/devices.c:1424
 msgid "Device details"
 msgstr "设备详情"
 
-#: ../clients/cli/devices.c:1402
+#: ../clients/cli/devices.c:1435
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "错误：\"device show\"：%s"
 
-#: ../clients/cli/devices.c:1700
+#: ../clients/cli/devices.c:1747
 msgid "Status of devices"
 msgstr "设备状�"
 
-#: ../clients/cli/devices.c:1704
+#: ../clients/cli/devices.c:1751
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "错误：\"dev status\": %s"
 
-#: ../clients/cli/devices.c:1731 ../clients/cli/devices.c:2171
-#: ../clients/cli/devices.c:4145
-#, c-format
-msgid "Error: invalid extra argument '%s'."
-msgstr "错误：无效的�外�数 \"%s\"。"
-
-#: ../clients/cli/devices.c:1767 ../clients/cli/general.c:519
+#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "错误：超时时间 %d 秒已到。"
 
-#: ../clients/cli/devices.c:1816
+#: ../clients/cli/devices.c:1886
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "�功用 \"%s%s\" 激活了设备 \"\"。\n"
 
-#: ../clients/cli/devices.c:1822
+#: ../clients/cli/devices.c:1891
+#, c-format
+msgid ""
+"Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"
+msgstr "�示：“ nmcli dev wifi show-password� 显示Wi-Fi�称和密�。\n"
+
+#: ../clients/cli/devices.c:1895
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "错误：连接激活失败：(%d) %s。\n"
 
-#: ../clients/cli/devices.c:1861
+#: ../clients/cli/devices.c:1925
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "错误：建立 Wi-Fi 热点失败：%s"
 
-#: ../clients/cli/devices.c:1864
+#: ../clients/cli/devices.c:1928
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "错误：添加/激活新连接失败：%s"
 
-#: ../clients/cli/devices.c:1867
+#: ../clients/cli/devices.c:1931
 #, c-format
 msgid "Error: Failed to activate connection: %s"
 msgstr "错误：激活连接失败：%s"
 
-#: ../clients/cli/devices.c:1936
+#: ../clients/cli/devices.c:1996
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "错误：激活设备失败：%s"
 
-#: ../clients/cli/devices.c:1945
-#, c-format
-msgid "Error: Device activation failed: device was disconnected"
-msgstr "错误：设备激活失败：设备已断开连接"
-
-#: ../clients/cli/devices.c:1998
+#: ../clients/cli/devices.c:2046
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "错误：��许的�外�数：\"%s\"。"
 
-#: ../clients/cli/devices.c:2071 ../clients/cli/devices.c:2086
-#: ../clients/cli/devices.c:2323
+#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
+#: ../clients/cli/devices.c:2368
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "�功断开设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:2074 ../clients/cli/devices.c:2397
+#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "�功移除设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:2136 ../clients/cli/devices.c:2206
+#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "错误：�新应用连接到 \"%s\" (%s) 失败：%s"
 
-#: ../clients/cli/devices.c:2146 ../clients/cli/devices.c:2215
+#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "�功�新应用连接到设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:2240
+#: ../clients/cli/devices.c:2285
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr "错误：从设备 \"%s\" (%s) 读�已应用的连接失败：%s"
 
-#: ../clients/cli/devices.c:2307
+#: ../clients/cli/devices.c:2352
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "错误：未断开所有设备的连接。"
 
-#: ../clients/cli/devices.c:2308
+#: ../clients/cli/devices.c:2353
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "错误：断开设备 \"%s\" (%s) 的连接失败：%s\n"
 
-#: ../clients/cli/devices.c:2388
+#: ../clients/cli/devices.c:2433
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "错误：未删除所有设备。"
 
-#: ../clients/cli/devices.c:2389
+#: ../clients/cli/devices.c:2434
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "错误：删除设备 \"%s\" (%s) 失败：%s\n"
 
-#: ../clients/cli/devices.c:2471
+#: ../clients/cli/devices.c:2516
 #, c-format
 msgid "Error: No property specified."
 msgstr "错误：未指定属性。"
 
-#: ../clients/cli/devices.c:2486 ../clients/cli/devices.c:2503
-#: ../clients/cli/general.c:692 ../clients/cli/general.c:704
+#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
+#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "错误：缺少 \"%s\" �数。"
 
-#: ../clients/cli/devices.c:2492
+#: ../clients/cli/devices.c:2537
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "错误：\"managed\"：%s。"
 
-#: ../clients/cli/devices.c:2509
+#: ../clients/cli/devices.c:2554
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "错误：\"autoconnect\"：%s。"
 
-#: ../clients/cli/devices.c:2517 ../clients/cli/general.c:718
+#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "错误：属性 \"%s\" 是未知的。"
 
-#: ../clients/cli/devices.c:2566
+#: ../clients/cli/devices.c:2611
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s：正使用连接 \"%s\"\n"
-"\n"
 
-#: ../clients/cli/devices.c:2592
+#: ../clients/cli/devices.c:2637
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s：设备已创建\n"
 
-#: ../clients/cli/devices.c:2599
+#: ../clients/cli/devices.c:2644
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s：设备已移除\n"
 
-#: ../clients/cli/devices.c:2779
+#: ../clients/cli/devices.c:2824
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 扫�列表"
 
-#: ../clients/cli/devices.c:2866
+#: ../clients/cli/devices.c:2911
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "错误：未找到 bssid 为 \"%s\" 的接入点。"
 
-#: ../clients/cli/devices.c:3022
+#: ../clients/cli/devices.c:3067
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "错误：\"device wifi\"：%s"
 
-#: ../clients/cli/devices.c:3040
+#: ../clients/cli/devices.c:3087
 #, c-format
 msgid "Error: invalid rescan argument: '%s' not among [auto, no, yes]"
 msgstr "错误：无效的�新扫��数：\"%s\" 未在 [auto, no, yes] 之中"
 
-#: ../clients/cli/devices.c:3047
+#: ../clients/cli/devices.c:3094
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "错误：没有找到设备 \"%s\"。"
 
-#: ../clients/cli/devices.c:3058
+#: ../clients/cli/devices.c:3105
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr "错误：设备 \"%s\" 没有被识别为 Wi-Fi 设备，请检查网络管�器（NetworkManager）的 Wi-Fi �件。"
 
-#: ../clients/cli/devices.c:3062 ../clients/cli/devices.c:3322
-#: ../clients/cli/devices.c:3823 ../clients/cli/devices.c:3983
+#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
+#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
+#: ../clients/cli/devices.c:4266
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "错误：设备 \"%s\" �是 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:3171
+#: ../clients/cli/devices.c:3277
 msgid "SSID or BSSID: "
-msgstr "SSID 或 BSSID："
+msgstr "SSID 或 BSSID： "
 
-#: ../clients/cli/devices.c:3176
+#: ../clients/cli/devices.c:3282
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "错误：缺少 SSID/BSSID。"
 
-#: ../clients/cli/devices.c:3213
+#: ../clients/cli/devices.c:3319
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "错误：bssid �数值\"%s\"为无效 BSSID。"
 
-#: ../clients/cli/devices.c:3243
+#: ../clients/cli/devices.c:3349
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr "错误：wep-key-type �数值 \"%s\" 无效，请使用 \"key\" 或 \"phrase\"。"
 
-#: ../clients/cli/devices.c:3270 ../clients/cli/devices.c:3288
+#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
 #, c-format
 msgid "Error: %s: %s."
 msgstr "错误：%s：%s。"
 
-#: ../clients/cli/devices.c:3305
+#: ../clients/cli/devices.c:3413
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "错误：�连接的 BSSID (%s) 与 bssid �数 (%s) ��。"
 
-#: ../clients/cli/devices.c:3311
+#: ../clients/cli/devices.c:3419
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "错误：�数 \"%s\" �是 SSID 或 BSSID。"
 
-#: ../clients/cli/devices.c:3324 ../clients/cli/devices.c:3825
-#: ../clients/cli/devices.c:3985
+#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
+#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "错误：未�现 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:3344
+#: ../clients/cli/devices.c:3452
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "错误：扫���的 SSID 失败：%s。"
 
-#: ../clients/cli/devices.c:3371
+#: ../clients/cli/devices.c:3479
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "错误：未�现 SSID 为 \"%s\" 的网络。"
 
-#: ../clients/cli/devices.c:3373
+#: ../clients/cli/devices.c:3481
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "错误：未找到 BSSID 为 \"%s\" 的接入点。"
 
-#: ../clients/cli/devices.c:3401
+#: ../clients/cli/devices.c:3508
 #, c-format
 msgid "Error: Connection '%s' exists but properties don't match."
 msgstr "错误：连接 '%s' 存在但属性�匹�。"
 
-#: ../clients/cli/devices.c:3444
+#: ../clients/cli/devices.c:3551
 #, 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:3481
+#: ../clients/cli/devices.c:3588
 msgid "Password: "
-msgstr "密�："
+msgstr "密�： "
 
-#: ../clients/cli/devices.c:3644
+#: ../clients/cli/devices.c:3729
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "\"%s\" �是有效的 WPA PSK"
 
-#: ../clients/cli/devices.c:3661
+#: ../clients/cli/devices.c:3746
 #, 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:3677
+#: ../clients/cli/devices.c:3762
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "热点密�：%s\n"
 
-#: ../clients/cli/devices.c:3748
+#: ../clients/cli/devices.c:3927
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "错误：SSID 太长。"
 
 # 这里 channel/band 开头�大写，表示其是命令行选项，所以�译。下�的��。
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3942
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr "错误：band �数值 \"%s\" 无效，请使用 \"a\" 或 \"bg\"。"
 
-#: ../clients/cli/devices.c:3787
-#, c-format
-msgid "Error: Unknown parameter %s."
-msgstr "错误：未知�数 %s。"
-
-#: ../clients/cli/devices.c:3807
+#: ../clients/cli/devices.c:3989
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "错误：channal 也需� band。"
 
-#: ../clients/cli/devices.c:3812
+#: ../clients/cli/devices.c:3994
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "错误：band \"%s\" 的 channel \"%s\" 无效。"
 
-#: ../clients/cli/devices.c:3836
+#: ../clients/cli/devices.c:4019
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "错误：设备 \"%s\" 既�支� AP 也�支� Ad-Hoc 模�。"
 
-#: ../clients/cli/devices.c:3870
+#: ../clients/cli/devices.c:4041
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "错误：无效的 \"password\"：%s。"
 
-#: ../clients/cli/devices.c:3946
+#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "错误：\"%s\" �能��。"
 
+#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
+#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
+msgid "Security"
+msgstr "安全性"
+
+#: ../clients/cli/devices.c:4227
+msgid "None"
+msgstr "æ— "
+
+#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/common/nm-secret-agent-simple.c:310
+#: ../clients/common/nm-secret-agent-simple.c:333
+#: ../clients/common/nm-secret-agent-simple.c:366
+#: ../clients/common/nm-secret-agent-simple.c:903
+#: ../clients/common/nm-secret-agent-simple.c:938
+#: ../clients/common/nm-secret-agent-simple.c:961
+#: ../clients/common/nm-vpn-helpers.c:110
+#: ../clients/common/nm-vpn-helpers.c:114
+#: ../clients/common/nm-vpn-helpers.c:120
+#: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
+#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
+#: ../clients/tui/nmt-page-wifi.c:330
+msgid "Password"
+msgstr "密�"
+
+#: ../clients/cli/devices.c:4355
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #. Main header name
-#: ../clients/cli/devices.c:4051
+#: ../clients/cli/devices.c:4411
 msgid "Device LLDP neighbors"
 msgstr "设备 LLDP 邻居"
 
-#: ../clients/cli/devices.c:4161
+#: ../clients/cli/devices.c:4521
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "错误：\"device lldp list\"：%s"
 
-#: ../clients/cli/general.c:41
+#: ../clients/cli/general.c:27
 msgid "asleep"
 msgstr "�眠中"
 
-#: ../clients/cli/general.c:42
+#: ../clients/cli/general.c:28
 msgid "connecting"
 msgstr "连接中"
 
-#: ../clients/cli/general.c:43
+#: ../clients/cli/general.c:29
 msgid "connected (local only)"
 msgstr "已连接（仅本地）"
 
-#: ../clients/cli/general.c:44
+#: ../clients/cli/general.c:30
 msgid "connected (site only)"
 msgstr "已连接（仅站点）"
 
-#: ../clients/cli/general.c:45 ../clients/common/nm-client-utils.c:274
+#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr "已连接"
 
-#: ../clients/cli/general.c:46
+#: ../clients/cli/general.c:32
 msgid "disconnecting"
 msgstr "断开中"
 
-#: ../clients/cli/general.c:47 ../clients/common/nm-client-utils.c:267
+#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../clients/cli/general.c:138
+#: ../clients/cli/general.c:124
 msgid "auth"
 msgstr "验�"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:152
 msgid "running"
 msgstr "�行中"
 
-#: ../clients/cli/general.c:180
+#: ../clients/cli/general.c:166
 msgid "starting"
 msgstr "�动中"
 
-#: ../clients/cli/general.c:180
+#: ../clients/cli/general.c:166
 msgid "started"
 msgstr "已�动"
 
-#: ../clients/cli/general.c:214
+#: ../clients/cli/general.c:200
 msgid "enabled"
 msgstr "已�用"
 
-#: ../clients/cli/general.c:214
+#: ../clients/cli/general.c:200
 msgid "disabled"
 msgstr "已�用"
 
-#: ../clients/cli/general.c:332
+#: ../clients/cli/general.c:318
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3128,8 +3113,7 @@ msgid ""
 "\n"
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
-msgstr ""
-"用法：nmcli general { 命令 | help }\n"
+msgstr "用法：nmcli general { 命令 | help }\n"
 "\n"
 "命令 := { status | hostname | permissions | logging }\n"
 "\n"
@@ -3142,7 +3126,7 @@ msgstr ""
 "  logging [level <日志级别>] [domains <日志域>]\n"
 "\n"
 
-#: ../clients/cli/general.c:343
+#: ../clients/cli/general.c:329
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3151,14 +3135,13 @@ msgid ""
 "'status' is the default action, which means 'nmcli gen' calls 'nmcli gen "
 "status'\n"
 "\n"
-msgstr ""
-"用法：nmcli general status { help }\n"
+msgstr "用法：nmcli general status { help }\n"
 "\n"
 "显示网络管�器（NetworkManager）的整体状�。\n"
 "\"status\" 是默认�作，� \"nmcli gen\" 调用 \"nmcli gen status\"\n"
 "\n"
 
-#: ../clients/cli/general.c:352
+#: ../clients/cli/general.c:338
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3167,11 +3150,10 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
 "\n"
-msgstr ""
-"用法：nmcli general hostname { �数 | help }\n"
+msgstr "用法：nmcli general hostname { �数 | help }\n"
 "\n"
 "�数 := [<主机�>]\n"
 "\n"
@@ -3180,7 +3162,7 @@ msgstr ""
 "新的永久系统主机�。\n"
 "\n"
 
-#: ../clients/cli/general.c:364
+#: ../clients/cli/general.c:350
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3192,7 +3174,65 @@ msgstr "用法：nmcli general permissions { help }\n"
 "显示验��作的调用程���。\n"
 "\n"
 
-#: ../clients/cli/general.c:372
+#: ../clients/cli/general.c:358
+#, c-format
+msgid ""
+"Usage: nmcli general reload { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<flag>[,<flag>...]]\n"
+"\n"
+"Reload NetworkManager's configuration and perform certain updates, like\n"
+"flushing caches or rewriting external state to disk. This is similar to\n"
+"sending SIGHUP to NetworkManager but it allows for more fine-grained\n"
+"control over what to reload through the flags argument. It also allows\n"
+"non-root access via PolicyKit and contrary to signals it is synchronous.\n"
+"\n"
+"Available flags are:\n"
+"\n"
+"  'conf'        Reload the NetworkManager.conf configuration from\n"
+"                disk. Note that this does not include connections, which\n"
+"                can be reloaded through 'nmcli connection reload' instead.\n"
+"\n"
+"  'dns-rc'      Update DNS configuration, which usually involves writing\n"
+"                /etc/resolv.conf anew.\n"
+"\n"
+"  'dns-full'    Restart the DNS plugin. This is for example useful when\n"
+"                using dnsmasq plugin, which uses additional configuration\n"
+"                in /etc/NetworkManager/dnsmasq.d. If you edit those files,\n"
+"                you can restart the DNS plugin. This action shortly\n"
+"                interrupts name resolution.\n"
+"\n"
+"With no flags, everything that is supported is reloaded, which is\n"
+"identical to sending a SIGHUP.\n"
+msgstr "用法：nmcli general reload { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := [<flag>[,<flag>...]]\n"
+"\n"
+"Reload NetworkManager's configuration and perform certain updates, like\n"
+"flushing caches or rewriting external state to disk. This is similar to\n"
+"sending SIGHUP to NetworkManager but it allows for more fine-grained\n"
+"control over what to reload through the flags argument. It also allows\n"
+"non-root access via PolicyKit and contrary to signals it is synchronous.\n"
+"\n"
+"Available flags are:\n"
+"\n"
+"  'conf'        Reload the NetworkManager.conf configuration from\n"
+"                disk. Note that this does not include connections, which\n"
+"                can be reloaded through 'nmcli connection reload' instead.\n"
+"\n"
+"  'dns-rc'      Update DNS configuration, which usually involves writing\n"
+"                /etc/resolv.conf anew.\n"
+"\n"
+"  'dns-full'    Restart the DNS plugin. This is for example useful when\n"
+"                using dnsmasq plugin, which uses additional configuration\n"
+"                in /etc/NetworkManager/dnsmasq.d. If you edit those files,\n"
+"                you can restart the DNS plugin. This action shortly\n"
+"                interrupts name resolution.\n"
+"\n"
+"With no flags, everything that is supported is reloaded, which is\n"
+"identical to sending a SIGHUP.\n"
+
+#: ../clients/cli/general.c:390
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3206,8 +3246,7 @@ msgid ""
 "page\n"
 "for the list of possible logging domains.\n"
 "\n"
-msgstr ""
-"用法：nmcli general logging { �数 | help }\n"
+msgstr "用法：nmcli general logging { �数 | help }\n"
 "\n"
 "�数 := [level <日志级别>] [domains <日志域>]\n"
 "\n"
@@ -3216,7 +3255,7 @@ msgstr ""
 "�能的日志域列表请�阅手册页。\n"
 "\n"
 
-#: ../clients/cli/general.c:385
+#: ../clients/cli/general.c:403
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3229,8 +3268,7 @@ msgid ""
 "\n"
 "  connectivity [check]\n"
 "\n"
-msgstr ""
-"用法：nmcli networking { 命令 | help }\n"
+msgstr "用法：nmcli networking { 命令 | help }\n"
 "\n"
 "命令 := { [ on | off | connectivity ] }\n"
 "\n"
@@ -3241,9 +3279,10 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:395
+#: ../clients/cli/general.c:413
 #, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
@@ -3252,9 +3291,10 @@ msgstr "用法：nmcli networking on { help }\n"
 "打开�网。\n"
 "\n"
 
-#: ../clients/cli/general.c:403
+#: ../clients/cli/general.c:421
 #, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
@@ -3263,7 +3303,7 @@ msgstr "用法：nmcli networking off { help }\n"
 "关闭�网。\n"
 "\n"
 
-#: ../clients/cli/general.c:411
+#: ../clients/cli/general.c:429
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3271,11 +3311,10 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
 "\n"
-"\n"
-msgstr ""
-"用法：nmcli networking connectivity { �数 | help }\n"
+msgstr "用法：nmcli networking connectivity { �数 | help }\n"
 "\n"
 "�数 := [check]\n"
 "\n"
@@ -3283,7 +3322,7 @@ msgstr ""
 "�选的 \"check\" �数�让网络管�器（NetworkManager）�新检查连接性。\n"
 "\n"
 
-#: ../clients/cli/general.c:423
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3292,15 +3331,14 @@ msgid ""
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
-msgstr ""
-"用法：nmcli radio { 命令 | help }\n"
+msgstr "用法：nmcli radio { 命令 | help }\n"
 "\n"
 "命令 := { all | wifi | wwan }\n"
 "\n"
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:432
+#: ../clients/cli/general.c:450
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3309,15 +3347,14 @@ msgid ""
 "\n"
 "Get status of all radio switches, or turn them on/off.\n"
 "\n"
-msgstr ""
-"用法：nmcli radio all { �数 | help }\n"
+msgstr "用法：nmcli radio all { �数 | help }\n"
 "\n"
 "�数 := [on | off]\n"
 "\n"
 "获�所有无线电开关的状�，或者打开/关闭它们。\n"
 "\n"
 
-#: ../clients/cli/general.c:442
+#: ../clients/cli/general.c:460
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3326,15 +3363,14 @@ msgid ""
 "\n"
 "Get status of Wi-Fi radio switch, or turn it on/off.\n"
 "\n"
-msgstr ""
-"用法：nmcli radio wifi { �数 | help }\n"
+msgstr "用法：nmcli radio wifi { �数 | help }\n"
 "\n"
 "�数 := [on | off]\n"
 "\n"
 "获� Wi-Fi 无线电开关的状�，或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:452
+#: ../clients/cli/general.c:470
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3343,15 +3379,14 @@ msgid ""
 "\n"
 "Get status of mobile broadband radio switch, or turn it on/off.\n"
 "\n"
-msgstr ""
-"用法：nmcli radio wwan { �数 | help }\n"
+msgstr "用法：nmcli radio wwan { �数 | help }\n"
 "\n"
 "�数 := [on | off]\n"
 "\n"
 "获�移动宽带无线电开关的状�，或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:462
+#: ../clients/cli/general.c:480
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3359,187 +3394,225 @@ msgid ""
 "Monitor NetworkManager changes.\n"
 "Prints a line whenever a change occurs in NetworkManager\n"
 "\n"
-msgstr ""
-"用法：nmcli monitor\n"
+msgstr "用法：nmcli monitor\n"
 "\n"
 "监视网络管�器（NetworkManager）的更改。\n"
 "�当 NetworkManager 出现更改时打�一行信�。\n"
 "\n"
 
-#: ../clients/cli/general.c:492
+#: ../clients/cli/general.c:510
 msgid "NetworkManager status"
 msgstr "网络管�器状�"
 
-#: ../clients/cli/general.c:496
+#: ../clients/cli/general.c:514
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "错误：��许使用这些字段：%s"
 
-#: ../clients/cli/general.c:549
+#: ../clients/cli/general.c:567
 msgid "NetworkManager permissions"
 msgstr "网络管�器��"
 
 # XXX: 这里考虑一下���翻译
 # XXX: Should we translate this?
-#: ../clients/cli/general.c:553
+#: ../clients/cli/general.c:571
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "错误：\"常规��\"：%s"
 
-#: ../clients/cli/general.c:642
+#: ../clients/cli/general.c:664
+#, c-format
+msgid "Error: invalid reload flag '%s'. Allowed flags are: %s"
+msgstr "错误：无效的�新加载标志' %s'。�许的标志是： %s"
+
+#: ../clients/cli/general.c:674
+#, c-format
+msgid "Error: extra argument '%s'"
+msgstr "错误：�外�数 '%s'。"
+
+#: ../clients/cli/general.c:688
+#, c-format
+msgid "Error: failed to reload: %s"
+msgstr "错误：�新加载失败：%s"
+
+#: ../clients/cli/general.c:727
 msgid "NetworkManager logging"
 msgstr "网络管�器日志"
 
-#: ../clients/cli/general.c:646
+#: ../clients/cli/general.c:731
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "错误：\"常规日志\"：%s"
 
-#: ../clients/cli/general.c:728
+#: ../clients/cli/general.c:813
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "错误：设置日志失败：%s"
 
-#: ../clients/cli/general.c:745
+#: ../clients/cli/general.c:830
 #, c-format
 msgid "Error: failed to set hostname: %s"
 msgstr "错误：设置主机�失败：%s"
 
-#: ../clients/cli/general.c:814
+#: ../clients/cli/general.c:900
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "错误：\"--fields\" 值 \"%s\" 在此无效（�许的字段：%s）"
 
-#: ../clients/cli/general.c:839
+#: ../clients/cli/general.c:925
 #, 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:887 ../clients/cli/general.c:899
+#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
 msgid "Connectivity"
 msgstr "连接性"
 
-#: ../clients/cli/general.c:902
+#: ../clients/cli/general.c:988
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "错误：\"networking\" 命令 \"%s\" 无效。"
 
-#: ../clients/cli/general.c:916
+#: ../clients/cli/general.c:1002
 msgid "Networking"
 msgstr "�网"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:951
+#: ../clients/cli/general.c:1037
 msgid "Radio switches"
 msgstr "无线电开关"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:981
+#: ../clients/cli/general.c:1067
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi 无线电开关"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1008
+#: ../clients/cli/general.c:1094
 msgid "WWAN radio switch"
 msgstr "WWAN 无线电开关"
 
-#: ../clients/cli/general.c:1056
+#: ../clients/cli/general.c:1142
 msgid "NetworkManager has started"
 msgstr "网络管�器已�动"
 
-#: ../clients/cli/general.c:1056
+#: ../clients/cli/general.c:1142
 msgid "NetworkManager has stopped"
 msgstr "网络管�器已�止"
 
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1153
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "主机�已设为 \"%s\"\n"
 
-#: ../clients/cli/general.c:1082
+#: ../clients/cli/general.c:1168
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "\"%s\" 现在是主连接\n"
 
-#: ../clients/cli/general.c:1084
+#: ../clients/cli/general.c:1170
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "没有主连接\n"
 
-#: ../clients/cli/general.c:1096
+#: ../clients/cli/general.c:1182
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "连接性现在是 \"%s\"\n"
 
-#: ../clients/cli/general.c:1110
+#: ../clients/cli/general.c:1196
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "网络管�器现在处于 \"%s\" 状�\n"
 
-#: ../clients/cli/general.c:1130
+#: ../clients/cli/general.c:1216
 msgid "connection available"
 msgstr "连接�用"
 
-#: ../clients/cli/general.c:1132
+#: ../clients/cli/general.c:1218
 msgid "connections available"
 msgstr "连接�用"
 
-#: ../clients/cli/general.c:1150
+#: ../clients/cli/general.c:1236
 msgid "autoconnect"
 msgstr "自动连接"
 
-#: ../clients/cli/general.c:1152
+#: ../clients/cli/general.c:1238
 msgid "fw missing"
 msgstr "缺失固件"
 
-#: ../clients/cli/general.c:1157
+#: ../clients/cli/general.c:1243
 msgid "plugin missing"
 msgstr "缺失�件"
 
-#: ../clients/cli/general.c:1162
+#: ../clients/cli/general.c:1253 ../clients/cli/general.c:1267
+msgid "sw disabled"
+msgstr "sw �用"
+
+#: ../clients/cli/general.c:1258 ../clients/cli/general.c:1272
+msgid "hw disabled"
+msgstr "hw �用"
+
+#: ../clients/cli/general.c:1283
 msgid "sw"
 msgstr "软件"
 
-#: ../clients/cli/general.c:1164
+#: ../clients/cli/general.c:1285
 msgid "hw"
 msgstr "硬件"
 
-#: ../clients/cli/general.c:1169
+#: ../clients/cli/general.c:1290
 msgid "iface"
 msgstr "接�"
 
-#: ../clients/cli/general.c:1172
+#: ../clients/cli/general.c:1293
 msgid "port"
 msgstr "端�"
 
-#: ../clients/cli/general.c:1175
+#: ../clients/cli/general.c:1296
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1192
+#: ../clients/cli/general.c:1313
 msgid "master"
 msgstr "主连接"
 
-#: ../clients/cli/general.c:1196 ../clients/tui/nm-editor-utils.c:247
-#: ../clients/tui/nmt-connect-connection-list.c:406
+#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
+#: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1198
+#: ../clients/cli/general.c:1319
 msgid "ip4 default"
 msgstr "ip4 默认"
 
-#: ../clients/cli/general.c:1200
+#: ../clients/cli/general.c:1321
 msgid "ip6 default"
 msgstr "ip6 默认"
 
-#: ../clients/cli/general.c:1282
+#: ../clients/cli/general.c:1403
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN 连接"
 
-#: ../clients/cli/general.c:1350
+#. TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
+#. * "<interface-name>: <device-state> to <connection-id>"
+#: ../clients/cli/general.c:1423
+#, c-format
+msgctxt "nmcli-overview"
+msgid "%s: %s to %s"
+msgstr "%s: %s 到 %s"
+
+#. TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
+#. * "<interface-name>: <device-state>"
+#: ../clients/cli/general.c:1430
+#, c-format
+msgctxt "nmcli-overview"
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../clients/cli/general.c:1480
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3548,22 +3621,21 @@ msgid ""
 "\n"
 "Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage "
 "details.\n"
-msgstr ""
-"使用 \"nmcli device show\" 获�关于已知设备的完整信�，以� \n"
+msgstr "使用 \"nmcli device show\" 获�关于已知设备的完整信�，以� \n"
 "\"nmcli connection show\" 获�活动连接�置集的概述。\n"
 "\n"
 "完整的用法细节，��考 nmcli(1) 和 nmcli-examples(7) 手册页。\n"
 
-#: ../clients/cli/general.c:1371
+#: ../clients/cli/general.c:1501
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "错误：\"monitor\" 命令 \"%s\" 无效。"
 
-#: ../clients/cli/general.c:1383
+#: ../clients/cli/general.c:1513
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "网络管�器未�行（等待中）。\n"
 
-#: ../clients/cli/nmcli.c:244
+#: ../clients/cli/nmcli.c:230
 #, c-format
 msgid ""
 "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -3594,14 +3666,12 @@ msgid ""
 "  a[gent]         NetworkManager secret agent or polkit agent\n"
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
-msgstr ""
-"Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
+msgstr "Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
 "OPTIONS\n"
 "  -a, --ask                                ask for missing parameters\n"
 "  -c, --colors auto|yes|no                 whether to use colors in output\n"
-"  -e, --escape yes|no                      escape columns separators in "
-"values\n"
+"  -e, --escape yes|no                      escape columns separators in values\n"
 "  -f, --fields <field,...>|all|common      specify fields to output\n"
 "  -g, --get-values <field,...>|all|common  shortcut for -m tabular -t -f\n"
 "  -h, --help                               print this help\n"
@@ -3611,8 +3681,7 @@ msgstr ""
 "  -s, --show-secrets                       allow displaying passwords\n"
 "  -t, --terse                              terse output\n"
 "  -v, --version                            show program version\n"
-"  -w, --wait <seconds>                     set timeout waiting for finishing "
-"operations\n"
+"  -w, --wait <seconds>                     set timeout waiting for finishing operations\n"
 "\n"
 "OBJECT\n"
 "  g[eneral]       NetworkManager's general status and operations\n"
@@ -3624,859 +3693,857 @@ msgstr ""
 "  m[onitor]       monitor NetworkManager changes\n"
 "\n"
 
-#: ../clients/cli/nmcli.c:324
+#: ../clients/cli/nmcli.c:310
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "错误：\"%s\" 选项缺少�数。"
 
-#: ../clients/cli/nmcli.c:625
+#: ../clients/cli/nmcli.c:618
 #, c-format
 msgid "Unexpected end of file following '%s'\n"
 msgstr "\"%s\" �更���外的文件尾\n"
 
-#: ../clients/cli/nmcli.c:633
+#: ../clients/cli/nmcli.c:626
 #, c-format
 msgid "Expected whitespace following '%s'\n"
 msgstr "期望 \"%s\" �更�空白\n"
 
-#: ../clients/cli/nmcli.c:645
+#: ../clients/cli/nmcli.c:638
 #, c-format
 msgid "Expected a value for '%s'\n"
 msgstr "期望一个 \"%s\" 的值\n"
 
-#: ../clients/cli/nmcli.c:659
+#: ../clients/cli/nmcli.c:652
 #, c-format
 msgid "Expected a line break following '%s'\n"
 msgstr "期望 \"%s\" �更��行符\n"
 
-#: ../clients/cli/nmcli.c:748
+#: ../clients/cli/nmcli.c:741
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "错误：第二次指定了选项 \"--terse\"。"
 
-#: ../clients/cli/nmcli.c:753
+#: ../clients/cli/nmcli.c:746
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "错误：选项 \"--terse\" 与 \"--pretty\" 相互排斥。"
 
-#: ../clients/cli/nmcli.c:761
+#: ../clients/cli/nmcli.c:754
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "错误：第二次指定了选项 \"--pretty\"。"
 
-#: ../clients/cli/nmcli.c:766
+#: ../clients/cli/nmcli.c:759
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "错误：选项 \"--pretty\" 与 \"--terse\" 相互排斥。"
 
-#: ../clients/cli/nmcli.c:781
+#: ../clients/cli/nmcli.c:774
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "错误：\"%s\" �是 \"%s\" 选项的有效�数。"
 
-#: ../clients/cli/nmcli.c:795 ../clients/cli/nmcli.c:807
+#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "错误：\"%s\" �是 \"%s\" 选项的有效�数。"
 
-#: ../clients/cli/nmcli.c:831
+#: ../clients/cli/nmcli.c:824
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "错误：\"%s\" �是有效的超时时间。"
 
-#: ../clients/cli/nmcli.c:838
+#: ../clients/cli/nmcli.c:831
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具，版本 %s\n"
 
-#: ../clients/cli/nmcli.c:846
+#: ../clients/cli/nmcli.c:839
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "错误：选项 \"%s\" 未知，�试 \"nmcli -help\"。"
 
-#: ../clients/cli/nmcli.c:902 ../clients/cli/nmcli.c:909
+#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "错误：nmcli 被信� %s (%d) 终止了"
 
-#: ../clients/cli/nmcli.c:975
+#: ../clients/cli/nmcli.c:968
 msgid "Success"
 msgstr "�功"
 
-#: ../clients/cli/polkit-agent.c:68
+#: ../clients/cli/polkit-agent.c:54
 #, c-format
 msgid "Authentication message: %s\n"
 msgstr "验�消�：%s\n"
 
-#: ../clients/cli/polkit-agent.c:76
+#: ../clients/cli/polkit-agent.c:62
 #, c-format
 msgid "Authentication error: %s\n"
 msgstr "验�错误：%s\n"
 
-#: ../clients/cli/polkit-agent.c:136
+#: ../clients/cli/polkit-agent.c:122
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告：polkit 代��始化失败：%s\n"
 
-#: ../clients/cli/settings.c:46
+#: ../clients/cli/settings.c:32
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
-msgstr "您是�也�将 \"%s\" 设为 \"%s\"？[yes]："
+msgstr "您是�也�将 \"%s\" 设为 \"%s\"？[yes]： "
 
-#: ../clients/cli/settings.c:48
+#: ../clients/cli/settings.c:34
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
-msgstr "您是�也�清除 \"%s\"？[yes]："
+msgstr "您是�也�清除 \"%s\"？[yes]： "
 
-#: ../clients/cli/settings.c:243
+#: ../clients/cli/settings.c:229
 #, c-format
 msgid ""
 "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
 msgstr "警告：%s.%s 已设为 \"%s\"，但在基础结构（infrastructure）模�下它�能会被忽略。\n"
 
-#: ../clients/cli/settings.c:262
+#: ../clients/cli/settings.c:248
 #, c-format
 msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
 msgstr "警告： 设置 %s.%s 需�删除 ipv4 和 ipv6 设置\n"
 
-#: ../clients/cli/settings.c:264
+#: ../clients/cli/settings.c:250
 msgid "Do you want to remove them? [yes] "
-msgstr "您�删除它们�？[yes]："
+msgstr "您�删除它们�？[yes]： "
 
-#: ../clients/cli/settings.c:352
+#: ../clients/cli/settings.c:338
 #, c-format
 msgid "Warning: %s is not an UUID of any existing connection profile\n"
 msgstr "警告：%s �是任何现有连接�置集的 UUID\n"
 
-#: ../clients/cli/settings.c:357 ../clients/cli/settings.c:370
+#: ../clients/cli/settings.c:343 ../clients/cli/settings.c:356
 #, c-format
 msgid "'%s' is not a VPN connection profile"
 msgstr "\"%s\" �是 VPN 连接�置集"
 
-#: ../clients/cli/settings.c:364
+#: ../clients/cli/settings.c:350
 #, c-format
 msgid "'%s' is not a name of any exiting profile"
 msgstr "\"%s\" �是任何现有�置集的�称"
 
-#: ../clients/cli/settings.c:408
+#: ../clients/cli/settings.c:394
 #, c-format
 msgid "Warning: %s\n"
 msgstr "警告：%s\n"
 
-#: ../clients/cli/settings.c:411
+#: ../clients/cli/settings.c:397
 #, c-format
 msgid "Info: %s\n"
 msgstr "信�：%s\n"
 
-#: ../clients/cli/settings.c:504
+#: ../clients/cli/settings.c:490
 msgid "don't know how to get the property value"
 msgstr "�知�如何获�属性值"
 
-#: ../clients/cli/settings.c:593
+#: ../clients/cli/settings.c:580
 msgid "the property can't be changed"
 msgstr "无法更改该属性"
 
-#: ../clients/cli/settings.c:671
+#: ../clients/cli/settings.c:658
 msgid "[NM property description]"
 msgstr "[NM 属性�述]"
 
-#: ../clients/cli/settings.c:681
+#: ../clients/cli/settings.c:668
 msgid "[nmcli specific description]"
 msgstr "[nmcli 特定�述]"
 
-#: ../clients/cli/utils.c:318
+#: ../clients/cli/utils.c:304
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "错误：需��数 \"%s\" 但�供的是 \"%s\"。"
 
-#: ../clients/cli/utils.c:321
+#: ../clients/cli/utils.c:307
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "错误：�外�数 \"%s\""
 
-#: ../clients/cli/utils.c:709
+#: ../clients/cli/utils.c:695
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "无效字段 \"%s%s%s\"；没有此类字段"
 
-#: ../clients/cli/utils.c:713
+#: ../clients/cli/utils.c:699
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "无效字段 \"%s%s%s\";�许的字段：[%s]"
 
-#: ../clients/cli/utils.c:809
+#: ../clients/cli/utils.c:795
 #, c-format
 msgid "failure to select field"
 msgstr "选择字段失败"
 
-#: ../clients/cli/utils.c:1438
+#: ../clients/cli/utils.c:1424
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "读� nmcli 输出时出错：%s\n"
 
-#: ../clients/cli/utils.c:1443
+#: ../clients/cli/utils.c:1429
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "写入 nmcli 输出时出错：%s\n"
 
-#: ../clients/cli/utils.c:1469
+#: ../clients/cli/utils.c:1455
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "创建与�进程通讯的管�失败：%s\n"
 
-#: ../clients/cli/utils.c:1478
+#: ../clients/cli/utils.c:1464
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "fork �进程失败：%s\n"
 
-#: ../clients/cli/utils.c:1525 ../clients/cli/utils.c:1529
+#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "�制与�进程通讯的管�失败：%s\n"
 
-#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4123
+#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
 msgid "on"
 msgstr "å¼€"
 
-#: ../clients/cli/utils.h:303 ../clients/common/nm-meta-setting-desc.c:4125
+#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
 msgid "off"
 msgstr "å…³"
 
-#: ../clients/cli/utils.h:329
+#: ../clients/cli/utils.h:323
 #, c-format
 msgid "%lld (%s)"
 msgstr "%lld（%s）"
 
-#: ../clients/cli/utils.h:336
+#: ../clients/cli/utils.h:330
 #, 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:121
-#: ../clients/common/nm-client-utils.c:152
+#.
+#: ../clients/common/nm-client-utils.c:107
+#: ../clients/common/nm-client-utils.c:138
 #, c-format
 msgid "'%s' is ambiguous (%s)"
 msgstr "\"%s\" �明确（%s）"
 
-#: ../clients/common/nm-client-utils.c:131
+#: ../clients/common/nm-client-utils.c:117
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "\"%s\" 无效，请使用 [%s] 或 [%s]"
 
-#: ../clients/common/nm-client-utils.c:164
+#: ../clients/common/nm-client-utils.c:150
 #, c-format
 msgid "'%s' is not valid; use [%s], [%s] or [%s]"
 msgstr "\"%s\" 无效，请使用 [%s]�[%s] 或 [%s]"
 
-#: ../clients/common/nm-client-utils.c:213
+#: ../clients/common/nm-client-utils.c:199
 #, c-format
 msgid "'%s' is ambiguous: %s"
 msgstr "\"%s\" �明确：%s"
 
-#: ../clients/common/nm-client-utils.c:223
+#: ../clients/common/nm-client-utils.c:209
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "缺少�称，请�试使用 [%s] 之一。"
 
-#: ../clients/common/nm-client-utils.c:265
+#: ../clients/common/nm-client-utils.c:251
 msgid "unmanaged"
 msgstr "未托管"
 
-#: ../clients/common/nm-client-utils.c:266
+#: ../clients/common/nm-client-utils.c:252
 msgid "unavailable"
 msgstr "��用"
 
-#: ../clients/common/nm-client-utils.c:268
+#: ../clients/common/nm-client-utils.c:254
 msgid "connecting (prepare)"
 msgstr "连接中（准备）"
 
-#: ../clients/common/nm-client-utils.c:269
+#: ../clients/common/nm-client-utils.c:255
 msgid "connecting (configuring)"
 msgstr "连接中（正在�置）"
 
-#: ../clients/common/nm-client-utils.c:270
+#: ../clients/common/nm-client-utils.c:256
 msgid "connecting (need authentication)"
 msgstr "连接中（需�验�）"
 
-#: ../clients/common/nm-client-utils.c:271
+#: ../clients/common/nm-client-utils.c:257
 msgid "connecting (getting IP configuration)"
 msgstr "连接中（正在获� IP �置）"
 
-#: ../clients/common/nm-client-utils.c:272
+#: ../clients/common/nm-client-utils.c:258
 msgid "connecting (checking IP connectivity)"
 msgstr "连接中（正在检查 IP 连接性）"
 
-#: ../clients/common/nm-client-utils.c:273
+#: ../clients/common/nm-client-utils.c:259
 msgid "connecting (starting secondary connections)"
 msgstr "连接中（正在�动次级连接）"
 
-#: ../clients/common/nm-client-utils.c:276
+#: ../clients/common/nm-client-utils.c:262
 msgid "connection failed"
 msgstr "连接失败"
 
-#: ../clients/common/nm-client-utils.c:284
+#: ../clients/common/nm-client-utils.c:270
 msgid "yes (guessed)"
 msgstr "是（猜测）"
 
-#: ../clients/common/nm-client-utils.c:285
+#: ../clients/common/nm-client-utils.c:271
 msgid "no (guessed)"
 msgstr "�（猜测）"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
-#: ../clients/common/nm-client-utils.c:291
-#: ../clients/common/nm-client-utils.c:364 ../libnm/nm-device.c:1438
+#: ../clients/common/nm-client-utils.c:277
+#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
 msgid "Unknown"
 msgstr "未知"
 
-#: ../clients/common/nm-client-utils.c:292
+#: ../clients/common/nm-client-utils.c:278
 msgid "No reason given"
 msgstr "未给出原因"
 
-#: ../clients/common/nm-client-utils.c:294
+#: ../clients/common/nm-client-utils.c:280
 msgid "Device is now managed"
 msgstr "设备现在已托管"
 
-#: ../clients/common/nm-client-utils.c:295
+#: ../clients/common/nm-client-utils.c:281
 msgid "Device is now unmanaged"
 msgstr "设备现在未托管"
 
-#: ../clients/common/nm-client-utils.c:296
+#: ../clients/common/nm-client-utils.c:282
 msgid "The device could not be readied for configuration"
 msgstr "设备�置未就绪"
 
-#: ../clients/common/nm-client-utils.c:297
+#: ../clients/common/nm-client-utils.c:283
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr "IP �置无法�留（无�用地��超时等）"
 
-#: ../clients/common/nm-client-utils.c:298
+#: ../clients/common/nm-client-utils.c:284
 msgid "The IP configuration is no longer valid"
 msgstr "IP �置��有效"
 
-#: ../clients/common/nm-client-utils.c:299
+#: ../clients/common/nm-client-utils.c:285
 msgid "Secrets were required, but not provided"
 msgstr "需�密钥，但未�供"
 
-#: ../clients/common/nm-client-utils.c:300
+#: ../clients/common/nm-client-utils.c:286
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X 请求方已断开连接"
 
-#: ../clients/common/nm-client-utils.c:301
+#: ../clients/common/nm-client-utils.c:287
 msgid "802.1X supplicant configuration failed"
 msgstr "802.1X 请求方�置失败"
 
-#: ../clients/common/nm-client-utils.c:302
+#: ../clients/common/nm-client-utils.c:288
 msgid "802.1X supplicant failed"
 msgstr "802.1X 请求方失败"
 
-#: ../clients/common/nm-client-utils.c:303
+#: ../clients/common/nm-client-utils.c:289
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X 请求方验�时间过长"
 
-#: ../clients/common/nm-client-utils.c:304
+#: ../clients/common/nm-client-utils.c:290
 msgid "PPP service failed to start"
 msgstr "PPP �务无法�动"
 
-#: ../clients/common/nm-client-utils.c:305
+#: ../clients/common/nm-client-utils.c:291
 msgid "PPP service disconnected"
 msgstr "PPP �务已断开连接"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:306
+#: ../clients/common/nm-client-utils.c:292
 msgid "PPP failed"
 msgstr "PPP 失败"
 
-#: ../clients/common/nm-client-utils.c:307
+#: ../clients/common/nm-client-utils.c:293
 msgid "DHCP client failed to start"
 msgstr "DHCP 客户端�动失败"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../clients/common/nm-client-utils.c:308
+#: ../clients/common/nm-client-utils.c:294
 msgid "DHCP client error"
 msgstr "DHCP 客户端错误"
 
-#: ../clients/common/nm-client-utils.c:309
+#: ../clients/common/nm-client-utils.c:295
 msgid "DHCP client failed"
 msgstr "DHCP 客户端失败"
 
-#: ../clients/common/nm-client-utils.c:310
+#: ../clients/common/nm-client-utils.c:296
 msgid "Shared connection service failed to start"
 msgstr "共享连接�务�动失败"
 
-#: ../clients/common/nm-client-utils.c:311
+#: ../clients/common/nm-client-utils.c:297
 msgid "Shared connection service failed"
 msgstr "共享连接�务失败"
 
-#: ../clients/common/nm-client-utils.c:312
+#: ../clients/common/nm-client-utils.c:298
 msgid "AutoIP service failed to start"
 msgstr "自动 IP（AutoIP）�务无法�动"
 
-#: ../clients/common/nm-client-utils.c:313
+#: ../clients/common/nm-client-utils.c:299
 msgid "AutoIP service error"
 msgstr "自动 IP（AutoIP）�务出错"
 
-#: ../clients/common/nm-client-utils.c:314
+#: ../clients/common/nm-client-utils.c:300
 msgid "AutoIP service failed"
 msgstr "自动 IP（AutoIP）�务失败"
 
-#: ../clients/common/nm-client-utils.c:315
+#: ../clients/common/nm-client-utils.c:301
 msgid "The line is busy"
 msgstr "线路正忙"
 
-#: ../clients/common/nm-client-utils.c:316
+#: ../clients/common/nm-client-utils.c:302
 msgid "No dial tone"
 msgstr "无拨�音"
 
-#: ../clients/common/nm-client-utils.c:317
+#: ../clients/common/nm-client-utils.c:303
 msgid "No carrier could be established"
 msgstr "无法建立载波"
 
-#: ../clients/common/nm-client-utils.c:318
+#: ../clients/common/nm-client-utils.c:304
 msgid "The dialing request timed out"
 msgstr "拨�请求超时"
 
-#: ../clients/common/nm-client-utils.c:319
+#: ../clients/common/nm-client-utils.c:305
 msgid "The dialing attempt failed"
 msgstr "拨��试失败"
 
-#: ../clients/common/nm-client-utils.c:320
+#: ../clients/common/nm-client-utils.c:306
 msgid "Modem initialization failed"
 msgstr "调制解调器�始化失败"
 
-#: ../clients/common/nm-client-utils.c:321
+#: ../clients/common/nm-client-utils.c:307
 msgid "Failed to select the specified APN"
 msgstr "无法选择指定的 APN"
 
-#: ../clients/common/nm-client-utils.c:322
+#: ../clients/common/nm-client-utils.c:308
 msgid "Not searching for networks"
 msgstr "��索网络"
 
-#: ../clients/common/nm-client-utils.c:323
+#: ../clients/common/nm-client-utils.c:309
 msgid "Network registration denied"
 msgstr "网络注册�拒�"
 
-#: ../clients/common/nm-client-utils.c:324
+#: ../clients/common/nm-client-utils.c:310
 msgid "Network registration timed out"
 msgstr "网络注册超时"
 
-#: ../clients/common/nm-client-utils.c:325
+#: ../clients/common/nm-client-utils.c:311
 msgid "Failed to register with the requested network"
 msgstr "注册请求的网络失败"
 
-#: ../clients/common/nm-client-utils.c:326
+#: ../clients/common/nm-client-utils.c:312
 msgid "PIN check failed"
 msgstr "PIN 检查失败"
 
-#: ../clients/common/nm-client-utils.c:327
+#: ../clients/common/nm-client-utils.c:313
 msgid "Necessary firmware for the device may be missing"
 msgstr "该设备所需固件�能缺失"
 
-#: ../clients/common/nm-client-utils.c:328
+#: ../clients/common/nm-client-utils.c:314
 msgid "The device was removed"
 msgstr "设备已被移除"
 
-#: ../clients/common/nm-client-utils.c:329
+#: ../clients/common/nm-client-utils.c:315
 msgid "NetworkManager went to sleep"
 msgstr "网络管�器已挂起"
 
-#: ../clients/common/nm-client-utils.c:330
+#: ../clients/common/nm-client-utils.c:316
 msgid "The device's active connection disappeared"
 msgstr "设备的活动连接已消失"
 
-#: ../clients/common/nm-client-utils.c:331
+#: ../clients/common/nm-client-utils.c:317
 msgid "Device disconnected by user or client"
 msgstr "用户或客户端断开了设备连接"
 
-#: ../clients/common/nm-client-utils.c:332
+#: ../clients/common/nm-client-utils.c:318
 msgid "Carrier/link changed"
 msgstr "载波/链路已更改"
 
-#: ../clients/common/nm-client-utils.c:333
+#: ../clients/common/nm-client-utils.c:319
 msgid "The device's existing connection was assumed"
 msgstr "�定设备已有连接"
 
-#: ../clients/common/nm-client-utils.c:334
+#: ../clients/common/nm-client-utils.c:320
 msgid "The supplicant is now available"
 msgstr "客户端目��用"
 
-#: ../clients/common/nm-client-utils.c:335
+#: ../clients/common/nm-client-utils.c:321
 msgid "The modem could not be found"
 msgstr "未找到调制解调器"
 
-#: ../clients/common/nm-client-utils.c:336
+#: ../clients/common/nm-client-utils.c:322
 msgid "The Bluetooth connection failed or timed out"
 msgstr "�牙连接失败或超时"
 
-#: ../clients/common/nm-client-utils.c:337
+#: ../clients/common/nm-client-utils.c:323
 msgid "GSM Modem's SIM card not inserted"
 msgstr "GSM 调制解调器的 SIM �未�入"
 
-#: ../clients/common/nm-client-utils.c:338
+#: ../clients/common/nm-client-utils.c:324
 msgid "GSM Modem's SIM PIN required"
 msgstr "GSM 调制解调器的 SIM 需� PIN �"
 
-#: ../clients/common/nm-client-utils.c:339
+#: ../clients/common/nm-client-utils.c:325
 msgid "GSM Modem's SIM PUK required"
 msgstr "GSM 调制解调器的 SIM 需� PUK �"
 
-#: ../clients/common/nm-client-utils.c:340
+#: ../clients/common/nm-client-utils.c:326
 msgid "GSM Modem's SIM wrong"
 msgstr "GSM 调制解调器的 SIM 错误"
 
-#: ../clients/common/nm-client-utils.c:341
+#: ../clients/common/nm-client-utils.c:327
 msgid "InfiniBand device does not support connected mode"
 msgstr "InfiniBand 设备�支�已连接的模�"
 
-#: ../clients/common/nm-client-utils.c:342
+#: ../clients/common/nm-client-utils.c:328
 msgid "A dependency of the connection failed"
 msgstr "连接的�赖关系失败"
 
-#: ../clients/common/nm-client-utils.c:343
+#: ../clients/common/nm-client-utils.c:329
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "ADSL 网桥上的 RFC 2684 以太网出现问题"
 
-#: ../clients/common/nm-client-utils.c:344
+#: ../clients/common/nm-client-utils.c:330
 msgid "ModemManager is unavailable"
 msgstr "ModemManager ��用"
 
-#: ../clients/common/nm-client-utils.c:345
+#: ../clients/common/nm-client-utils.c:331
 msgid "The Wi-Fi network could not be found"
 msgstr "未找到 Wi-Fi 网络"
 
-#: ../clients/common/nm-client-utils.c:346
+#: ../clients/common/nm-client-utils.c:332
 msgid "A secondary connection of the base connection failed"
 msgstr "基础连接的次级连接失败"
 
-#: ../clients/common/nm-client-utils.c:347
+#: ../clients/common/nm-client-utils.c:333
 msgid "DCB or FCoE setup failed"
 msgstr "DCB 或 FCoE 设置失败"
 
-#: ../clients/common/nm-client-utils.c:348
+#: ../clients/common/nm-client-utils.c:334
 msgid "teamd control failed"
 msgstr "teamd 控制失败"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:349
+#: ../clients/common/nm-client-utils.c:335
 msgid "Modem failed or no longer available"
 msgstr "调制解调器出现故障或���用"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../clients/common/nm-client-utils.c:350
+#: ../clients/common/nm-client-utils.c:336
 msgid "Modem now ready and available"
 msgstr "调制解调器现已就绪且�用"
 
-#: ../clients/common/nm-client-utils.c:351
+#: ../clients/common/nm-client-utils.c:337
 msgid "SIM PIN was incorrect"
 msgstr "SIM PIN �正确"
 
-#: ../clients/common/nm-client-utils.c:352
+#: ../clients/common/nm-client-utils.c:338
 msgid "New connection activation was enqueued"
 msgstr "新连接激活已排队"
 
-#: ../clients/common/nm-client-utils.c:353
+#: ../clients/common/nm-client-utils.c:339
 msgid "The device's parent changed"
 msgstr "设备的上级已更改"
 
-#: ../clients/common/nm-client-utils.c:354
+#: ../clients/common/nm-client-utils.c:340
 msgid "The device parent's management changed"
 msgstr "设备的上级管�已更改"
 
-#: ../clients/common/nm-client-utils.c:355
+#: ../clients/common/nm-client-utils.c:341
 msgid "Open vSwitch database connection failed"
 msgstr "Open vSwitch 数�库连接失败"
 
-#: ../clients/common/nm-client-utils.c:356
+#: ../clients/common/nm-client-utils.c:342
 msgid "A duplicate IP address was detected"
 msgstr "检测到��的 IP 地�"
 
-#: ../clients/common/nm-client-utils.c:357
+#: ../clients/common/nm-client-utils.c:343
 msgid "The selected IP method is not supported"
 msgstr "选中的 IP 方法未支�"
 
-#: ../clients/common/nm-client-utils.c:358
+#: ../clients/common/nm-client-utils.c:344
 msgid "Failed to configure SR-IOV parameters"
 msgstr "�置 SR-IOV �数失败"
 
-#: ../clients/common/nm-client-utils.c:359
+#: ../clients/common/nm-client-utils.c:345
 msgid "The Wi-Fi P2P peer could not be found"
 msgstr "无法找到 Wi-Fi P2P peer"
 
-#: ../clients/common/nm-client-utils.c:365
+#: ../clients/common/nm-client-utils.c:351
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../clients/common/nm-client-utils.c:366
+#: ../clients/common/nm-client-utils.c:352
 msgid "The connection was disconnected"
 msgstr "连接已断开"
 
-#: ../clients/common/nm-client-utils.c:367
+#: ../clients/common/nm-client-utils.c:353
 msgid "Disconnected by user"
 msgstr "已被用户断开连接"
 
-#: ../clients/common/nm-client-utils.c:368
+#: ../clients/common/nm-client-utils.c:354
 msgid "The base network connection was interrupted"
 msgstr "基础网络连接已中断"
 
-#: ../clients/common/nm-client-utils.c:369
+#: ../clients/common/nm-client-utils.c:355
 msgid "The VPN service stopped unexpectedly"
 msgstr "VPN �务�外�止"
 
-#: ../clients/common/nm-client-utils.c:370
+#: ../clients/common/nm-client-utils.c:356
 msgid "The VPN service returned invalid configuration"
 msgstr "VPN �务返回了无效�置"
 
-#: ../clients/common/nm-client-utils.c:371
+#: ../clients/common/nm-client-utils.c:357
 msgid "The connection attempt timed out"
 msgstr "连接�试超时"
 
-#: ../clients/common/nm-client-utils.c:372
+#: ../clients/common/nm-client-utils.c:358
 msgid "The VPN service did not start in time"
 msgstr "VPN 连接没有�时�动"
 
-#: ../clients/common/nm-client-utils.c:373
+#: ../clients/common/nm-client-utils.c:359
 msgid "The VPN service failed to start"
 msgstr "VPN �务�动失败"
 
-#: ../clients/common/nm-client-utils.c:374
+#: ../clients/common/nm-client-utils.c:360
 msgid "No valid secrets"
 msgstr "没有有效的密钥"
 
-#: ../clients/common/nm-client-utils.c:375
+#: ../clients/common/nm-client-utils.c:361
 msgid "Invalid secrets"
 msgstr "无效的密钥"
 
-#: ../clients/common/nm-client-utils.c:376
+#: ../clients/common/nm-client-utils.c:362
 msgid "The connection was removed"
 msgstr "连接已被移除"
 
-#: ../clients/common/nm-client-utils.c:377
+#: ../clients/common/nm-client-utils.c:363
 msgid "Master connection failed"
 msgstr "主连接失败"
 
-#: ../clients/common/nm-client-utils.c:378
+#: ../clients/common/nm-client-utils.c:364
 msgid "Could not create a software link"
 msgstr "无法创建软件链路："
 
-#: ../clients/common/nm-client-utils.c:379
+#: ../clients/common/nm-client-utils.c:365
 msgid "The device disappeared"
 msgstr "设备已消失"
 
-#: ../clients/common/nm-meta-setting-access.c:510
+#: ../clients/common/nm-meta-setting-access.c:496
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "字段 \"%s\" 必须是�独的"
 
-#: ../clients/common/nm-meta-setting-access.c:525
+#: ../clients/common/nm-meta-setting-access.c:511
 #, 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:311
-#: ../clients/common/nm-meta-setting-desc.c:372
+#: ../clients/common/nm-meta-setting-desc.c:297
+#: ../clients/common/nm-meta-setting-desc.c:358
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "无效的�缀 '%s'; ��许 <1-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:319
+#: ../clients/common/nm-meta-setting-desc.c:305
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "无效的 IP 地�：%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:344
+#: ../clients/common/nm-meta-setting-desc.c:330
 msgid ""
-"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
-"[,ip[/prefix] ...]'"
-msgstr ""
-"有效语法为：\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ..."
-"]\""
+"The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,"
+"ip[/prefix] ...]'"
+msgstr "有效语法为：\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]\""
 
-#: ../clients/common/nm-meta-setting-desc.c:383
+#: ../clients/common/nm-meta-setting-desc.c:369
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "下一跳（\"%s\"）必须在首�"
 
-#: ../clients/common/nm-meta-setting-desc.c:389
+#: ../clients/common/nm-meta-setting-desc.c:375
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "跃点数（\"%s\"）必需在属性�"
 
-#: ../clients/common/nm-meta-setting-desc.c:437
+#: ../clients/common/nm-meta-setting-desc.c:423
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "无效路由：%s。%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:503
+#: ../clients/common/nm-meta-setting-desc.c:489
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "无法从文件 \"%s\" 读� PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:510
+#: ../clients/common/nm-meta-setting-desc.c:496
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "文件 \"%s\" 包�无效的 utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:523
+#: ../clients/common/nm-meta-setting-desc.c:509
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "\"%s\" 没有包�有效的 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:526
+#: ../clients/common/nm-meta-setting-desc.c:512
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "�是有效的 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:579
+#: ../clients/common/nm-meta-setting-desc.c:565
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "无法从文件 \"%s\" 读�组�（team）�置"
 
-#: ../clients/common/nm-meta-setting-desc.c:586
+#: ../clients/common/nm-meta-setting-desc.c:572
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "组�（team）�置文件 \"%s\" 包�无效的 utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:1034
+#: ../clients/common/nm-meta-setting-desc.c:1029
 msgid "auto"
 msgstr "自动"
 
-#: ../clients/common/nm-meta-setting-desc.c:1186
+#: ../clients/common/nm-meta-setting-desc.c:1181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s（%s）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1334
-#: ../clients/common/nm-meta-setting-desc.c:1338
+#: ../clients/common/nm-meta-setting-desc.c:1329
+#: ../clients/common/nm-meta-setting-desc.c:1333
 msgid "'%s' is out of range [%"
 msgstr "'%s' 超出范围 [%"
 
-#: ../clients/common/nm-meta-setting-desc.c:1343
+#: ../clients/common/nm-meta-setting-desc.c:1338
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "\"%s\" �是有效的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:1400
+#: ../clients/common/nm-meta-setting-desc.c:1395
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "\"%s\" 超出范围 [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1446
+#: ../clients/common/nm-meta-setting-desc.c:1441
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "\"%s\" �是有效的以太网 MAC"
 
-#: ../clients/common/nm-meta-setting-desc.c:1554
+#: ../clients/common/nm-meta-setting-desc.c:1567
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "无效选项 \"%s\"，请使用 [%s] 的组�"
 
-#: ../clients/common/nm-meta-setting-desc.c:1559 ../libnm-core/nm-keyfile.c:930
+#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "无效选项 \"%s\"，请使用 [%s] 中的一个。"
 
-#: ../clients/common/nm-meta-setting-desc.c:1678
+#: ../clients/common/nm-meta-setting-desc.c:1691
 #, c-format
 msgid "%d (key)"
 msgstr "%d（密钥）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1680
+#: ../clients/common/nm-meta-setting-desc.c:1693
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d（密�）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1683
+#: ../clients/common/nm-meta-setting-desc.c:1696
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d（未知）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1696
+#: ../clients/common/nm-meta-setting-desc.c:1709
 msgid "0 (NONE)"
 msgstr "0（无）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1702
+#: ../clients/common/nm-meta-setting-desc.c:1715
 msgid "REORDER_HEADERS, "
-msgstr "记录头�"
+msgstr "记录头� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1704
+#: ../clients/common/nm-meta-setting-desc.c:1717
 msgid "GVRP, "
-msgstr "GVRP�"
+msgstr "GVRP� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1706
+#: ../clients/common/nm-meta-setting-desc.c:1719
 msgid "LOOSE_BINDING, "
-msgstr "�散绑定�"
+msgstr "�散绑定� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1708
+#: ../clients/common/nm-meta-setting-desc.c:1721
 msgid "MVRP, "
-msgstr "MVRP�"
+msgstr "MVRP� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1729
+#: ../clients/common/nm-meta-setting-desc.c:1742
 msgid "0 (none)"
 msgstr "0（无）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1735
+#: ../clients/common/nm-meta-setting-desc.c:1748
 msgid "agent-owned, "
-msgstr "为代�拥有�"
+msgstr "为代�拥有� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1737
+#: ../clients/common/nm-meta-setting-desc.c:1750
 msgid "not saved, "
-msgstr "未�存�"
+msgstr "未�存� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1739
+#: ../clients/common/nm-meta-setting-desc.c:1752
 msgid "not required, "
-msgstr "�必需�"
+msgstr "�必需� "
 
-#: ../clients/common/nm-meta-setting-desc.c:1957
+#: ../clients/common/nm-meta-setting-desc.c:1970
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' 无效; 使用 <option>=<value>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1967
+#: ../clients/common/nm-meta-setting-desc.c:1980
 #, c-format
 msgid "cannot set empty \"%s\" option"
 msgstr "无法设定空的 %s 选项"
 
-#: ../clients/common/nm-meta-setting-desc.c:2026
+#: ../clients/common/nm-meta-setting-desc.c:2039
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "\"%u\" 标记无效；请使用 %s 的组�"
 
-#: ../clients/common/nm-meta-setting-desc.c:2043
+#: ../clients/common/nm-meta-setting-desc.c:2056
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "\"%s\" �是有效的数字（或超出范围）"
 
-#: ../clients/common/nm-meta-setting-desc.c:2064
-#: ../clients/common/nm-meta-setting-desc.c:4039
-#: ../libnm-core/nm-setting-ovs-bridge.c:197 ../src/nm-config.c:564
+#: ../clients/common/nm-meta-setting-desc.c:2077
+#: ../clients/common/nm-meta-setting-desc.c:4052
+#: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr "\"%s\" 无效"
 
-#: ../clients/common/nm-meta-setting-desc.c:2161
+#: ../clients/common/nm-meta-setting-desc.c:2174
 msgid "not a valid hex-string"
 msgstr "�是有效的 hex 字符串"
 
-#: ../clients/common/nm-meta-setting-desc.c:2177
+#: ../clients/common/nm-meta-setting-desc.c:2190
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "\"%s\" �是有效�六进制字符"
 
-#: ../clients/common/nm-meta-setting-desc.c:2256
+#: ../clients/common/nm-meta-setting-desc.c:2269
 msgid ""
 "too many arguments. Please only specify a private key file and optionally a "
 "password"
 msgstr "�数太多。�能指定一个�钥或�指定一个�选的密�"
 
-#: ../clients/common/nm-meta-setting-desc.c:2363
+#: ../clients/common/nm-meta-setting-desc.c:2376
 #, c-format
 msgid "failed to set bond option \"%s\""
 msgstr "设定绑定属性失败 %s"
 
-#: ../clients/common/nm-meta-setting-desc.c:2380
+#: ../clients/common/nm-meta-setting-desc.c:2393
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4492,8 +4559,7 @@ msgid ""
 "balance-alb   = 6\n"
 "\n"
 "Example: mode=2,miimon=120\n"
-msgstr ""
-"输入绑定选项列表，格�为:\n"
+msgstr "输入绑定选项列表，格�为:\n"
 "  option = <value>, option = <value>,... \n"
 "有效选项为: %s\n"
 "'mode' �以是一个�称或数字:\n"
@@ -4514,221 +4580,218 @@ 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:2445
+#: ../clients/common/nm-meta-setting-desc.c:2458
 #, c-format
 msgid "Can not change the connection type"
 msgstr "无法更改连接类型"
 
-#: ../clients/common/nm-meta-setting-desc.c:2530
+#: ../clients/common/nm-meta-setting-desc.c:2543
 #, c-format
 msgid "invalid permission \"%s\""
 msgstr "无效的�� \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:2567
+#: ../clients/common/nm-meta-setting-desc.c:2580
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "\"%s\" �是有效的主连接；使用接��或连接的 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2648
+#: ../clients/common/nm-meta-setting-desc.c:2661
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "值 \"%s\" �是有效的 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2719
+#: ../clients/common/nm-meta-setting-desc.c:2732
 msgid "0 (disabled)"
 msgstr "0（�用）"
 
-#: ../clients/common/nm-meta-setting-desc.c:2725
+#: ../clients/common/nm-meta-setting-desc.c:2738
 msgid "enabled, "
-msgstr "�用�"
+msgstr "�用� "
 
-#: ../clients/common/nm-meta-setting-desc.c:2727
+#: ../clients/common/nm-meta-setting-desc.c:2740
 msgid "advertise, "
-msgstr "通告�"
+msgstr "通告� "
 
-#: ../clients/common/nm-meta-setting-desc.c:2729
+#: ../clients/common/nm-meta-setting-desc.c:2742
 msgid "willing, "
-msgstr "愿��"
+msgstr "愿�� "
 
-#: ../clients/common/nm-meta-setting-desc.c:2818
+#: ../clients/common/nm-meta-setting-desc.c:2831
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "\"%s\" �是有效的 DCB 标记"
 
-#: ../clients/common/nm-meta-setting-desc.c:2845
+#: ../clients/common/nm-meta-setting-desc.c:2858
 msgid "must contain 8 comma-separated numbers"
 msgstr "必须包� 8 个用逗�分隔的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2859
+#: ../clients/common/nm-meta-setting-desc.c:2872
 #, 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:2862
+#: ../clients/common/nm-meta-setting-desc.c:2875
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "\"%s\" �是 0 和 %u（包括）之间的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2883
+#: ../clients/common/nm-meta-setting-desc.c:2896
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "除� \"%s\" 包� 1（�用），�则更改无法生效"
 
-#: ../clients/common/nm-meta-setting-desc.c:2913
+#: ../clients/common/nm-meta-setting-desc.c:2926
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "带宽百分比总和必须为 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:2984
-#: ../clients/common/nm-meta-setting-desc.c:2990
+#: ../clients/common/nm-meta-setting-desc.c:2997
+#: ../clients/common/nm-meta-setting-desc.c:3003
 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:3014
+#: ../clients/common/nm-meta-setting-desc.c:3027
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "\"%s\" �是有效的 IBoIP P_Key"
 
-#: ../clients/common/nm-meta-setting-desc.c:3037
+#: ../clients/common/nm-meta-setting-desc.c:3050
 msgid "default"
 msgstr "默认"
 
-#: ../clients/common/nm-meta-setting-desc.c:3201
+#: ../clients/common/nm-meta-setting-desc.c:3214
 #, c-format
 msgid "invalid IPv%c address '%s'"
 msgstr "无效的 IPv%c 地� '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3328
+#: ../clients/common/nm-meta-setting-desc.c:3341
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "无效的网关地� \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3478
+#: ../clients/common/nm-meta-setting-desc.c:3491
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' �是一个有效的 channel; 使用 <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3558
-msgid ""
-"The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
+#: ../clients/common/nm-meta-setting-desc.c:3571
+msgid "The valid syntax is: vf [attribute=value]... [,vf [attribute=value]...]"
 msgstr "有效语法为：\"vf [attribute=value]... [,vf [attribute=value]...]\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3582
-#: ../clients/common/nm-meta-setting-desc.c:3662
+#: ../clients/common/nm-meta-setting-desc.c:3595
+#: ../clients/common/nm-meta-setting-desc.c:3675
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'"
 msgstr "正确语法为：'[root | parent <handle>] [handle <handle>] <kind>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3607
+#: ../clients/common/nm-meta-setting-desc.c:3620
 msgid "The valid syntax is: '<vid>[-<vid>] [pvid] [untagged]'"
 msgstr "正确语法为：'<vid>[-<vid>] [pvid] [untagged]'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3803
+#: ../clients/common/nm-meta-setting-desc.c:3816
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "无效的优先级映射 \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3891
+#: ../clients/common/nm-meta-setting-desc.c:3904
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "\"%s\" 无效；应�供两至三个字符串"
 
-#: ../clients/common/nm-meta-setting-desc.c:3930
+#: ../clients/common/nm-meta-setting-desc.c:3943
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
 "  option = <value>, option = <value>,...\n"
 "Valid options are: %s\n"
-msgstr ""
-"输入 S/390 选项列表，格�为:\n"
+msgstr "输入 S/390 选项列表，格�为:\n"
 "  option = <value>, option = <value>,...\n"
 "有效选项为: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3965
+#: ../clients/common/nm-meta-setting-desc.c:3978
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "\"%s\" �是有效的信�"
 
-#: ../clients/common/nm-meta-setting-desc.c:3971
+#: ../clients/common/nm-meta-setting-desc.c:3984
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "\"%ld\" �是有效的信�"
 
-#: ../clients/common/nm-meta-setting-desc.c:3988
-#: ../libnm-core/nm-setting-sriov.c:442 ../libnm-core/nm-setting-wired.c:772
-#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:838
-#: ../libnm-core/nm-setting-wired.c:881 ../libnm-core/nm-setting-wireless.c:893
-#: ../libnm-core/nm-setting-wireless.c:909
+#: ../clients/common/nm-meta-setting-desc.c:4001
+#: ../libnm-core/nm-setting-sriov.c:434 ../libnm-core/nm-setting-wired.c:758
+#: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
+#: ../libnm-core/nm-setting-wireless.c:892
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "\"%s\" �是有效的 MAC 地�"
 
-#: ../clients/common/nm-meta-setting-desc.c:4048
+#: ../clients/common/nm-meta-setting-desc.c:4061
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr "\"%s\" 和 %s \"%s\" �兼容，请先修改密钥或设置正确的 %s。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4058
+#: ../clients/common/nm-meta-setting-desc.c:4071
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "猜测 WEP 密钥为 \"%s\" 类型"
 
-#: ../clients/common/nm-meta-setting-desc.c:4063
+#: ../clients/common/nm-meta-setting-desc.c:4076
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "WEP 密钥索引已设为 \"%d\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4102
+#: ../clients/common/nm-meta-setting-desc.c:4115
 #, c-format
-msgid ""
-"'%s' is not compatible with '%s' type, please change or delete the key."
+msgid "'%s' is not compatible with '%s' type, please change or delete the key."
 msgstr "\"%s\" 和 \"%s\" 类型�兼容，请修改或删除密钥。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4159
+#: ../clients/common/nm-meta-setting-desc.c:4172
 #, c-format
 msgid "'%s' is not valid; use 'on', 'off', or 'ignore'"
 msgstr "\"%s\" 无效；请使用 \"on\"�\"off\" 或 \"ignore\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4219
+#: ../clients/common/nm-meta-setting-desc.c:4232
 msgid "Bonding primary interface [none]"
 msgstr "绑定主�接� [无]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4226
+#: ../clients/common/nm-meta-setting-desc.c:4239
 msgid "Bonding monitoring mode"
 msgstr "绑定监控模�"
 
 # https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s3-modules-bonding-directives.html
 # 链接有下�几个术语的定义，�过应该�用翻译，作为�考。
-#: ../clients/common/nm-meta-setting-desc.c:4235
+#: ../clients/common/nm-meta-setting-desc.c:4248
 msgid "Bonding miimon [100]"
 msgstr "绑定 miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4243
+#: ../clients/common/nm-meta-setting-desc.c:4256
 msgid "Bonding downdelay [0]"
 msgstr "绑定 downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4251
+#: ../clients/common/nm-meta-setting-desc.c:4264
 msgid "Bonding updelay [0]"
 msgstr "绑定 updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4259
+#: ../clients/common/nm-meta-setting-desc.c:4272
 msgid "Bonding arp-interval [0]"
 msgstr "绑定 arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4267
+#: ../clients/common/nm-meta-setting-desc.c:4280
 msgid "Bonding arp-ip-target [none]"
 msgstr "绑定 arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4275
+#: ../clients/common/nm-meta-setting-desc.c:4288
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP 速率（\"slow\" 或 \"fast\"）[slow]"
 
 #. 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:4440
+#: ../clients/common/nm-meta-setting-desc.c:4455
 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 "
@@ -4737,14 +4800,12 @@ msgid ""
 "Examples: set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
-msgstr ""
-"nmcli �接�直接 JSON �置数�和包�该�置的文件�。在�一�情况下会读�该文件并将内容放到这个属性中。\n"
+msgstr "nmcli �接�直接 JSON �置数�和包�该�置的文件�。在�一�情况下会读�该文件并将内容放到这个属性中。\n"
 "\n"
-"例如：set team.config { \"device\": \"team0\", \"runner\": {\"name\": "
-"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\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:4448
+#: ../clients/common/nm-meta-setting-desc.c:4463
 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 "
@@ -4766,10 +4827,9 @@ msgid ""
 "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 ""
-"输入链路监视器列表，其格�为键值是 teamd 属性的字典。字典对的形�为：键=值，且字典对以空格 \" \" 分隔。字典间以 \",\" 分隔。\n"
+"   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
+"name=ethtool delay-up=3\n"
+msgstr "输入链路监视器列表，其格�为键值是 teamd 属性的字典。字典对的形�为：键=值，且字典对以空格 \" \" 分隔。字典间以 \",\" 分隔。\n"
 "在字典里�许或需�的键根�链路监视器的类型改�，而所有链路监视器的唯一共�属性是 \"name\"*，其定义了指定的链路监视器。\n"
 "\n"
 "适用于 \"ethtool\" 链路监视器的属性有：\n"
@@ -4779,44 +4839,40 @@ msgstr ""
 "  \"init-wait\"�\"interval\"�\"missed-max\"�\"target-host\"*\n"
 "\n"
 "适用于 \"arp_ping\" 链路监视器的属性除了包� \"nsna_ping\" 下的所有属性还有：\n"
-"  \"source-host\"*�\"validate-active\"�\"validate-inactive\"�\"send-"
-"always\"。\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"
+"   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:4481
+#: ../clients/common/nm-meta-setting-desc.c:4496
 msgid "IEEE 802.15.4 (WPAN) parent device or connection UUID"
 msgstr "IEEE 802.15.4（WPAN）上级设备或连接的 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:4514
+#: ../clients/common/nm-meta-setting-desc.c:4532
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/cacert.crt\n"
-msgstr ""
-"输入 CA �书的文件路径（�缀�选择 file://）。\n"
+msgstr "输入 CA �书的文件路径（�缀�选择 file://）。\n"
 "  [file://]<文件路径>\n"
 "请注�，nmcli �支�将�书指定为原始比特�（blob）数�。\n"
 "示例：/home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4553
+#: ../clients/common/nm-meta-setting-desc.c:4571
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara.crt\n"
-msgstr ""
-"输入客户�书的文件路径（�缀�选择 file://）。\n"
+msgstr "输入客户�书的文件路径（�缀�选择 file://）。\n"
 "  [file://]<文件路径>\n"
 "请注�，nmcli �支�将�书指定为原始比特�（blob）数�。\n"
 "示例：/home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4610
+#: ../clients/common/nm-meta-setting-desc.c:4628
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4824,13 +4880,12 @@ msgid ""
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/ca-zweite-phase.crt\n"
-msgstr ""
-"输入内部验�的 CA �书的文件路径（�缀�选择 file://）。\n"
+msgstr "输入内部验�的 CA �书的文件路径（�缀�选择 file://）。\n"
 "  [file://]<文件路径>\n"
 "请注�，nmcli �支�将�书指定为原始比特�（blob）数�。\n"
 "示例：/home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4650
+#: ../clients/common/nm-meta-setting-desc.c:4668
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4838,24 +4893,23 @@ msgid ""
 "  [file://]<file path>\n"
 "Note that nmcli does not support specifying certificates as raw blob data.\n"
 "Example: /home/cimrman/jara-zweite-phase.crt\n"
-msgstr ""
-"输入内部验�的客户�书的文件路径（�缀�选择 file://）。\n"
+msgstr "输入内部验�的客户�书的文件路径（�缀�选择 file://）。\n"
 "  [file://]<文件路径>\n"
 "请注�，nmcli �支�将�书指定为原始比特�（blob）数�。\n"
 "示例：/home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4677
+#: ../clients/common/nm-meta-setting-desc.c:4695
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
 "Examples: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
-msgstr ""
-"输入�六进制值列表。\n"
+msgstr "输入�六进制值列表。\n"
 "�使用两�格�：\n"
 "(a) �六进制数字字符串，�两个数字代表一个字节。\n"
 "(b) 用空格分开的采用�六进制数字写入的字节（选项有0x/0X �缀以�自选的 0 开头）。\n"
@@ -4863,113 +4917,113 @@ msgstr ""
 "例如：ab0455a6ea3a74C2\n"
 "      ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4694
 #: ../clients/common/nm-meta-setting-desc.c:4712
+#: ../clients/common/nm-meta-setting-desc.c:4730
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
 "Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
-msgstr ""
-"输入�有密钥和密钥密�的路径（如果还没有设置）：\n"
+msgstr "输入�有密钥和密钥密�的路径（如果还没有设置）：\n"
 "  [file://]<文件路径> [<密�>]\n"
 "请注�，nmcli �支�将�有密钥指定为原始比特�（blob）数�。\n"
 "示例：/home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4751
-#: ../clients/common/nm-secret-agent-simple.c:280
-#: ../clients/common/nm-secret-agent-simple.c:368
-#: ../clients/tui/nmt-page-dsl.c:65 ../clients/tui/nmt-page-wifi.c:331
+#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-secret-agent-simple.c:268
+#: ../clients/common/nm-secret-agent-simple.c:356
+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
 msgid "Username"
 msgstr "用户�"
 
-#: ../clients/common/nm-meta-setting-desc.c:4757
-#: ../clients/common/nm-meta-setting-desc.c:4972
-#: ../clients/common/nm-meta-setting-desc.c:5365
-#: ../clients/common/nm-meta-setting-desc.c:6286
+#: ../clients/common/nm-meta-setting-desc.c:4775
+#: ../clients/common/nm-meta-setting-desc.c:4990
+#: ../clients/common/nm-meta-setting-desc.c:5385
+#: ../clients/common/nm-meta-setting-desc.c:6328
 msgid "Password [none]"
 msgstr "密� [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4803
+#: ../clients/common/nm-meta-setting-desc.c:4821
 msgid "Bluetooth device address"
 msgstr "�牙设备地�"
 
-#: ../clients/common/nm-meta-setting-desc.c:4851
-#: ../clients/common/nm-meta-setting-desc.c:5418
-#: ../clients/common/nm-meta-setting-desc.c:6982
-#: ../clients/common/nm-meta-setting-desc.c:7020
-#: ../clients/common/nm-meta-setting-desc.c:7202
-#: ../clients/common/nm-meta-setting-desc.c:7432
+#: ../clients/common/nm-meta-setting-desc.c:4869
+#: ../clients/common/nm-meta-setting-desc.c:5438
+#: ../clients/common/nm-meta-setting-desc.c:7024
+#: ../clients/common/nm-meta-setting-desc.c:7062
+#: ../clients/common/nm-meta-setting-desc.c:7244
+#: ../clients/common/nm-meta-setting-desc.c:7474
 msgid "MAC [none]"
 msgstr "MAC [æ— ]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4857
+#: ../clients/common/nm-meta-setting-desc.c:4875
 msgid "Enable STP [no]"
 msgstr "�用 STP [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4863
+#: ../clients/common/nm-meta-setting-desc.c:4881
 msgid "STP priority [32768]"
 msgstr "STP 优先级 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4869
+#: ../clients/common/nm-meta-setting-desc.c:4887
 msgid "Forward delay [15]"
 msgstr "转�延时 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4875
+#: ../clients/common/nm-meta-setting-desc.c:4893
 msgid "Hello time [2]"
 msgstr "呼�时间 [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4881
+#: ../clients/common/nm-meta-setting-desc.c:4899
 msgid "Max age [20]"
 msgstr "最大寿命 [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4905
 msgid "MAC address ageing time [300]"
 msgstr "MAC 地��化时间 [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:4911
 msgid "Group forward mask [0]"
 msgstr "组��掩� [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4917
 msgid "Enable IGMP snooping [no]"
 msgstr "�用 IGMP 监� [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4928
+#: ../clients/common/nm-meta-setting-desc.c:4946
 msgid "Bridge port priority [32]"
 msgstr "网桥端�优先级 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4934
+#: ../clients/common/nm-meta-setting-desc.c:4952
 msgid "Bridge port STP path cost [100]"
 msgstr "网桥端� STP 路径开销 [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4940
+#: ../clients/common/nm-meta-setting-desc.c:4958
 msgid "Hairpin [no]"
 msgstr "Hairpin [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4966
-#: ../clients/common/nm-meta-setting-desc.c:5359
-#: ../clients/common/nm-meta-setting-desc.c:6840
+#: ../clients/common/nm-meta-setting-desc.c:4984
+#: ../clients/common/nm-meta-setting-desc.c:5379
+#: ../clients/common/nm-meta-setting-desc.c:6882
 msgid "Username [none]"
 msgstr "用户� [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5069
+#: ../clients/common/nm-meta-setting-desc.c:5086
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: alice bob charlie\n"
-msgstr ""
-"输入用户��列表。这个列表的用户�格�为：\n"
+msgstr "输入用户��列表。这个列表的用户�格�为：\n"
 "  [user:]<用户� 1>, [user:]<用户� 2>,... \n"
 "使用逗�或者空格将�称分开。\n"
 "\n"
 "例如：alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5121
+#: ../clients/common/nm-meta-setting-desc.c:5138
 msgid ""
-"Enter secondary connections that should be activated when this connection is\n"
+"Enter secondary connections that should be activated when this connection "
+"is\n"
 "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
 "transparently translates names to UUIDs. Note that NetworkManager only "
 "supports\n"
@@ -4977,46 +5031,44 @@ msgid ""
 "The items can be separated by commas or spaces.\n"
 "\n"
 "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
-msgstr ""
-"输入当这个连接激活时应该被激活的次级连接。连接�用 UUID 或 ID（�称）指定。nmcli\n"
+msgstr "输入当这个连接激活时应该被激活的次级连接。连接�用 UUID 或 ID（�称）指定。nmcli\n"
 "自动将�称地转�为 UUID。请注�，目�网络管�器（NetworkManager）�支�将 VPN 作为次级连接。\n"
 "这些输入项�用逗�或空格隔开。\n"
 "\n"
 "示例：private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5144
+#: ../clients/common/nm-meta-setting-desc.c:5161
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
 "'true','yes','on' to set the connection as metered\n"
 "'false','no','off' to set the connection as not metered\n"
 "'unknown' to let NetworkManager choose a value using some heuristics\n"
-msgstr ""
-"输入的值表示连接是�有数����使用�本或其他�制。\n"
+msgstr "输入的值表示连接是�有数����使用�本或其他�制。\n"
 "�接�的选项是：\n"
 "\"true\"�\"yes\"�\"on\"，设置连接为计算��的\n"
 "\"false\"�\"no\"�\"off\"，设置连接为�计��的\n"
 "\"unknown\"，让网络管�器（NetworkManager）使用一些���算法�选择值\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5375
+#: ../clients/common/nm-meta-setting-desc.c:5395
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5427
-#: ../clients/common/nm-meta-setting-desc.c:7051
-#: ../clients/common/nm-meta-setting-desc.c:7242
+#: ../clients/common/nm-meta-setting-desc.c:5447
+#: ../clients/common/nm-meta-setting-desc.c:7093
+#: ../clients/common/nm-meta-setting-desc.c:7284
 msgid "MTU [auto]"
 msgstr "MTU [自动]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5446
+#: ../clients/common/nm-meta-setting-desc.c:5466
 msgid "P_KEY [none]"
 msgstr "P_KEY [æ— ]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5455
+#: ../clients/common/nm-meta-setting-desc.c:5475
 msgid "Parent interface [none]"
 msgstr "上级接� [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5482
+#: ../clients/common/nm-meta-setting-desc.c:5502
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -5025,29 +5077,28 @@ msgstr "输入 DNS �务器的 IPv4 地�列表。\n"
 "\n"
 "示例：8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5530
+#: ../clients/common/nm-meta-setting-desc.c:5550
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 地�（IP[/plen]）[无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5532
+#: ../clients/common/nm-meta-setting-desc.c:5552
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 32.\n"
 "\n"
 "Example: 192.168.1.5/24, 10.0.0.11/24\n"
-msgstr ""
-"输入 IPv4 地�列表，格�为：\n"
+msgstr "输入 IPv4 地�列表，格�为：\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "缺少�缀则默认为 32。\n"
 "\n"
 "示例：192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5551
+#: ../clients/common/nm-meta-setting-desc.c:5571
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 网关 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5559
+#: ../clients/common/nm-meta-setting-desc.c:5579
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5058,8 +5109,7 @@ msgid ""
 "\n"
 "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "          10.1.2.0/24\n"
-msgstr ""
-"输入 IPv4 路由列表，格�为：\n"
+msgstr "输入 IPv4 路由列表，格�为：\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
 "缺少�缀则默认为 32。\n"
 "缺少 next-hop 则默认为 0.0.0.0。\n"
@@ -5068,17 +5118,16 @@ 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:5599
+#: ../clients/common/nm-meta-setting-desc.c:5619
 msgid ""
 "Enter a list of IPv4 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
-msgstr ""
-"使用以下格�输入一组 IPv4 路由规则：\n"
+msgstr "使用以下格�输入一组 IPv4 路由规则：\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5690
+#: ../clients/common/nm-meta-setting-desc.c:5721
 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 "
@@ -5088,36 +5137,32 @@ msgid ""
 "DNS servers for this connection.\n"
 "\n"
 "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
-msgstr ""
-"输入 DNS �务器的 IPv6 地�列表。如果 IPv6 �置方法为 \"auto\"，这些 DNS "
-"�务器将附加到哪些自动�置返回的地�中（如果有）。DNS �务器�能使用 \"shared\" 或者 \"link-local\" IPv6 "
-"�置方法，因为它们�是上游网络。在所有其他 IPv6 �置方法中，这些 DNS �务器�作为这个连接的唯一 DNS �务器。\n"
+msgstr "输入 DNS �务器的 IPv6 地�列表。如果 IPv6 �置方法为 \"auto\"，这些 DNS �务器将附加到哪些自动�置返回的地�中（如果有）。DNS �务器�能使用 \"shared\" 或者 \"link-local\" IPv6 �置方法，因为它们�是上游网络。在所有其他 IPv6 �置方法中，这些 DNS �务器�作为这个连接的唯一 DNS �务器。\n"
 "\n"
 "示例：2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5744
+#: ../clients/common/nm-meta-setting-desc.c:5775
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 地�（IP[/plen]）[无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5746
+#: ../clients/common/nm-meta-setting-desc.c:5777
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 128.\n"
 "\n"
 "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
-msgstr ""
-"输入 IPv6 地�列表，格�为：\n"
+msgstr "输入 IPv6 地�列表，格�为：\n"
 "  ip[/prefix], ip[/prefix],...\n"
 "缺少�缀则默认为 128。\n"
 "\n"
 "示例：2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5765
+#: ../clients/common/nm-meta-setting-desc.c:5796
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 网关 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5773
+#: ../clients/common/nm-meta-setting-desc.c:5804
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5129,187 +5174,184 @@ msgid ""
 "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
 "          abbe::/64 55\n"
-msgstr ""
-"输入 IPv6 路由列表，格�为：\n"
+msgstr "输入 IPv6 路由列表，格�为：\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
 "缺少�缀则默认为 128。\n"
 "缺少 next-hop 则默认为 \"::\"。\n"
 "缺少跃点数则使用默认值（NM/kernel 将设置默认值）。\n"
 "\n"
-"示例：2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef:"
-":3 2\n"
+"示例：2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
 "      abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5813
+#: ../clients/common/nm-meta-setting-desc.c:5844
 msgid ""
 "Enter a list of IPv6 routing rules formatted as:\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
-msgstr ""
-"使用以下格�输入一组 IPv6 路由规则：\n"
+msgstr "使用以下格�输入一组 IPv6 路由规则：\n"
 "  priority [prio] [from [src]] [to [dst]], ,...\n"
 "\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5901
-#: ../clients/common/nm-meta-setting-desc.c:6881
+#: ../clients/common/nm-meta-setting-desc.c:5943
+#: ../clients/common/nm-meta-setting-desc.c:6923
 msgid "Parent device [none]"
 msgstr "上级设备 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5907
+#: ../clients/common/nm-meta-setting-desc.c:5949
 msgid "Local endpoint [none]"
 msgstr "本地端点 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5914
-#: ../clients/common/nm-meta-setting-desc.c:6901
+#: ../clients/common/nm-meta-setting-desc.c:5956
+#: ../clients/common/nm-meta-setting-desc.c:6943
 msgid "Remote"
 msgstr "远程"
 
-#: ../clients/common/nm-meta-setting-desc.c:5959
+#: ../clients/common/nm-meta-setting-desc.c:6001
 msgid "MACsec parent device or connection UUID"
 msgstr "MACsec 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:5980
+#: ../clients/common/nm-meta-setting-desc.c:6022
 msgid "Enable encryption [yes]"
 msgstr "�用加密 [是]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5986
-#: ../clients/common/nm-secret-agent-simple.c:929
+#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:5996
+#: ../clients/common/nm-meta-setting-desc.c:6038
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6002
+#: ../clients/common/nm-meta-setting-desc.c:6044
 msgid "SCI port [1]"
 msgstr "SCI 端� [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6070
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6049
+#: ../clients/common/nm-meta-setting-desc.c:6091
 msgid "Tap [no]"
 msgstr "Tap [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6084
-#: ../clients/common/nm-meta-setting-desc.c:7156
-#: ../clients/tui/nmt-page-wifi.c:223
+#: ../clients/common/nm-meta-setting-desc.c:6126
+#: ../clients/common/nm-meta-setting-desc.c:7198
+#: ../clients/tui/nmt-page-wifi.c:212
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6093
+#: ../clients/common/nm-meta-setting-desc.c:6135
 msgid "OLPC Mesh channel [1]"
 msgstr "OLPC Mesh 信� [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6102
+#: ../clients/common/nm-meta-setting-desc.c:6144
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP 任�广播 MAC 地� [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6267
+#: ../clients/common/nm-meta-setting-desc.c:6309
 msgid "PPPoE parent device"
 msgstr "PPPoE 上级设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:6273
+#: ../clients/common/nm-meta-setting-desc.c:6315
 msgid "Service [none]"
 msgstr "�务 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6280
+#: ../clients/common/nm-meta-setting-desc.c:6322
 msgid "PPPoE username"
 msgstr "PPPoE 用户�"
 
-#: ../clients/common/nm-meta-setting-desc.c:6316
+#: ../clients/common/nm-meta-setting-desc.c:6358
 msgid "Browser only [no]"
 msgstr "仅�览器 [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6322
+#: ../clients/common/nm-meta-setting-desc.c:6364
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:6370
 msgid "PAC script"
 msgstr "PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:6452
-#: ../clients/common/nm-meta-setting-desc.c:6640
+#: ../clients/common/nm-meta-setting-desc.c:6494
+#: ../clients/common/nm-meta-setting-desc.c:6682
 msgid "Team JSON configuration [none]"
 msgstr "组� JSON �置 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6743
+#: ../clients/common/nm-meta-setting-desc.c:6785
 msgid "User ID [none]"
 msgstr "用户 ID [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6749
+#: ../clients/common/nm-meta-setting-desc.c:6791
 msgid "Group ID [none]"
 msgstr "分组 ID [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6755
+#: ../clients/common/nm-meta-setting-desc.c:6797
 msgid "Enable PI [no]"
 msgstr "�用 PI [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6761
+#: ../clients/common/nm-meta-setting-desc.c:6803
 msgid "Enable VNET header [no]"
 msgstr "�用 VNET 首部 [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6767
+#: ../clients/common/nm-meta-setting-desc.c:6809
 msgid "Enable multi queue [no]"
 msgstr "�用多队列 [�]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6780
+#: ../clients/common/nm-meta-setting-desc.c:6822
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6787
+#: ../clients/common/nm-meta-setting-desc.c:6829
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID <0-4095>"
 
-#: ../clients/common/nm-meta-setting-desc.c:6793
+#: ../clients/common/nm-meta-setting-desc.c:6835
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN 标记（<0-7>）[无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6802
+#: ../clients/common/nm-meta-setting-desc.c:6844
 msgid "Ingress priority maps [none]"
 msgstr "入�优先级映射 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6812
+#: ../clients/common/nm-meta-setting-desc.c:6854
 msgid "Egress priority maps [none]"
 msgstr "出�优先级映射 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6888
+#: ../clients/common/nm-meta-setting-desc.c:6930
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6894
+#: ../clients/common/nm-meta-setting-desc.c:6936
 msgid "Local address [none]"
 msgstr "本地地� [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6907
+#: ../clients/common/nm-meta-setting-desc.c:6949
 msgid "Minimum source port [0]"
 msgstr "最���端� [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6913
+#: ../clients/common/nm-meta-setting-desc.c:6955
 msgid "Maximum source port [0]"
 msgstr "最大��端� [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6919
+#: ../clients/common/nm-meta-setting-desc.c:6961
 msgid "Destination port [8472]"
 msgstr "目标端� [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6959
+#: ../clients/common/nm-meta-setting-desc.c:7001
 msgid "Peer"
 msgstr "�等"
 
-#: ../clients/common/nm-meta-setting-desc.c:6989
+#: ../clients/common/nm-meta-setting-desc.c:7031
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP �称"
 
-#: ../clients/common/nm-meta-setting-desc.c:7026
-#: ../clients/common/nm-meta-setting-desc.c:7207
+#: ../clients/common/nm-meta-setting-desc.c:7068
+#: ../clients/common/nm-meta-setting-desc.c:7249
 msgid "Cloned MAC [none]"
 msgstr "克隆的 MAC 地� [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7059
+#: ../clients/common/nm-meta-setting-desc.c:7101
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5318,428 +5360,412 @@ msgstr "输入�通�列表（用逗�或者空格分开）。\n"
 "\n"
 "示例：0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7381
+#: ../clients/common/nm-meta-setting-desc.c:7423
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr "输入 WEP 密钥类型。�接�的值为：0 或者 unknown�1 或者 key, 以� 2 或者 passphrase。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7440
+#: ../clients/common/nm-meta-setting-desc.c:7482
 msgid "Short address (<0x0000-0xffff>)"
 msgstr "短地�（<0x0000-0xffff>）"
 
-#: ../clients/common/nm-meta-setting-desc.c:7456
+#: ../clients/common/nm-meta-setting-desc.c:7498
 msgid "PAN Identifier (<0x0000-0xffff>)"
 msgstr "PAN 标识符（<0x0000-0xffff>）"
 
-#: ../clients/common/nm-meta-setting-desc.c:7471
+#: ../clients/common/nm-meta-setting-desc.c:7513
 msgid "Page (<default|0-31>)"
 msgstr "页 (<default|0-31>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:7485
+#: ../clients/common/nm-meta-setting-desc.c:7527
 msgid "Channel (<default|0-26>)"
 msgstr "频� (<default|0-26>)"
 
 #. ***************************************************************************
-#: ../clients/common/nm-meta-setting-desc.c:7620
+#: ../clients/common/nm-meta-setting-desc.c:7662
 msgid "6LOWPAN settings"
 msgstr "6LOWPAN 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7621
+#: ../clients/common/nm-meta-setting-desc.c:7663
 msgid "802-1x settings"
 msgstr "802-1x 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7622
-#: ../src/devices/adsl/nm-device-adsl.c:131
+#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7623
+#: ../clients/common/nm-meta-setting-desc.c:7665
 msgid "bluetooth connection"
 msgstr "�牙连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7624
+#: ../clients/common/nm-meta-setting-desc.c:7666
 msgid "Bond device"
 msgstr "绑定设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7625
+#: ../clients/common/nm-meta-setting-desc.c:7667
 msgid "Bridge device"
 msgstr "网桥设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7626
+#: ../clients/common/nm-meta-setting-desc.c:7668
 msgid "Bridge port"
 msgstr "网桥端�"
 
-#: ../clients/common/nm-meta-setting-desc.c:7627
+#: ../clients/common/nm-meta-setting-desc.c:7669
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA 移动宽带连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7628
+#: ../clients/common/nm-meta-setting-desc.c:7670
 msgid "General settings"
 msgstr "常规设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7629
+#: ../clients/common/nm-meta-setting-desc.c:7671
 msgid "DCB settings"
 msgstr "DCB 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7630
+#: ../clients/common/nm-meta-setting-desc.c:7672
 msgid "Dummy settings"
 msgstr "虚拟设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7631
+#: ../clients/common/nm-meta-setting-desc.c:7673
 msgid "Ethtool settings"
 msgstr "Ethtool 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7632
+#: ../clients/common/nm-meta-setting-desc.c:7674
 msgid "Generic settings"
 msgstr "通用设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7633
+#: ../clients/common/nm-meta-setting-desc.c:7675
 msgid "GSM mobile broadband connection"
 msgstr "GSM 移动宽带连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7634
-#: ../src/devices/nm-device-infiniband.c:175
+#: ../clients/common/nm-meta-setting-desc.c:7676
+#: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "InfiniBand 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7635
+#: ../clients/common/nm-meta-setting-desc.c:7677
 msgid "IPv4 protocol"
 msgstr "IPv4 �议"
 
-#: ../clients/common/nm-meta-setting-desc.c:7636
+#: ../clients/common/nm-meta-setting-desc.c:7678
 msgid "IPv6 protocol"
 msgstr "IPv6 �议"
 
-#: ../clients/common/nm-meta-setting-desc.c:7637
+#: ../clients/common/nm-meta-setting-desc.c:7679
 msgid "IP-tunnel settings"
 msgstr "IP 隧�设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7638
+#: ../clients/common/nm-meta-setting-desc.c:7680
 msgid "MACsec connection"
 msgstr "MACsec 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7639
+#: ../clients/common/nm-meta-setting-desc.c:7681
 msgid "macvlan connection"
 msgstr "macvlan 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7640
+#: ../clients/common/nm-meta-setting-desc.c:7682
 msgid "Match"
 msgstr "匹�"
 
-#: ../clients/common/nm-meta-setting-desc.c:7641
+#: ../clients/common/nm-meta-setting-desc.c:7683
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7642
+#: ../clients/common/nm-meta-setting-desc.c:7684
 msgid "Open vSwitch bridge settings"
 msgstr "Open vSwitch 网桥设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7643
+#: ../clients/common/nm-meta-setting-desc.c:7685
 msgid "Open vSwitch DPDK interface settings"
 msgstr "Open vSwitch DPDK 接�设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7644
+#: ../clients/common/nm-meta-setting-desc.c:7686
 msgid "Open vSwitch interface settings"
 msgstr "Open vSwitch 接�设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7645
+#: ../clients/common/nm-meta-setting-desc.c:7687
 msgid "Open vSwitch patch interface settings"
 msgstr "Open vSwitch �线接�设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7646
+#: ../clients/common/nm-meta-setting-desc.c:7688
 msgid "Open vSwitch port settings"
 msgstr "Open vSwitch 端�设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7647
+#: ../clients/common/nm-meta-setting-desc.c:7689
 msgid "PPP settings"
 msgstr "PPP 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7648
+#: ../clients/common/nm-meta-setting-desc.c:7690
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7649
+#: ../clients/common/nm-meta-setting-desc.c:7691
 msgid "Proxy"
 msgstr "代�"
 
-#: ../clients/common/nm-meta-setting-desc.c:7650
+#: ../clients/common/nm-meta-setting-desc.c:7692
 msgid "Serial settings"
 msgstr "串行设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7651
+#: ../clients/common/nm-meta-setting-desc.c:7693
 msgid "SR-IOV settings"
 msgstr "SR-IOV 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7652
+#: ../clients/common/nm-meta-setting-desc.c:7694
 msgid "Traffic controls"
 msgstr "��控制"
 
-#: ../clients/common/nm-meta-setting-desc.c:7653
+#: ../clients/common/nm-meta-setting-desc.c:7695
 msgid "Team device"
 msgstr "组�设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7654
+#: ../clients/common/nm-meta-setting-desc.c:7696
 msgid "Team port"
 msgstr "组�端�"
 
-#: ../clients/common/nm-meta-setting-desc.c:7655
+#: ../clients/common/nm-meta-setting-desc.c:7697
 msgid "Tun device"
 msgstr "Tun 设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7656
+#: ../clients/common/nm-meta-setting-desc.c:7698
 msgid "User settings"
 msgstr "用户设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7657
-#: ../src/devices/nm-device-vlan.c:399
+#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "VLAN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7658 ../src/nm-manager.c:5568
+#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5652
 msgid "VPN connection"
 msgstr "VPN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7659
-#: ../src/devices/nm-device-vxlan.c:368
+#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "VXLAN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7660
+#: ../clients/common/nm-meta-setting-desc.c:7702
 msgid "Wi-Fi P2P connection"
 msgstr "Wi-Fi P2P 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7661
+#: ../clients/common/nm-meta-setting-desc.c:7703
 msgid "WiMAX connection"
 msgstr "WiMAX 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7662
+#: ../clients/common/nm-meta-setting-desc.c:7704
 msgid "Wired Ethernet"
 msgstr "有线以太网"
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7705
 msgid "WireGuard VPN settings"
 msgstr "WireGuard VPN 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../clients/common/nm-meta-setting-desc.c:7706
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7665
+#: ../clients/common/nm-meta-setting-desc.c:7707
 msgid "Wi-Fi security settings"
 msgstr "Wi-Fi 安全设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7666
+#: ../clients/common/nm-meta-setting-desc.c:7708
 msgid "WPAN settings"
 msgstr "WPAN 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:8031
+#: ../clients/common/nm-meta-setting-desc.c:8074
 msgid "name"
 msgstr "�称"
 
-#: ../clients/common/nm-polkit-listener.c:237
+#: ../clients/common/nm-polkit-listener.c:225
 msgid "An authentication session is already underway."
 msgstr "验�会�已在进行。"
 
-#: ../clients/common/nm-secret-agent-simple.c:229
+#: ../clients/common/nm-secret-agent-simple.c:217
 #, c-format
 msgid "Preshared-key for %s"
 msgstr "%s 的预共享密钥"
 
-#: ../clients/common/nm-secret-agent-simple.c:285
-#: ../clients/common/nm-secret-agent-simple.c:322
-#: ../clients/common/nm-secret-agent-simple.c:345
-#: ../clients/common/nm-secret-agent-simple.c:378
-#: ../clients/common/nm-secret-agent-simple.c:915
-#: ../clients/common/nm-secret-agent-simple.c:950
-#: ../clients/common/nm-secret-agent-simple.c:973
-#: ../clients/common/nm-vpn-helpers.c:122
-#: ../clients/common/nm-vpn-helpers.c:126
-#: ../clients/common/nm-vpn-helpers.c:132
-#: ../clients/common/nm-vpn-helpers.c:137 ../clients/tui/nmt-page-dsl.c:74
-#: ../clients/tui/nmt-page-wifi.c:276 ../clients/tui/nmt-page-wifi.c:307
-#: ../clients/tui/nmt-page-wifi.c:340
-msgid "Password"
-msgstr "密�"
-
-#: ../clients/common/nm-secret-agent-simple.c:294
+#: ../clients/common/nm-secret-agent-simple.c:282
 msgid "Identity"
 msgstr "身份"
 
-#: ../clients/common/nm-secret-agent-simple.c:299
+#: ../clients/common/nm-secret-agent-simple.c:287
 msgid "Private key password"
 msgstr "�钥密�"
 
-#: ../clients/common/nm-secret-agent-simple.c:335
-#: ../clients/tui/nmt-page-wifi.c:288
+#: ../clients/common/nm-secret-agent-simple.c:323
+#: ../clients/tui/nmt-page-wifi.c:278
 msgid "Key"
 msgstr "密钥"
 
-#: ../clients/common/nm-secret-agent-simple.c:373
-#: ../clients/tui/nmt-page-dsl.c:77
+#: ../clients/common/nm-secret-agent-simple.c:361
+#: ../clients/tui/nmt-page-dsl.c:65
 msgid "Service"
 msgstr "�务"
 
-#: ../clients/common/nm-secret-agent-simple.c:485
+#: ../clients/common/nm-secret-agent-simple.c:473
 msgid "WireGuard private-key"
 msgstr "WireGuard �钥"
 
-#: ../clients/common/nm-secret-agent-simple.c:526
+#: ../clients/common/nm-secret-agent-simple.c:514
 #, c-format
 msgid "Secrets are required to connect WireGuard VPN '%s'"
 msgstr "连接到 WireGuard VPN '%s' 所需�的 secret"
 
-#: ../clients/common/nm-secret-agent-simple.c:627
-#: ../clients/common/nm-secret-agent-simple.c:911
-#: ../clients/common/nm-secret-agent-simple.c:946
-#: ../clients/common/nm-secret-agent-simple.c:969
-#: ../clients/common/nm-secret-agent-simple.c:988
+#: ../clients/common/nm-secret-agent-simple.c:615
+#: ../clients/common/nm-secret-agent-simple.c:899
+#: ../clients/common/nm-secret-agent-simple.c:934
+#: ../clients/common/nm-secret-agent-simple.c:957
+#: ../clients/common/nm-secret-agent-simple.c:976
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "需�密��连接到 \"%s\"。"
 
-#: ../clients/common/nm-secret-agent-simple.c:878
+#: ../clients/common/nm-secret-agent-simple.c:866
 msgid "Authentication required by wireless network"
 msgstr "无线网络�求身份验�"
 
-#: ../clients/common/nm-secret-agent-simple.c:879
+#: ../clients/common/nm-secret-agent-simple.c:867
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr "需�密�或密钥�访问无线网络 \"%s\"。"
 
-#: ../clients/common/nm-secret-agent-simple.c:884
+#: ../clients/common/nm-secret-agent-simple.c:872
 msgid "Wired 802.1X authentication"
 msgstr "有线 802.1X 身份验�"
 
-#: ../clients/common/nm-secret-agent-simple.c:885
+#: ../clients/common/nm-secret-agent-simple.c:873
 #, c-format
 msgid "Secrets are required to access the wired network '%s'"
 msgstr "需�密钥�访问有线网络 \"%s\"。"
 
-#: ../clients/common/nm-secret-agent-simple.c:891
+#: ../clients/common/nm-secret-agent-simple.c:879
 msgid "DSL authentication"
 msgstr "DSL 身份验�"
 
-#: ../clients/common/nm-secret-agent-simple.c:892
+#: ../clients/common/nm-secret-agent-simple.c:880
 #, c-format
 msgid "Secrets are required for the DSL connection '%s'"
 msgstr "DSL 连接 \"%s\" 需�密钥。"
 
-#: ../clients/common/nm-secret-agent-simple.c:901
+#: ../clients/common/nm-secret-agent-simple.c:889
 msgid "PIN code required"
 msgstr "需� PIN �"
 
-#: ../clients/common/nm-secret-agent-simple.c:902
+#: ../clients/common/nm-secret-agent-simple.c:890
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需� PIN �"
 
-#: ../clients/common/nm-secret-agent-simple.c:905
+#: ../clients/common/nm-secret-agent-simple.c:893
 msgid "PIN"
 msgstr "PIN"
 
-#: ../clients/common/nm-secret-agent-simple.c:910
-#: ../clients/common/nm-secret-agent-simple.c:945
-#: ../clients/common/nm-secret-agent-simple.c:968
+#: ../clients/common/nm-secret-agent-simple.c:898
+#: ../clients/common/nm-secret-agent-simple.c:933
+#: ../clients/common/nm-secret-agent-simple.c:956
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密�"
 
-#: ../clients/common/nm-secret-agent-simple.c:923
+#: ../clients/common/nm-secret-agent-simple.c:911
 #, c-format
 msgid "Secrets are required to access the MACsec network '%s'"
 msgstr "需�密钥�访问 MACsec 网络 \"%s\"。"
 
-#: ../clients/common/nm-secret-agent-simple.c:927
+#: ../clients/common/nm-secret-agent-simple.c:915
 msgid "MACsec PSK authentication"
 msgstr "MACsec PSK 身份验�"
 
-#: ../clients/common/nm-secret-agent-simple.c:934
+#: ../clients/common/nm-secret-agent-simple.c:922
 msgid "MACsec EAP authentication"
 msgstr "MACsec EAP 身份验�"
 
-#: ../clients/common/nm-secret-agent-simple.c:939
+#: ../clients/common/nm-secret-agent-simple.c:927
 msgid "WireGuard VPN secret"
 msgstr "WireGuard VPN secret"
 
-#: ../clients/common/nm-secret-agent-simple.c:978
+#: ../clients/common/nm-secret-agent-simple.c:966
 msgid "VPN password required"
 msgstr "需� VPN 密�"
 
-#: ../clients/common/nm-vpn-helpers.c:51
+#: ../clients/common/nm-vpn-helpers.c:39
 #, c-format
 msgid "unknown VPN plugin \"%s\""
 msgstr "未知的 VPN �件 \"%s\""
 
-#: ../clients/common/nm-vpn-helpers.c:62
+#: ../clients/common/nm-vpn-helpers.c:50
 #, c-format
 msgid "cannot load legacy-only VPN plugin \"%s\" for \"%s\""
 msgstr "无法为 \"%s%s\" 加载旧版�定的 VPN �件 \"\""
 
-#: ../clients/common/nm-vpn-helpers.c:67
+#: ../clients/common/nm-vpn-helpers.c:55
 #, c-format
 msgid ""
 "cannot load VPN plugin \"%s\" due to missing \"%s\". Missing client plugin?"
 msgstr "由于缺少 \"%s%s\"，无法加载 VPN �件 \"\"。缺少客户端�件？"
 
-#: ../clients/common/nm-vpn-helpers.c:72
+#: ../clients/common/nm-vpn-helpers.c:60
 #, c-format
 msgid "failed to load VPN plugin \"%s\": %s"
 msgstr "加载 VPN �件 \"%s\" 失败：%s"
 
-#: ../clients/common/nm-vpn-helpers.c:127
+#: ../clients/common/nm-vpn-helpers.c:115
 msgid "Certificate password"
 msgstr "�书密�"
 
-#: ../clients/common/nm-vpn-helpers.c:128
+#: ../clients/common/nm-vpn-helpers.c:116
 msgid "HTTP proxy password"
 msgstr "HTTP 代�密�"
 
-#: ../clients/common/nm-vpn-helpers.c:133
-#: ../clients/common/nm-vpn-helpers.c:138
+#: ../clients/common/nm-vpn-helpers.c:121
+#: ../clients/common/nm-vpn-helpers.c:126
 msgid "Group password"
 msgstr "组密�"
 
-#: ../clients/common/nm-vpn-helpers.c:142 ../clients/tui/nmt-page-ip4.c:142
-#: ../clients/tui/nmt-page-ip6.c:143
+#: ../clients/common/nm-vpn-helpers.c:130 ../clients/tui/nmt-page-ip4.c:130
+#: ../clients/tui/nmt-page-ip6.c:131
 msgid "Gateway"
 msgstr "网关"
 
-#: ../clients/common/nm-vpn-helpers.c:143
+#: ../clients/common/nm-vpn-helpers.c:131
 msgid "Cookie"
 msgstr "Cookie"
 
-#: ../clients/common/nm-vpn-helpers.c:144
+#: ../clients/common/nm-vpn-helpers.c:132
 msgid "Gateway certificate hash"
 msgstr "网关�书散列"
 
-#: ../clients/common/nm-vpn-helpers.c:269
+#: ../clients/common/nm-vpn-helpers.c:257
 #, c-format
 msgid "Invalid peer starting at %s:%zu: %s"
 msgstr "于 %s:%zu: %s �动的无效 peer"
 
-#: ../clients/common/nm-vpn-helpers.c:389
+#: ../clients/common/nm-vpn-helpers.c:377
 msgid ""
-"The WireGuard config file must be a valid interface name followed by \"."
-"conf\""
+"The WireGuard config file must be a valid interface name followed by \".conf"
+"\""
 msgstr "WireGuard �置文件需�是一个有效的接���加上 \".conf\""
 
-#: ../clients/common/nm-vpn-helpers.c:677
+#: ../clients/common/nm-vpn-helpers.c:666
 #, c-format
 msgid "unrecognized line at %s:%zu"
 msgstr "无法识别的行 %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:682
+#: ../clients/common/nm-vpn-helpers.c:671
 #, c-format
 msgid "invalid value for '%s' at %s:%zu"
 msgstr "无效的值 '%s' 于 %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:687
+#: ../clients/common/nm-vpn-helpers.c:676
 #, c-format
 msgid "invalid secret '%s' at %s:%zu"
 msgstr "无效的 secret '%s' 于 %s:%zu"
 
-#: ../clients/common/nm-vpn-helpers.c:800
+#: ../clients/common/nm-vpn-helpers.c:789
 #, c-format
 msgid "Failed to create WireGuard connection: %s"
 msgstr "创建 WireGuard 连接失败 : %s"
@@ -5768,16 +5794,13 @@ msgstr "�加入的 mesh 网络的 SSID。"
 
 #: ../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 the specific band, i.e. if \"a\" is specified, the device will not "
-"associate with the same network in the 2.4GHz band even if the network's "
-"settings are compatible.  This setting depends on specific driver capability "
-"and may not work with all drivers."
-msgstr ""
-"网络的 802.11 频段。一个 \"a\" 代表 5GHz 802.11a 或 \"bg\" 代表 2.4GHz 802.11。这将�定关�的 Wi-"
-"Fi 网络到特定的频段，比如指定了 \"a\"，设备就�会关�在 2.4GHz "
-"内的相�网络，�管网络设置是�兼容。此设置�决于具体驱动的功能，且�能�是全部的驱动都有效。"
+"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 "
+"the specific band, i.e. if \"a\" is specified, the device will not associate "
+"with the same network in the 2.4GHz band even if the network's settings are "
+"compatible.  This setting depends on specific driver capability and may not "
+"work with all drivers."
+msgstr "网络的 802.11 频段。一个 \"a\" 代表 5GHz 802.11a 或 \"bg\" 代表 2.4GHz 802.11。这将�定关�的 Wi-Fi 网络到特定的频段，比如指定了 \"a\"，设备就�会关�在 2.4GHz 内的相�网络，�管网络设置是�兼容。此设置�决于具体驱动的功能，且�能�是全部的驱动都有效。"
 
 #: ../clients/common/settings-docs.h.in:8
 msgid ""
@@ -5785,9 +5808,7 @@ msgid ""
 "point.  This capability is highly driver dependent and not supported by all "
 "devices.  Note: this property does not control the BSSID used when creating "
 "an Ad-Hoc network and is unlikely to in the future."
-msgstr ""
-"如果指定了，则指定设备�关�给定的接入点。此功能�赖于驱动，并�所有设备都支�。注�：此属性�会控制创建 Ad-Hoc 网络时使用的 "
-"BSSID，将�也�会。"
+msgstr "如果指定了，则指定设备�关�给定的接入点。此功能�赖于驱动，并�所有设备都支�。注�：此属性�会控制创建 Ad-Hoc 网络时使用的 BSSID，将�也�会。"
 
 #: ../clients/common/settings-docs.h.in:9
 msgid ""
@@ -5795,9 +5816,7 @@ msgid ""
 "(or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  "
 "Because channel numbers overlap between bands, this property also requires "
 "the \"band\" property to be set."
-msgstr ""
-"用于 Wi-Fi 连接的无线信�。设备将�在指定的信�上加入（或创建 Ad-Hoc 网络）Wi-Fi "
-"网络。因为信���在��频段间��，此属性也需�设定 \"band\" 属性。"
+msgstr "用于 Wi-Fi 连接的无线信�。设备将�在指定的信�上加入（或创建 Ad-Hoc 网络）Wi-Fi 网络。因为信���在��频段间��，此属性也需�设定 \"band\" 属性。"
 
 #: ../clients/common/settings-docs.h.in:10
 msgid ""
@@ -5813,16 +5832,10 @@ msgid ""
 "defaults to \"preserve\" (older versions of NetworkManager may use a "
 "different default value). On D-Bus, this field is expressed as \"assigned-"
 "mac-address\" or the deprecated \"cloned-mac-address\"."
-msgstr ""
-"如指定了，则请求该设备使用此 MAC 地��代替。这个�被称为 MAC 克隆或欺骗。除了明确地指定 MAC 地�，也支� "
-"\"preserve\"�\"permanent\"�\"random\" 和 \"stable\" 等特殊值。\"preserve\" 表示激活时�动 "
-"MAC 地�。\"permanent\" 使用设备的永久硬件地�。\"random\" 则在�个连接上创建�机的 MAC 地�。\"stable\" "
-"则根� connection.stable-id 和机器相关密钥创建散列的 MAC 地�。如未指定，该值�被全局默认值覆盖，�� "
-"NetworkManager.conf 的手册。如还未指定，它就默认为 \"permanent\"。在 D-Bus 上, 此字段表示为 "
-"\"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
+msgstr "如指定了，则请求该设备使用此 MAC 地��代替。这个�被称为 MAC 克隆或欺骗。除了明确地指定 MAC 地�，也支� \"preserve\"�\"permanent\"�\"random\" 和 \"stable\" 等特殊值。\"preserve\" 表示激活时�动 MAC 地�。\"permanent\" 使用设备的永久硬件地�。\"random\" 则在�个连接上创建�机的 MAC 地�。\"stable\" 则根� connection.stable-id 和机器相关密钥创建散列的 MAC 地�。如未指定，该值�被全局默认值覆盖，�� NetworkManager.conf 的手册。如还未指定，它就默认为 \"permanent\"。在 D-Bus 上, 此字段表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
 
 #: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:91
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -5840,23 +5853,14 @@ msgid ""
 "address after the mask, this address is used instead of the current MAC "
 "address to fill the bits that shall not be randomized. For example, a value "
 "of \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" will set the OUI of the MAC "
-"address to 68:F7:28, while the lower bits are randomized. A value of \"02:00:"
-"00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled globally-"
-"administered, burned-in MAC address. If the value contains more than one "
-"additional MAC addresses, one of them is chosen randomly. For example, \"02:"
-"00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will create a fully "
-"scrambled MAC address, randomly locally or globally administered."
-msgstr ""
-"\"cloned-mac-address\" 设置为 \"random\" 或 \"stable\" 时，按默认 MAC "
-"地�的所有�都被扰乱，并创建一个本地管�的�播 MAC 地�。 此属性�许指定�些�为固定的。请注�，第一个 MAC "
-"地�的最低有效�始终未被设置以创建�播MAC地�。如果属性为 NULL，它�以被默认的连接设置覆盖。如果该值还是 NULL "
-"或为空字符串，默认值就为创建一个本地管�的�播 MAC 地�。如果该值包�一个 MAC 地�，此地�用作掩�。掩�的设置�将以设备的当� MAC "
-"地�填充，而未设置�将�机化。设为 \"FE:FF:FF:00:00:00\" 表示�留当� MAC 地�的 OUI 且使用 \"random\" 或 "
-"\"stable\" 算法��机最低三�。如果该值在掩��包�一个附加的 MAC 地�，使用此地��代替当�的 MAC "
-"地�去填充那些�应该�机的�。示例，值 \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" 将设定 MAC 地�的 OUI "
-"为  68:F7:28，而更低��机化。值 \"02:00:00:00:00:00 00:00:00:00:00:00\" "
-"将创建完全扰乱的全局管�烧录的 MAC 地�。如果值包�多个附加 MAC 地�，就�机选择其中一个。示例，\"02:00:00:00:00:00 00:"
-"00:00:00:00:00 02:00:00:00:00:00\" 将创建完全扰乱的 MAC 地�，�机地选择本地或全局管�。"
+"address to 68:F7:28, while the lower bits are randomized. A value of "
+"\"02:00:00:00:00:00 00:00:00:00:00:00\" will create a fully scrambled "
+"globally-administered, burned-in MAC address. If the value contains more "
+"than one additional MAC addresses, one of them is chosen randomly. For "
+"example, \"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" will "
+"create a fully scrambled MAC address, randomly locally or globally "
+"administered."
+msgstr "\"cloned-mac-address\" 设置为 \"random\" 或 \"stable\" 时，按默认 MAC 地�的所有�都被扰乱，并创建一个本地管�的�播 MAC 地�。 此属性�许指定�些�为固定的。请注�，第一个 MAC 地�的最低有效�始终未被设置以创建�播MAC地�。如果属性为 NULL，它�以被默认的连接设置覆盖。如果该值还是 NULL 或为空字符串，默认值就为创建一个本地管�的�播 MAC 地�。如果该值包�一个 MAC 地�，此地�用作掩�。掩�的设置�将以设备的当� MAC 地�填充，而未设置�将�机化。设为 \"FE:FF:FF:00:00:00\" 表示�留当� MAC 地�的 OUI 且使用 \"random\" 或 \"stable\" 算法��机最低三�。如果该值在掩��包�一个附加的 MAC 地�，使用此地��代替当�的 MAC 地�去填充那些�应该�机的�。示例，值 \"FE:FF:FF:00:00:00 68:F7:28:00:00:00\" 将设定 MAC 地�的 OUI 为  68:F7:28，而更低��机化。值 \"02:00:00:00:00:00 00:00:00:00:00:00\" 将创建完全扰乱的全局管�烧录的 MAC 地�。如果值包�多个附加 MAC 地�，就�机选择其中一个。示例，\"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00\" 将创建完全扰乱的 MAC 地�，�机地选择本地或全局管�。"
 
 #: ../clients/common/settings-docs.h.in:12
 msgid ""
@@ -5869,12 +5873,7 @@ msgid ""
 "not broadcast its SSID. Note that marking the network as hidden may be a "
 "privacy issue for you (in infrastructure mode) or client stations (in AP "
 "mode), as the explicit probe-scans are distinctly recognizable on the air."
-msgstr ""
-"如果为 TRUE，代表网络是一个��了其 SSID 的�广播网络。这适用于 infrastructure 模�和 AP 模�。对于 "
-"infrastructure 模�，�以使用��的方法�更��地�现��网络，例如探针扫� SSID。然而，这些方法会暴露出��了 SSID "
-"的网络的�安全性，因此在使用��了 SSID 的网络时应谨慎。对于 AP 模�，创建的网络�会广播其 "
-"SSID。请注�，把网络标记为��对于您（infrastructure 模�）或客户端工作站（AP "
-"模�）�能�是一个��问题，因为显�探针扫��以识别它们。"
+msgstr "如果为 TRUE，代表网络是一个��了其 SSID 的�广播网络。这适用于 infrastructure 模�和 AP 模�。对于 infrastructure 模�，�以使用��的方法�更��地�现��网络，例如探针扫� SSID。然而，这些方法会暴露出��了 SSID 的网络的�安全性，因此在使用��了 SSID 的网络时应谨慎。对于 AP 模�，创建的网络�会广播其 SSID。请注�，把网络标记为��对于您（infrastructure 模�）或客户端工作站（AP 模�）�能�是一个��问题，因为显�探针扫��以识别它们。"
 
 #: ../clients/common/settings-docs.h.in:13
 msgid ""
@@ -5888,9 +5887,7 @@ 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-"
 "digits-and-colons notation (eg \"00:11:22:33:44:55\")."
-msgstr ""
-"Wi-Fi 设备的永久 MAC 地�列表，其地�此连接应该从�应用。�个 MAC 地�应给定为标准的�六进制数字和冒�的表示法（比如 \"00:11:"
-"22:33:44:55\"）。"
+msgstr "Wi-Fi 设备的永久 MAC 地�列表，其地�此连接应该从�应用。�个 MAC 地�应给定为标准的�六进制数字和冒�的表示法（比如 \"00:11:22:33:44:55\"）。"
 
 #: ../clients/common/settings-docs.h.in:15
 msgid ""
@@ -5900,22 +5897,16 @@ msgid ""
 "MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize "
 "the MAC address). This property is deprecated for 'cloned-mac-address'. "
 "Deprecated: 1"
-msgstr ""
-"NM_SETTING_MAC_RANDOMIZATION_DEFAULT "
-"(0)（从��机化，除�用户设定了全局默认�机且请求方支��机化）�NM_SETTING_MAC_RANDOMIZATION_NEVER "
-"(1)（从��机化 MAC 地�）或 NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2)（总是�机化 MAC "
-"地�）之一。此属性已为 \"cloned-mac-address\" 所弃用。已弃用：1"
+msgstr "NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0)（从��机化，除�用户设定了全局默认�机且请求方支��机化）�NM_SETTING_MAC_RANDOMIZATION_NEVER (1)（从��机化 MAC 地�）或 NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2)（总是�机化 MAC 地�）之一。此属性已为 \"cloned-mac-address\" 所弃用。已弃用：1"
 
 #: ../clients/common/settings-docs.h.in:16
 msgid ""
-"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\"."
-"  If blank, infrastructure is assumed."
-msgstr ""
-"Wi-Fi 网络模�；\"infrastructure\"�\"mesh\"�\"adhoc\" 或 \"ap\" 之一。如果留空，�定为 "
-"infrastructure。"
+"Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap"
+"\".  If blank, infrastructure is assumed."
+msgstr "Wi-Fi 网络模�；\"infrastructure\"�\"mesh\"�\"adhoc\" 或 \"ap\" 之一。如果留空，�定为 infrastructure。"
 
 #: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
@@ -5928,11 +5919,7 @@ msgid ""
 "saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently "
 "configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the "
 "globally configured value). All other values are reserved."
-msgstr ""
-"NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2)（�用 Wi-Fi 的节能模�）� "
-"NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3)（�用 Wi-Fi 的节能模�）� "
-"NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1)（�改�当��置）或 "
-"NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0)（使用全局�置值）之一。所有其他值都�留。"
+msgstr "NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2)（�用 Wi-Fi 的节能模�）� NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3)（�用 Wi-Fi 的节能模�）� NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1)（�改�当��置）或 NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0)（使用全局�置值）之一。所有其他值都�留。"
 
 #: ../clients/common/settings-docs.h.in:19
 msgid ""
@@ -5940,21 +5927,16 @@ msgid ""
 "communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/"
 "s.  This property is highly driver dependent and not all devices support "
 "setting a static bitrate."
-msgstr ""
-"如果�零，指示设备仅使用指定的比特率与接入点进行通信。��为 Kb/s，示例 5500=5.5 Mbit/"
-"s。此属性�赖于驱动，并�所有设备都支�设置��比特率。"
+msgstr "如果�零，指示设备仅使用指定的比特率与接入点进行通信。��为 Kb/s，示例 5500=5.5 Mbit/s。此属性�赖于驱动，并�所有设备都支�设置��比特率。"
 
 #: ../clients/common/settings-docs.h.in:20
 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 network.  "
-"NetworkManager internally tracks previously seen BSSIDs. The property is "
-"only meant for reading and reflects the BSSID list of NetworkManager. The "
-"changes you make to this property will not be preserved."
-msgstr ""
-"检测为 Wi-Fi 网络一部分的 BSSID 列表（�个 BSSID 格�化为如 \"00:11:22:33:44:55\" 的 MAC "
-"地�）。网络管�器（NetworkManager）会内部追踪先��过的 BSSID。此属性仅用于读�和显示网络管�器的 BSSID "
-"列表。您对此属性所作的更改�会�留。"
+"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 "
+"network.  NetworkManager internally tracks previously seen BSSIDs. The "
+"property is only meant for reading and reflects the BSSID list of "
+"NetworkManager. The changes you make to this property will not be preserved."
+msgstr "检测为 Wi-Fi 网络一部分的 BSSID 列表（�个 BSSID 格�化为如 \"00:11:22:33:44:55\" 的 MAC 地�）。网络管�器（NetworkManager）会内部追踪先��过的 BSSID。此属性仅用于读�和显示网络管�器的 BSSID 列表。您对此属性所作的更改�会�留。"
 
 #: ../clients/common/settings-docs.h.in:21
 msgid "SSID of the Wi-Fi network. Must be specified."
@@ -5981,32 +5963,16 @@ msgid ""
 "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 ""
-"�用 NMSettingWiredWakeOnWLan "
-"的选项。并�全部设备都支�所有选项。�以是以下选项的任�组�：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）中�用 "
-"WLAN 唤醒的管�）。"
+msgstr "�用 NMSettingWiredWakeOnWLan 的选项。并�全部设备都支�所有选项。�以是以下选项的任�组�：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）中�用 WLAN 唤醒的管�）。"
 
 #: ../clients/common/settings-docs.h.in:24
 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\" for "
-"Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When "
-"using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the "
-"\"leap-username\" and \"leap-password\" properties must be specified."
-msgstr ""
-"当时使用 WEP 时（示例，key-mgmt = \"none\" 或 \"ieee8021x\"）表示接入点这里需� 802.11 验�算法。其中的 "
-"\"open\" 用于开放系统（Open System），\"shared\" 用于共享密钥，而 \"leap\" 用于�科 LEAP。当使用�科 "
-"LEAP（示例，key-mgmt = \"ieee8021x\" 和 auth-alg = \"leap\"）时，必须指定 \"leap-"
-"username\" 和 \"leap-password\" 属性。"
+"When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the "
+"802.11 authentication algorithm required by the AP here.  One of \"open\" "
+"for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  "
+"When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") "
+"the \"leap-username\" and \"leap-password\" properties must be specified."
+msgstr "当时使用 WEP 时（示例，key-mgmt = \"none\" 或 \"ieee8021x\"）表示接入点这里需� 802.11 验�算法。其中的 \"open\" 用于开放系统（Open System），\"shared\" 用于共享密钥，而 \"leap\" 用于�科 LEAP。当使用�科 LEAP（示例，key-mgmt = \"ieee8021x\" 和 auth-alg = \"leap\"）时，必须指定 \"leap-username\" 和 \"leap-password\" 属性。"
 
 #: ../clients/common/settings-docs.h.in:25
 msgid ""
@@ -6018,12 +5984,7 @@ msgid ""
 "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 ""
-"指示链路是�为连接�用快速�始链路设置（FILS/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 将被选择�用。"
+msgstr "指示链路是�为连接�用快速�始链路设置（FILS/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:26
 msgid ""
@@ -6031,20 +5992,15 @@ msgid ""
 "to Wi-Fi networks that do not utilize one of the algorithms in the list.  "
 "For maximum compatibility leave this property empty.  Each list element may "
 "be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\"."
-msgstr ""
-"组/广播加密算法列表，用�阻止连接到那些�使用列表中算法的 Wi-Fi 网络。为了最好的兼容性，�以让此属性留空。�个列表元素�以为 "
-"\"wep40\"�\"wep104\"�\"tkip\" 或 \"ccmp\" 中的一个。"
+msgstr "组/广播加密算法列表，用�阻止连接到那些�使用列表中算法的 Wi-Fi 网络。为了最好的兼容性，�以让此属性留空。�个列表元素�以为 \"wep40\"�\"wep104\"�\"tkip\" 或 \"ccmp\" 中的一个。"
 
 #: ../clients/common/settings-docs.h.in:27
 msgid ""
-"Key management used for the connection.  One of \"none\" (WEP), "
-"\"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" "
-"(infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). "
-"This property must be set for any Wi-Fi connection that uses security."
-msgstr ""
-"用于连接的密钥管�。\"none\"（WEP）�\"ieee8021x\"（动� WEP）�\"wpa-none\"（Ad-Hoc WPA-"
-"PSK）�\"wpa-psk\"（基础结构 WPA-PSK）或 \"wpa-eap\"（WPA �业）之一。对于使用安全�护的任何 Wi-Fi "
-"连接，此属性必须设定。"
+"Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x"
+"\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or "
+"\"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi "
+"connection that uses security."
+msgstr "用于连接的密钥管�。\"none\" (WEP)�\"ieee8021x\" (Dynamic WEP)�\"wpa-psk\" (infrastructure WPA-PSK)�\"sae\" (SAE) 或 \"wpa-eap\" (WPA-Enterprise)。任何使用安全功能的 Wi-Fi 连接都需�设置这个属性。"
 
 #: ../clients/common/settings-docs.h.in:28
 msgid ""
@@ -6068,9 +6024,7 @@ msgid ""
 "networks that do not utilize one of the algorithms in the list. For maximum "
 "compatibility leave this property empty.  Each list element may be one of "
 "\"tkip\" or \"ccmp\"."
-msgstr ""
-"�对加密算法列表，用�阻止连接到那些�使用列表中算法的 Wi-Fi 网络。为了最好的兼容性，�以让此属性留空。�个列表元素�以为 \"tkip\" 或 "
-"\"ccmp\" 中的一个。"
+msgstr "�对加密算法列表，用�阻止连接到那些�使用列表中算法的 Wi-Fi 网络。为了最好的兼容性，�以让此属性留空。�个列表元素�以为 \"tkip\" 或 \"ccmp\" 中的一个。"
 
 #: ../clients/common/settings-docs.h.in:32
 msgid ""
@@ -6082,21 +6036,14 @@ msgid ""
 "NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3) (enable PMF and fail if not "
 "supported).  When set to NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) and no "
 "global default is set, PMF will be optionally enabled."
-msgstr ""
-"指示是�必须为连接�用��护的管�帧（PMF/802.11w）。NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT "
-"(0)（使用全局默认值）� NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1)（�用 PMF）� "
-"NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2)（如果请求方和接入点支� PMF 就�用）或 "
-"NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3)（�用 PMF，�支�就失败）之一。当设定为 "
-"NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) 时且未设定全局默认值，PMF 将被选择�用。"
+msgstr "指示是�必须为连接�用��护的管�帧（PMF/802.11w）。NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0)（使用全局默认值）� NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE (1)（�用 PMF）� NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (2)（如果请求方和接入点支� PMF 就�用）或 NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (3)（�用 PMF，�支�就失败）之一。当设定为 NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT (0) 时且未设定全局默认值，PMF 将被选择�用。"
 
 #: ../clients/common/settings-docs.h.in:33
 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 "
 "specified, both WPA and RSN connections are allowed."
-msgstr ""
-"字符串列表，指定�许使用的 WPA �议版本。�个元素�以为 \"wpa\"（�许 WPA）或 \"rsn\"（�许 WPA2/"
-"RSN）中的一个。如果未指定，WPA 和 RSN 连接都�许。"
+msgstr "字符串列表，指定�许使用的 WPA �议版本。�个元素�以为 \"wpa\"（�许 WPA）或 \"rsn\"（�许 WPA2/RSN）中的一个。如果未指定，WPA 和 RSN 连接都�许。"
 
 #: ../clients/common/settings-docs.h.in:34
 msgid ""
@@ -6105,10 +6052,7 @@ msgid ""
 "standard) hashed to derive the actual key, or the key in form of 64 "
 "hexadecimal character. The WPA3-Personal networks use a passphrase of any "
 "length for SAE authentication."
-msgstr ""
-"WPA 网络的预共享密钥（Pre-Shared-Key）。对于 WPA-PSK，它是一个 8 到 63 个字符的 ASCII 密��令（由 802."
-"11i 标准指定）通过哈希以获得实际的密钥，或为一个 64 �  hexadecimal 字符的密钥。WPA3-Personal "
-"网络使用�以为任何长度的密��令以进行 SAE 验�。"
+msgstr "WPA 网络的预共享密钥（Pre-Shared-Key）。对于 WPA-PSK，它是一个 8 到 63 个字符的 ASCII 密��令（由 802.11i 标准指定）通过哈希以获得实际的密钥，或为一个 64 �  hexadecimal 字符的密钥。WPA3-Personal 网络使用�以为任何长度的密��令以进行 SAE 验�。"
 
 #: ../clients/common/settings-docs.h.in:35
 msgid "Flags indicating how to handle the \"psk\" property."
@@ -6128,10 +6072,7 @@ msgid ""
 "NM_WEP_KEY_TYPE_PASSPHRASE (2), in which case the passphrase is provided as "
 "a string and will be hashed using the de-facto MD5 method to derive the "
 "actual WEP key."
-msgstr ""
-"控制 WEP 密钥的转义。�许的值有 NM_WEP_KEY_TYPE_KEY (1)，此情况下密钥�么是 10 或 26 "
-"个字符长度的�六进制字符串，�么是 5 或 13 个字符长度的 ASCII 密�；还有 NM_WEP_KEY_TYPE_PASSPHRASE "
-"(2)，此情况下密�以字符串�供，并使用事实上的 MD5 方法散列以�生实际的 WEP 密钥。"
+msgstr "控制 WEP 密钥的转义。�许的值有 NM_WEP_KEY_TYPE_KEY (1)，此情况下密钥�么是 10 或 26 个字符长度的�六进制字符串，�么是 5 或 13 个字符长度的 ASCII 密�；还有 NM_WEP_KEY_TYPE_PASSPHRASE (2)，此情况下密�以字符串�供，并使用事实上的 MD5 方法散列以�生实际的 WEP 密钥。"
 
 #: ../clients/common/settings-docs.h.in:38
 msgid ""
@@ -6163,9 +6104,7 @@ msgid ""
 "index is used by the AP, put that WEP key index here.  Valid values are 0 "
 "(default key) through 3.  Note that some consumer access points (like the "
 "Linksys WRT54G) number the keys 1 - 4."
-msgstr ""
-"当使用�� WEP 时（例如 key-mgmt = \"none\"）并且接入点使用�默认的 WEP 密钥索引，在这里设置该 WEP 密钥索引。有效值从 "
-"0（默认密钥）到 3。注�有些用户接入点（如 Linksys WRT54G）编�密钥为 1～4。"
+msgstr "当使用�� WEP 时（例如 key-mgmt = \"none\"）并且接入点使用�默认的 WEP 密钥索引，在这里设置该 WEP 密钥索引。有效值从 0（默认密钥）到 3。注�有些用户接入点（如 Linksys WRT54G）编�密钥为 1～4。"
 
 #: ../clients/common/settings-docs.h.in:43
 msgid ""
@@ -6174,17 +6113,14 @@ msgid ""
 "determine whether it's feasible to start WPS enrollment from the Access "
 "Point capabilities. WPS can be disabled by setting this property to a value "
 "of 1."
-msgstr ""
-"指示使用哪� WPS 模�（如果�用）的标志。由于网络管�器（NetworkManager）会自动从接入点功能确定�动 WPS "
-"注册是��行，因此改�默认设置几乎没有�义。�以通过设置此属性值为 1 ��用 WPS。"
+msgstr "指示使用哪� WPS 模�（如果�用）的标志。由于网络管�器（NetworkManager）会自动从接入点功能确定�动 WPS 注册是��行，因此改�默认设置几乎没有�义。�以通过设置此属性值为 1 ��用 WPS。"
 
 #: ../clients/common/settings-docs.h.in:44
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server. If the list is empty, no "
 "verification of the server certificate's altSubjectName is performed."
-msgstr ""
-"字符串列表，将与验��务器所�供�书里的 altSubjectName 匹�。如果列表为空，�执行�务器�书的 altSubjectName 验�。"
+msgstr "字符串列表，将与验��务器所�供�书里的 altSubjectName 匹�。如果列表为空，�执行�务器�书的 altSubjectName 验�。"
 
 #: ../clients/common/settings-docs.h.in:45
 msgid ""
@@ -6201,8 +6137,8 @@ msgstr "身份验�的超时时间。零代表全局默认；如果全局默认
 
 #: ../clients/common/settings-docs.h.in:47
 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 "
+"Contains the CA certificate if used by the EAP method specified in the \"eap"
+"\" property. Certificate data is specified using a \"scheme\"; two are "
 "currently supported: blob and path. When using the blob scheme (which is "
 "backwards compatible with NM 0.7.x) this property should be set to the "
 "certificate's DER encoded data. When using the path scheme, this property "
@@ -6210,11 +6146,7 @@ msgid ""
 "with the string \"file://\" and ending with a terminating NUL byte. This "
 "property can be unset even if the EAP method supports CA certificates, but "
 "this allows man-in-the-middle attacks and is NOT recommended."
-msgstr ""
-"包� \"eap\" 属性指定的 EAP 方法所使用的 CA �书，如果其使用了。�书数�用 \"scheme\" "
-"指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x ��兼容）时，此属性应设定为�书的 DER "
-"编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL "
-"字节结�。此属性��设定，�使 EAP 方法支� CA �书，但这将�许中间人攻击因此�推�。"
+msgstr "包� \"eap\" 属性指定的 EAP 方法所使用的 CA �书，如果其使用了。�书数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x ��兼容）时，此属性应设定为�书的 DER 编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。此属性��设定，�使 EAP 方法支� CA �书，但这将�许中间人攻击因此�推�。"
 
 #: ../clients/common/settings-docs.h.in:48
 msgid ""
@@ -6243,10 +6175,7 @@ msgid ""
 "certificate's DER encoded data. When using the path scheme, this property "
 "should be set to the full UTF-8 encoded path of the certificate, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte."
-msgstr ""
-"包� \"eap\" 属性指定的 EAP 方法所使用的客户端�书，如果其使用了。�书数�用 \"scheme\" "
-"指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x ��兼容）时，此属性应设定为�书的 DER "
-"编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。"
+msgstr "包� \"eap\" 属性指定的 EAP 方法所使用的客户端�书，如果其使用了。�书数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x ��兼容）时，此属性应设定为�书的 DER 编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。"
 
 #: ../clients/common/settings-docs.h.in:52
 msgid ""
@@ -6266,9 +6195,7 @@ msgid ""
 "authentication server.  If a matching dNSName is found, this constraint is "
 "met.  If no dNSName values are present, this constraint is matched against "
 "SubjectName CN using same suffix match comparison."
-msgstr ""
-"�务器域�的约�。如果设定，此其 FQDN 用作�缀以匹�验��务器所�供�书的 dNSName 元素需求。如果找到了匹�的 "
-"dNSName，此约�被满足。如果未�供 dNSName 值，此约�用�匹�使用�个�缀匹�对比的 SubjectName CN。"
+msgstr "�务器域�的约�。如果设定，此其 FQDN 用作�缀以匹�验��务器所�供�书的 dNSName 元素需求。如果找到了匹�的 dNSName，此约�被满足。如果未�供 dNSName 值，此约�用�匹�使用�个�缀匹�对比的 SubjectName CN。"
 
 #: ../clients/common/settings-docs.h.in:55
 msgid ""
@@ -6277,10 +6204,7 @@ msgid ""
 "\"pwd\", and \"fast\".  Each method requires different configuration using "
 "the properties of this setting; refer to wpa_supplicant documentation for "
 "the allowed combinations."
-msgstr ""
-"当验�到 802.1x 网络时，所�许使用的 EAP "
-"方法。有效方法有：\"leap\"�\"md5\"�\"tls\"�\"peap\"�\"ttls\"�\"pwd\" 和 "
-"\"fast\"。��方法需�使用此设置属性的���置；请�考 wpa_supplicant 文档以获��许的组�。"
+msgstr "当验�到 802.1x 网络时，所�许使用的 EAP 方法。有效方法有：\"leap\"�\"md5\"�\"tls\"�\"peap\"�\"ttls\"�\"pwd\" 和 \"fast\"。��方法需�使用此设置属性的���置；请�考 wpa_supplicant 文档以获��许的组�。"
 
 #: ../clients/common/settings-docs.h.in:56
 msgid ""
@@ -6289,41 +6213,45 @@ msgid ""
 msgstr "用于 EAP 验�方法的标识字符串。通常是用户的用户�或登录�。"
 
 #: ../clients/common/settings-docs.h.in:57
+msgid ""
+"Whether the 802.1X authentication is optional. If TRUE, the activation will "
+"continue even after a timeout or an authentication failure. Setting the "
+"property to TRUE is currently allowed only for Ethernet connections. If set "
+"to FALSE, the activation can continue only after a successful authentication."
+msgstr "802.1X 身份验�是�是�选设置。如果为TRUE，�使在超时或身份验�失败�，激活�作�将继续。当�仅�许为以太网连接把这个属性设置为 TRUE。如果设置为 FALSE，则�有在�功通过身份验���能继续激活�作。"
+
+#: ../clients/common/settings-docs.h.in:58
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr "UTF-8 编�的文件路径，包�用于 EAP-FAST 的 PAC。"
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:59
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
 "\"password\" is preferred."
-msgstr ""
-"用于 EAP 验�方法的 UTF-8 编�密�。如果 \"password\" 属性和 \"password-raw\" 属性都指定了，首选 "
-"\"password\"。"
+msgstr "用于 EAP 验�方法的 UTF-8 编�密�。如果 \"password\" 属性和 \"password-raw\" 属性都指定了，首选 \"password\"。"
 
-#: ../clients/common/settings-docs.h.in:59
-#: ../clients/common/settings-docs.h.in:104
-#: ../clients/common/settings-docs.h.in:131
-#: ../clients/common/settings-docs.h.in:179
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:132
+#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:299
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "指示如何处� \"password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:60
+#: ../clients/common/settings-docs.h.in:61
 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\" "
 "property and the \"password-raw\" property are specified, \"password\" is "
 "preferred."
-msgstr ""
-"用于 EAP 验�方法的密�，以字节数组给定以�许其他�是 UTF-8 编�的密�能够使用。如果 \"password\" 属性和 \"password-"
-"raw\" 属性都指定了，首选 \"password\"。"
+msgstr "用于 EAP 验�方法的密�，以字节数组给定以�许其他�是 UTF-8 编�的密�能够使用。如果 \"password\" 属性和 \"password-raw\" 属性都指定了，首选 \"password\"。"
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:62
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr "指示如何处� \"password-raw\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:63
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6331,84 +6259,64 @@ msgid ""
 "the supplicant to allow or forbid it. The TLS options map to "
 "tls_disable_tlsv1_x settings. See the wpa_supplicant documentation for more "
 "details."
-msgstr ""
-"指定 NMSetting8021xAuthFlags 选项使用的 \"phase 1\" 外部验�所�用的验�标识。�以明确地�用个别 TLS "
-"版本。如果未设定确切的 TLS �用标识，将由请求方决定�许还是�止它。TLS 选项映射到 tls_disable_tlsv1_x 设置。详情请� "
-"wpa_supplicant 文档。"
+msgstr "指定 NMSetting8021xAuthFlags 选项使用的 \"phase 1\" 外部验�所�用的验�标识。�以明确地�用个别 TLS 版本。如果未设定确切的 TLS �用标识，将由请求方决定�许还是�止它。TLS 选项映射到 tls_disable_tlsv1_x 设置。详情请� wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.h.in:64
 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 "
-"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), \"2\" "
-"(allow authenticated provisioning), and \"3\" (allow both authenticated and "
-"unauthenticated provisioning).  See the wpa_supplicant documentation for "
-"more details."
-msgstr ""
-"当 \"eap\" 属性里的 EAP 方法指定为 FAST 时，�用或�用 EAP-FAST 凭�的行内设置。�识别的值有 "
-"\"0\"（�用）�\"1\"（�许未验�的设置）�\"2\"（�许验�的设置）和 \"3\"（验�和未验�的设置都�许）。详情请� "
-"wpa_supplicant 文档。"
+"are \"0\" (disabled), \"1\" (allow unauthenticated provisioning), "
+"\"2\" (allow authenticated provisioning), and \"3\" (allow both "
+"authenticated and unauthenticated provisioning).  See the wpa_supplicant "
+"documentation for more details."
+msgstr "当 \"eap\" 属性里的 EAP 方法指定为 FAST 时，�用或�用 EAP-FAST 凭�的行内设置。�识别的值有 \"0\"（�用）�\"1\"（�许未验�的设置）�\"2\"（�许验�的设置）和 \"3\"（验�和未验�的设置都�许）。详情请� wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.h.in:65
 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 "
 "\"1\" to force use of the new PEAP label.  See the wpa_supplicant "
 "documentation for more details."
-msgstr ""
-"强制在�生密钥时使用新的 PEAP 标签。有些 RADIUS �务器�能需�强制使用新的 PEAP 标签以与 PEAPv1 互�作。设为 \"1\" "
-"以强制使用新的 PEAP 标签。详情请� wpa_supplicant 文档。"
+msgstr "强制在�生密钥时使用新的 PEAP 标签。有些 RADIUS �务器�能需�强制使用新的 PEAP 标签以与 PEAPv1 互�作。设为 \"1\" 以强制使用新的 PEAP 标签。详情请� wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.h.in:66
 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 "
 "used.  Sometimes when using older RADIUS servers, it is necessary to force "
 "the client to use a particular PEAP version.  To do so, this property may be "
 "set to \"0\" or \"1\" to force that specific PEAP version."
-msgstr ""
-"当 \"eap\" 属性里的 EAP 方法指定为 PEAP 时，强制所使用的 PEAP 版本。未设定时，将使用�务器报告的版本。有时使用旧的 "
-"RADIUS �务器时，强制客户端使用特定的 PEAP 版本时必须的。�这么�，此属性�以设为 \"0\" 或 \"1\" 以强制所指定的 PEAP "
-"版本。"
+msgstr "当 \"eap\" 属性里的 EAP 方法指定为 PEAP 时，强制所使用的 PEAP 版本。未设定时，将使用�务器报告的版本。有时使用旧的 RADIUS �务器时，强制客户端使用特定的 PEAP 版本时必须的。�这么�，此属性�以设为 \"0\" 或 \"1\" 以强制所指定的 PEAP 版本。"
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
 "authentication. If the list is empty, no verification of the server "
 "certificate's altSubjectName is performed."
-msgstr ""
-"字符串列表，在 \"phase 2\" 验�期间将与验��务器所�供�书里的 altSubjectName 匹�。如果列表为空，�执行�务器�书的 "
-"altSubjectName 验�。"
+msgstr "字符串列表，在 \"phase 2\" 验�期间将与验��务器所�供�书里的 altSubjectName 匹�。如果列表为空，�执行�务器�书的 altSubjectName 验�。"
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
-"Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
+"Specifies the allowed \"phase 2\" inner non-EAP authentication method when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
 "property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", "
 "\"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each "
 "\"phase 2\" inner method requires specific parameters for successful "
 "authentication; see the wpa_supplicant documentation for more details."
-msgstr ""
-"当 \"eap\" 属性指定了使用内部 TLS 隧�的 EAP 方法时，指定其�许的 \"phase 2\" 内部� EAP 验�方法。�识别的� "
-"EAP \"phase 2\" 方法有 "
-"\"pap\"�\"chap\"�\"mschap\"�\"mschapv2\"�\"gtc\"�\"otp\"�\"md5\" 和 "
-"\"tls\"。��功验�，�个 \"phase 2\" 内部方法都需�特定的�数；详情请� wpa_supplicant 文档。"
+msgstr "当在 “eap� 属性中指定了使用内部 TLS 隧�的 EAP 方法时，指定�许的 “阶段2� 内部� EAP 身份验�方法。�用的� EAP “阶段2� 方法是 “pap��“chap��“mschap��“mschapv2��“gtc��“otp��“md5� 和 “tls�。�个“阶段2�内部方法都需�特定的�数�能�功进行身份验�。有关更多详细信�，请�� wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.h.in:69
 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\" "
+"Specifies the allowed \"phase 2\" inner EAP-based authentication method when "
+"an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
 "property.  Recognized EAP-based \"phase 2\" methods are \"md5\", "
 "\"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method "
 "requires specific parameters for successful authentication; see the "
 "wpa_supplicant documentation for more details."
-msgstr ""
-"当 \"eap\" 属性指定了使用内部 TLS 隧�的 EAP 方法时，指定其�许的 \"phase 2\" 内部基于 EAP 的验�方法。�识别的基于 "
-"EAP 的 \"phase 2\" 方法有 \"md5\", \"mschapv2\", \"otp\", \"gtc\", and "
-"\"tls\"。��功验�，�个 \"phase 2\" 内部方法都需�特定的�数；详情请� wpa_supplicant 文档。"
+msgstr "当在 “eap� 属性中指定了使用内部 TLS 隧�的 EAP 方法时，指定�许的 “阶段2� 内部基于 EAP 的身份验�方法。�用的基于 EAP 的“阶段2� 方法是 \"md5\"�\"mschapv2\"�\"otp\"�\"gtc\" 和 \"tls\"。�个“阶段2�内部方法都需�特定的�数�能�功进行身份验�。有关更多详细信�，请�� wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.h.in:70
 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 "
@@ -6420,35 +6328,28 @@ msgid ""
 "with a terminating NUL byte. This property can be unset even if the EAP "
 "method supports CA certificates, but this allows man-in-the-middle attacks "
 "and is NOT recommended."
-msgstr ""
-"包� \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" CA "
-"�书，如果其使用了。�书数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x "
-"��兼容）时，此属性应设定为�书的 DER 编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" "
-"为�缀并以终止 NUL 字节结�。此属性��设定，�使 EAP 方法支� CA �书，但这将�许中间人攻击因此�推�。"
+msgstr "包� \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" CA �书，如果其使用了。�书数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x ��兼容）时，此属性应设定为�书的 DER 编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。此属性��设定，�使 EAP 方法支� CA �书，但这将�许中间人攻击因此�推�。"
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.h.in:71
 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 "
 "PKCS#11 token that requires a login."
-msgstr ""
-"用于访问 \"phase2-ca-cert\" 属性里存储的 \"phase2\" CA �书的密�。�在 PKCS#11 "
-"令牌里存储的�书需�登录时有�义。"
+msgstr "用于访问 \"phase2-ca-cert\" 属性里存储的 \"phase2\" CA �书的密�。�在 PKCS#11 令牌里存储的�书需�登录时有�义。"
 
-#: ../clients/common/settings-docs.h.in:71
-msgid "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
+#: ../clients/common/settings-docs.h.in:72
+msgid ""
+"Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr "指示如何处� \"phase2-ca-cert-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.h.in:73
 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 "
 "certificate specified in the \"phase2-ca-cert\" property."
-msgstr ""
-"指�包� PEM 或 DER 格�化�书目录的 UTF-8 编�路径，该�书将� \"phase2-ca-cert\" "
-"属性里的指定�书一起添加到验�链。"
+msgstr "指�包� PEM 或 DER 格�化�书目录的 UTF-8 编�路径，该�书将� \"phase2-ca-cert\" 属性里的指定�书一起添加到验�链。"
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6460,27 +6361,21 @@ msgid ""
 "\"file://\" and ending with a terminating NUL byte. This property can be "
 "unset even if the EAP method supports CA certificates, but this allows man-"
 "in-the-middle attacks and is NOT recommended."
-msgstr ""
-"包� \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" "
-"客户端�书，如果其使用了。�书数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x "
-"��兼容）时，此属性应设定为�书的 DER 编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" "
-"为�缀并以终止 NUL 字节结�。此属性��设定，�使 EAP 方法支� CA �书，但这将�许中间人攻击因此�推�。"
+msgstr "包� \"phase2-auth\" 或 \"phase2-autheap\" 属性指定的 EAP 方法所使用的 \"phase 2\" 客户端�书，如果其使用了。�书数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案（与 NM 0.7.x ��兼容）时，此属性应设定为�书的 DER 编�数�。当使用路径方案时，此属性应设定为�书的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。此属性��设定，�使 EAP 方法支� CA �书，但这将�许中间人攻击因此�推�。"
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
 "stored on a PKCS#11 token that requires a login."
-msgstr ""
-"用于访问 \"phase2-client-cert\" 属性里存储的 \"phase2\" 客户端�书的密�。�在 PKCS#11 "
-"令牌里存储的�书需�登录时有�义。"
+msgstr "用于访问 \"phase2-client-cert\" 属性里存储的 \"phase2\" 客户端�书的密�。�在 PKCS#11 令牌里存储的�书需�登录时有�义。"
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr "指示如何处� \"phase2-client-cert-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.h.in:77
 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 "
@@ -6488,12 +6383,9 @@ msgid ""
 "matching dNSName is found, this constraint is met.  If no dNSName values are "
 "present, this constraint is matched against SubjectName CN using same suffix "
 "match comparison."
-msgstr ""
-"�务器域�的约�。如果设定，在内部 \"phase 2\" 验�期间，此 FQDN 用作�缀以匹�验��务器所�供�书的 dNSName "
-"元素需求。如果找到了匹�的 dNSName，此约�被满足。如果未�供 dNSName 值，此约�用�匹�使用�个�缀匹�对比的 SubjectName "
-"CN。"
+msgstr "�务器域�的约�。如果设定，在内部 \"phase 2\" 验�期间，此 FQDN 用作�缀以匹�验��务器所�供�书的 dNSName 元素需求。如果找到了匹�的 dNSName，此约�被满足。如果未�供 dNSName 值，此约�用�匹�使用�个�缀匹�对比的 SubjectName CN。"
 
-#: ../clients/common/settings-docs.h.in:77
+#: ../clients/common/settings-docs.h.in:78
 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 "
@@ -6510,51 +6402,39 @@ msgid ""
 "and ending with a terminating NUL byte, and as with the blob scheme the "
 "\"phase2-private-key-password\" property must be set to the password used to "
 "decode the PKCS#12 private key and certificate."
-msgstr ""
-"包�如果 \"phase2-auth\" 或 \"phase2-autheap\" 属性设为 \"tls\" 时的 \"phase 2\" "
-"内部�钥。密钥数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案时，此属性应设定为�钥加密过的 PEM "
-"编�数�。当使用路径方案时，此属性应设定为�钥的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。当使用 "
-"PKCS#12 格��钥和比特�方案时，此属性应设为 PKCS#12 数�且 \"phase2-private-key-password\" "
-"属性必须设为用于解密 PKCS#12 �书和�钥的密�。当使用 PKCS#12 文件和路径方案时，此属性应设为�钥的完整 UTF-8 编�路径，以字符串 "
-"\"file://\" 为�缀并以终止 NUL 字节结�；而与 blob 方案�用时，\"phase2-private-key-password\" "
-"属性必须设为用于解� PKCS#12 �钥和�书的密�。"
+msgstr "包�如果 \"phase2-auth\" 或 \"phase2-autheap\" 属性设为 \"tls\" 时的 \"phase 2\" 内部�钥。密钥数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案时，此属性应设定为�钥加密过的 PEM 编�数�。当使用路径方案时，此属性应设定为�钥的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。当使用 PKCS#12 格��钥和比特�方案时，此属性应设为 PKCS#12 数�且 \"phase2-private-key-password\" 属性必须设为用于解密 PKCS#12 �书和�钥的密�。当使用 PKCS#12 文件和路径方案时，此属性应设为�钥的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�；而与 blob 方案�用时，\"phase2-private-key-password\" 属性必须设为用于解� PKCS#12 �钥和�书的密�。"
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.h.in:79
 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 "
 "scheme, or is a PKCS#12 format key."
-msgstr ""
-"当�钥使用路径方案或为 PKCS#12 格�时，解密 \"phase2-private-key\" 属性指定的 \"phase 2\" "
-"�钥所使用的密�。"
+msgstr "当�钥使用路径方案或为 PKCS#12 格�时，解密 \"phase2-private-key\" 属性指定的 \"phase 2\" �钥所使用的密�。"
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr "指示如何处� \"phase2-private-key-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
 "unset, no verification of the authentication server certificate's subject is "
 "performed.  This property provides little security, if any, and its use is "
 "deprecated in favor of NMSetting8021x:phase2-domain-suffix-match."
-msgstr ""
-"主题字符串，在 \"phase 2\" "
-"验�期间将与验��务器所�供�书的主题匹�。如果未设，�执行�务器�书的主题验�。就算设定了此属性也�供�了多少安全性，而且它的使用已废弃，�代的是 "
-"NMSetting8021x:phase2-domain-suffix-match。"
+msgstr "主题字符串，在 \"phase 2\" 验�期间将与验��务器所�供�书的主题匹�。如果未设，�执行�务器�书的主题验�。就算设定了此属性也�供�了多少安全性，而且它的使用已废弃，�代的是 NMSetting8021x:phase2-domain-suffix-match。"
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.h.in:82
 msgid "PIN used for EAP authentication methods."
 msgstr "用于 EAP 验�方法的 PIN。"
 
-#: ../clients/common/settings-docs.h.in:82
-#: ../clients/common/settings-docs.h.in:181
+#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:183
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "指示如何处� \"pin\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:83
+#: ../clients/common/settings-docs.h.in:84
 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 "
@@ -6569,75 +6449,57 @@ msgid ""
 "property should be set to the full UTF-8 encoded path of the key, prefixed "
 "with the string \"file://\" and ending with a terminating NUL byte, and as "
 "with the blob scheme the \"private-key-password\" property must be set to "
-"the password used to decode the PKCS#12 private key and certificate. WARNING:"
-" \"private-key\" is not a \"secret\" property, and thus unencrypted private "
-"key data using the BLOB scheme may be readable by unprivileged users.  "
-"Private keys should always be encrypted with a private key password to "
-"prevent unauthorized access to unencrypted private key data."
-msgstr ""
-"包�如果 \"eap\" 属性设为 \"tls\" 时的�钥。�钥数�用 \"scheme\" "
-"指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案时，此属性应设为�钥加密过的 PEM "
-"编�数�。当使用路径方案时，此属性应设定为�钥的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。当使用 "
-"PKCS#12 格��钥和比特�方案时，此属性应设为 PKCS#12 数�且 \"private-key-password\" 属性必须设为用于解密 "
-"PKCS#12 �书和�钥的密�。当使用 PKCS#12 文件和路径方案时，此属性应设为�钥的完整 UTF-8 编�路径，以字符串 \"file://"
-"\" 为�缀并以终止 NUL 字节结�；而与比特�方案�用时，\"private-key-password\" 属性必须设为用于解� PKCS#12 "
-"�钥和�书的密�。警告：\"private-key\" �是 \"secret\" "
-"属性，因此使用比特�方案时未加密的�钥数��能会被�特�用户读�。�钥总是应该用�钥密�加密以阻止对未加密�钥数�的未授�访问。"
+"the password used to decode the PKCS#12 private key and certificate. "
+"WARNING: \"private-key\" is not a \"secret\" property, and thus unencrypted "
+"private key data using the BLOB scheme may be readable by unprivileged "
+"users.  Private keys should always be encrypted with a private key password "
+"to prevent unauthorized access to unencrypted private key data."
+msgstr "包�如果 \"eap\" 属性设为 \"tls\" 时的�钥。�钥数�用 \"scheme\" 指定；当�支�两�方案：比特�（blob）和路径。当使用比特�方案时，此属性应设为�钥加密过的 PEM 编�数�。当使用路径方案时，此属性应设定为�钥的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�。当使用 PKCS#12 格��钥和比特�方案时，此属性应设为 PKCS#12 数�且 \"private-key-password\" 属性必须设为用于解密 PKCS#12 �书和�钥的密�。当使用 PKCS#12 文件和路径方案时，此属性应设为�钥的完整 UTF-8 编�路径，以字符串 \"file://\" 为�缀并以终止 NUL 字节结�；而与比特�方案�用时，\"private-key-password\" 属性必须设为用于解� PKCS#12 �钥和�书的密�。警告：\"private-key\" �是 \"secret\" 属性，因此使用比特�方案时未加密的�钥数��能会被�特�用户读�。�钥总是应该用�钥密�加密以阻止对未加密�钥数�的未授�访问。"
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:85
 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 "
+"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 "
 "private key is a PKCS#12 format key."
 msgstr "当�钥使用路径方案或为 PKCS#12 格�时，解密 \"private-key\" 属性指定�钥所使用的密�。"
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:86
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr "指示如何处� \"private-key-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.h.in:87
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
 "server certificate's subject is performed.  This property provides little "
 "security, if any, and its use is deprecated in favor of NMSetting8021x:"
 "domain-suffix-match."
-msgstr ""
-"主题字符串，将与验��务器所�供�书的主题匹�。如果未设，�执行�务器�书的主题验�。就算设定了此属性也�供�了多少安全性，而且它的使用已废弃，�代的是 "
-"NMSetting8021x:domain-suffix-match。"
+msgstr "主题字符串，将与验��务器所�供�书的主题匹�。如果未设，�执行�务器�书的主题验�。就算设定了此属性也�供�了多少安全性，而且它的使用已废弃，�代的是 NMSetting8021x:domain-suffix-match。"
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.h.in:88
 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-"
 "path switch.  The certificates in this directory are added to the "
-"verification chain in addition to any certificates specified by the \"ca-"
-"cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-"
-"ca-path is rather a file name (bundle of trusted CA certificates), it "
-"overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets "
-"ca_cert/ca_cert2 options for wpa_supplicant)."
-msgstr ""
-"设为 TRUE 时，覆盖掉 \"ca-path\" 和 \"phase2-ca-path\" 属性，��使用�置时 --system-ca-path "
-"指定的系统 CA 目录。该目录中的�书� \"ca-cert\" 和 \"phase2-ca-cert\" 属性指定的任何�书一起加入到验�链。如果以 -"
-"-system-ca-path �供的路径�是文件�（�绑或�信任 CA �书），它会��覆盖 \"ca-cert\" 和 \"phase2-ca-"
-"cert\" 属性（为 wpa_supplicant 设定 ca_cert/ca_cert2 选项）。"
+"verification chain in addition to any certificates specified by the \"ca-cert"
+"\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-"
+"path is rather a file name (bundle of trusted CA certificates), it overrides "
+"\"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 "
+"options for wpa_supplicant)."
+msgstr "设为 TRUE 时，覆盖掉 \"ca-path\" 和 \"phase2-ca-path\" 属性，��使用�置时 --system-ca-path 指定的系统 CA 目录。该目录中的�书� \"ca-cert\" 和 \"phase2-ca-cert\" 属性指定的任何�书一起加入到验�链。如果以 --system-ca-path �供的路径�是文件�（�绑或�信任 CA �书），它会��覆盖 \"ca-cert\" 和 \"phase2-ca-cert\" 属性（为 wpa_supplicant 设定 ca_cert/ca_cert2 选项）。"
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "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 时，强制速度和�工模�的自动�商。如果 \"speed\" 和 \"duplex\" "
-"属性都指定了，�有那一个模�会在链路自动�商过程中被通告和接�：这�对 BASE-T 802.3 "
-"规范有效并用于强制�比特模�，因为在这些情况下链路�商时强制性的。为 FALSE 时，\"speed\" 和 \"duplex\" "
-"属性应该都设置，�则链路�置将被忽略。"
+"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 时，强制速度和�工模�的自动�商。如果 \"speed\" 和 \"duplex\" 属性都指定了，�有那一个模�会在链路自动�商过程中被通告和接�：这�对 BASE-T 802.3 规范有效并用于强制�比特模�，因为在这些情况下链路�商时强制性的。为 FALSE 时，\"speed\" 和 \"duplex\" 属性应该都设置，�则链路�置将被忽略。"
 
-#: ../clients/common/settings-docs.h.in:89
+#: ../clients/common/settings-docs.h.in:90
 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 "
@@ -6648,19 +6510,13 @@ msgid ""
 "creates a random MAC address on each connect. \"stable\" creates a hashed "
 "MAC address based on connection.stable-id and a machine dependent key. If "
 "unspecified, the value can be overwritten via global defaults, see manual of "
-"NetworkManager.conf. If still unspecified, it defaults to \"preserve\" "
-"(older versions of NetworkManager may use a different default value). On D-"
-"Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
+"NetworkManager.conf. If still unspecified, it defaults to \"preserve"
+"\" (older versions of NetworkManager may use a different default value). On "
+"D-Bus, this field is expressed as \"assigned-mac-address\" or the deprecated "
 "\"cloned-mac-address\"."
-msgstr ""
-"如指定了，则请求该设备使用此 MAC 地��代替。这个�被称为 MAC 克隆或欺骗。除了明确地指定 MAC 地�，也支� "
-"\"preserve\"�\"permanent\"�\"random\" 和 \"stable\" 等特殊值。\"preserve\" 表示激活时�动 "
-"MAC 地�。\"permanent\" 使用设备的永久硬件地�。\"random\" 则在�个连接上创建�机的 MAC 地�。\"stable\" "
-"则根� connection.stable-id 和机器相关密钥创建散列的 MAC 地�。如未指定，该值�被全局默认值覆盖，�� "
-"NetworkManager.conf 的手册。如还未指定，它就默认为 \"permanent\"。在 D-Bus 上, 此字段表示为 "
-"\"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
+msgstr "如指定了，则请求该设备使用此 MAC 地��代替。这个�被称为 MAC 克隆或欺骗。除了明确地指定 MAC 地�，也支� \"preserve\"�\"permanent\"�\"random\" 和 \"stable\" 等特殊值。\"preserve\" 表示激活时�动 MAC 地�。\"permanent\" 使用设备的永久硬件地�。\"random\" 则在�个连接上创建�机的 MAC 地�。\"stable\" 则根� connection.stable-id 和机器相关密钥创建散列的 MAC 地�。如未指定，该值�被全局默认值覆盖，�� NetworkManager.conf 的手册。如还未指定，它就默认为 \"permanent\"。在 D-Bus 上, 此字段表示为 \"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.h.in:91
 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 "
@@ -6673,57 +6529,45 @@ msgid ""
 "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\" 属性一�设定。在指定�工模��请确�您的设备支�。"
+msgstr "设定值时，\"half\" 和 \"full\" 二选一，�置设备�使用的指定�工模�。如果 \"auto-negotiate\" 为 \"yes\"，�有指定的模�会在链路自动�商过程中被通告：这�对 BASE-T 802.3 规范有效并用于强制�比特模�，因为在这些情况下链路�商时强制性的。如果值未设定（默认值），链路�置�么将被忽略（如果 \"auto-negotiate\" 为 \"no\"，默认值）�么将被自动�商（如果 \"auto-negotiate\" 为 \"yes\"），并且本地设备将通告所有支�的�工模�。如果指定，必须与 \"speed\" 属性一�设定。在指定�工模��请确�您的设备支�。"
 
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.h.in:93
 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 "
 "of the device (i.e. MAC spoofing)."
 msgstr "如果指定了，此连接将�应用到其永久 MAC 地�匹�的以太网设备。此属性�会改�设备的 MAC 地�（例如 MAC 欺骗）。"
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.h.in:94
 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 "
 "in the standard hex-digits-and-colons notation (00:11:22:33:44:55)."
-msgstr ""
-"如果指定了，此连接将从�应用到其永久 MAC 地�与列表里的地�匹�的以太网设备。�个 MAC 地�采用标准的�六进制数字和冒�标记（00:11:22:"
-"33:44:55）。"
+msgstr "如果指定了，此连接将从�应用到其永久 MAC 地�与列表里的地�匹�的以太网设备。�个 MAC 地�采用标准的�六进制数字和冒�标记（00:11:22:33:44:55）。"
 
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
-"Specific port type to use if the device supports multiple attachment methods."
-"  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), \"bnc\" "
-"(Thin Ethernet) or \"mii\" (Media Independent Interface). If the device "
-"supports only one port type, this setting is ignored."
-msgstr ""
-"如果设备支�多个连接方法，指定其使用的端�类型。\"tp\"（�绞线）�\"aui\"（连接�元接�）�\"bnc\"（细以太网）或 "
-"\"mii\"（介质无关接�）之一。如果设备�支�一个端�类型，忽略此设置。"
+"Specific port type to use if the device supports multiple attachment "
+"methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
+"\"bnc\" (Thin Ethernet) or \"mii\" (Media Independent Interface). If the "
+"device supports only one port type, this setting is ignored."
+msgstr "如果设备支�多个连接方法，指定其使用的端�类型。\"tp\"（�绞线）�\"aui\"（连接�元接�）�\"bnc\"（细以太网）或 \"mii\"（介质无关接�）之一。如果设备�支�一个端�类型，忽略此设置。"
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.h.in:97
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
 msgstr "s390 网络设备类型；\"qeth\"�\"lcs\" 或 \"ctc\" 之一，代表 s390 系统上�用的��虚拟网络设备。"
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:98
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
 "\"portname\", \"protocol\", among others.  Key names must contain only "
 "alphanumeric characters (ie, [a-zA-Z0-9])."
-msgstr ""
-"s390 特定设备的键值对字典。键和值都必须为字符串。�许的值包括 "
-"\"portno\"�\"layer2\"�\"portname\"�\"protocol\" 等等。键�必须�能包�字�数字字符（例如 [a-zA-"
-"Z0-9]）。"
+msgstr "s390 特定设备的键值对字典。键和值都必须为字符串。�许的值包括 \"portno\"�\"layer2\"�\"portname\"�\"protocol\" 等等。键�必须�能包�字�数字字符（例如 [a-zA-Z0-9]）。"
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -6731,32 +6575,24 @@ msgid ""
 "applies to the network device that uses these subchannels.  The list should "
 "contain exactly 3 strings, and each string may only be composed of "
 "hexadecimal characters and the period (.) character."
-msgstr ""
-"指定此网络设备与 z/VM 或 s390 主机通信使用的�通�的标识符。如 \"mac-address\" 用于� z/VM "
-"设备，此属性�用�确�此连接�应用到使用这些�通�的网络设备。列表应该包� 3 个字符串，且�个字符串�能由�六进制字符和�角��（.）字符组�。"
+msgstr "指定此网络设备与 z/VM 或 s390 主机通信使用的�通�的标识符。如 \"mac-address\" 用于� z/VM 设备，此属性�用�确�此连接�应用到使用这些�通�的网络设备。列表应该包� 3 个字符串，且�个字符串�能由�六进制字符和�角��（.）字符组�。"
 
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "When a value greater 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\" 属性一�设定。在指定速度值�请确�您的设备支�。"
+"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:100
+#: ../clients/common/settings-docs.h.in:101
 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), "
@@ -6767,136 +6603,121 @@ msgid ""
 "(0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to "
 "use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to "
 "disable management of Wake-on-LAN in NetworkManager)."
-msgstr ""
-"�用 NMSettingWiredWakeOnLan "
-"的选项。并�全部设备都支�所有选项。�以是以下选项的任�组�：NM_SETTING_WIRED_WAKE_ON_LAN_PHY "
-"(0x2)�NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST "
-"(0x4)�NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST "
-"(0x8)�NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST "
-"(0x10)�NM_SETTING_WIRED_WAKE_ON_LAN_ARP "
-"(0x20)�NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) 或特殊值 "
-"NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1)（使用全局设置）和 "
-"NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000)（在网络管�器（NetworkManager）里�用 LAN "
-"唤醒的管�）。"
+msgstr "�用 NMSettingWiredWakeOnLan 的选项。并�全部设备都支�所有选项。�以是以下选项的任�组�：NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2)�NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4)�NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8)�NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10)�NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20)�NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) 或特殊值 NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1)（使用全局设置）和 NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000)（在网络管�器（NetworkManager）里�用 LAN 唤醒的管�）。"
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.h.in:102
 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 "
 "required."
 msgstr "如果指定了，其为基于幻数�包的 LAN 唤醒所使用的密�，表示为以太网 MAC 地�。如果为 NULL，将�需�密�。"
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.h.in:103
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr "ADSL 连接的�装。�以是 \"vcmux\" 或 \"llc\"。"
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.h.in:104
 msgid "Password used to authenticate with the ADSL service."
 msgstr "用于 ADSL �务验�的密�。"
 
-#: ../clients/common/settings-docs.h.in:105
+#: ../clients/common/settings-docs.h.in:106
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr "ADSL 连接�议。�为 \"pppoa\"�\"pppoe\" 或 \"ipoatm\"。"
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:107
 msgid "Username used to authenticate with the ADSL service."
 msgstr "用于 ADSL �务验�的用户�。"
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:108
 msgid "VCI of ADSL connection"
 msgstr "ADSL 连接的 VCI"
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:109
 msgid "VPI of ADSL connection"
 msgstr "ADSL 连接的 VPI"
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:110
 msgid "The Bluetooth address of the device."
 msgstr "设备的�牙地�。"
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.h.in:111
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
 msgstr "拨�网络连接时使用 \"dun\"，或者支� NAP �置集设备的个人区域网络连接时使用 \"panu\"。"
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.h.in:112
 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-"
 "zA-Z0-9])."
 msgstr "绑定（bonding）选项的键/值对目录。键和值都必须为字符串。选项�必须�能包�字�数字字符（示例 [a-zA-Z0-9]）。"
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.h.in:113
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "以太网 MAC 地�的�化时间，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.h.in:114
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr "生�树�议（STP）转�延迟，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:115
 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 "
 "standards. This property is a mask of 16 bits, each corresponding to a group "
 "address in that range that must be forwarded. The mask can't have bits 0, 1 "
 "or 2 set because they are used for STP, MAC pause frames and LACP."
-msgstr ""
-"�转�的组地�掩�。通常，范围在 01:80:C2:00:00:00 到 01:80:C2:00:00:0F 内的组地�根�标准�转�。此属性是个 16 "
-"�的掩�，�个对应于一个组地�，组地�范围内的地�必须被转�。掩��能设定了� 0�1 或 2，因为它们用于 STP�MAC 暂�帧和 LACP。"
+msgstr "�转�的组地�掩�。通常，范围在 01:80:C2:00:00:00 到 01:80:C2:00:00:0F 内的组地�根�标准�转�。此属性是个 16 �的掩�，�个对应于一个组地�，组地�范围内的地�必须被转�。掩��能设定了� 0�1 或 2，因为它们用于 STP�MAC 暂�帧和 LACP。"
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:116
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "生�树�议（STP）呼�时间，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:117
 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."
-"cloned-mac-address\" is referred instead to generate the initial MAC address."
-" Note that setting \"ethernet.cloned-mac-address\" anyway overwrites the MAC "
-"address of the bridge later while activating the bridge. Hence, this "
+"cloned-mac-address\" is referred instead to generate the initial MAC "
+"address. Note that setting \"ethernet.cloned-mac-address\" anyway overwrites "
+"the MAC address of the bridge later while activating the bridge. Hence, this "
 "property is deprecated. Deprecated: 1"
-msgstr ""
-"如果指定了，其为网桥的 MAC 地�。当创建新网桥时，将设定此 MAC 地�。如果�指定此字段，��引用 \"ethernet.cloned-mac-"
-"address\" �生��始 MAC 地�。注�设置 \"ethernet.cloned-mac-address\" "
-"怎样都会在之�激活网桥时覆盖网桥的 MAC 地�。因此，此属性被弃用。已弃用：1"
+msgstr "如果指定了，其为网桥的 MAC 地�。当创建新网桥时，将设定此 MAC 地�。如果�指定此字段，��引用 \"ethernet.cloned-mac-address\" �生��始 MAC 地�。注�设置 \"ethernet.cloned-mac-address\" 怎样都会在之�激活网桥时覆盖网桥的 MAC 地�。因此，此属性被弃用。已弃用：1"
 
-#: ../clients/common/settings-docs.h.in:117
+#: ../clients/common/settings-docs.h.in:118
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "生�树�议（STP）最大消�寿命，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.h.in:119
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr "控制是�为此网桥�用 IGMP 监�。注�如果散列冲�监�会被自动�用，系统�能拒��用该功能直到冲�解决。"
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.h.in:120
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
 msgstr "设定此网桥的生�树�议（STP）优先级。值越�优先级越高；最高优先级（值最低）的网桥将选为根桥。"
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.h.in:121
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr "控制是�为此网桥�用生�树�议（STP）。"
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.h.in:122
 msgid ""
 "The default PVID for the ports of the bridge, that is the VLAN id assigned "
 "to incoming untagged frames."
 msgstr "网桥端�的默认 PVID，它是分�给入站的未�过 tag 的数�包的 VLAN id。"
 
-#: ../clients/common/settings-docs.h.in:122
+#: ../clients/common/settings-docs.h.in:123
 msgid "Control whether VLAN filtering is enabled on the bridge."
 msgstr "控制在网桥中是��用 VLAN 过滤。"
 
-#: ../clients/common/settings-docs.h.in:123
+#: ../clients/common/settings-docs.h.in:124
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "bridge will also have the default-pvid VLAN configured  by the bridge.vlan-"
@@ -6904,80 +6725,73 @@ msgid ""
 "following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where "
 "$vid is either a single id between 1 and 4094 or a range, represented as a "
 "couple of ids separated by a dash."
-msgstr ""
-"网桥 VLAN 对象阵列。除了这里指定的 VLAN，网桥还�以带有由 bridge.vlan-default-pvid 属性�置的 default-"
-"pvid VLAN。在 nmcli 中，VLAN 列表�以使用以下语法指定： $vid [pvid] [untagged] [, $vid [pvid] "
-"[untagged]]... 其中 $vid 是一个 1 到 4094 的 id，或是一个由短横线分隔的 id 所代表的范围。"
+msgstr "网桥 VLAN 对象阵列。除了这里指定的 VLAN，网桥还�以带有由 bridge.vlan-default-pvid 属性�置的 default-pvid VLAN。在 nmcli 中，VLAN 列表�以使用以下语法指定： $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... 其中 $vid 是一个 1 到 4094 的 id，或是一个由短横线分隔的 id 所代表的范围。"
 
-#: ../clients/common/settings-docs.h.in:124
+#: ../clients/common/settings-docs.h.in:125
 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."
 msgstr "�用或�用端�的 \"hairpin mode\"，其�许从接收帧的端��回帧。"
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr "通过此端�的目标的生�树�议（STP）端�开销。"
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:127
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr "此网桥端�的生�树�议（STP）优先级。"
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:128
 msgid ""
 "Array of bridge VLAN objects. In addition to the VLANs specified here, the "
 "port will also have the default-pvid VLAN configured on the bridge by the "
 "bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified "
-"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]."
-".. where $vid is either a single id between 1 and 4094 or a range, "
-"represented as a couple of ids separated by a dash."
-msgstr ""
-"网桥 VLAN 对象阵列。除了这里指定的 VLAN，网桥还�以带有由 bridge.vlan-default-pvid 属性�置的 default-"
-"pvid VLAN。在 nmcli 中，VLAN 列表�以使用以下语法指定： $vid [pvid] [untagged] [, $vid [pvid] "
-"[untagged]]... 其中 $vid 是一个 1 到 4094 的 id，或是一个由短横线分隔的 id 所代表的范围。"
+"with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] "
+"[untagged]]... where $vid is either a single id between 1 and 4094 or a "
+"range, represented as a couple of ids separated by a dash."
+msgstr "网桥 VLAN 对象阵列。除了这里指定的 VLAN，网桥还�以带有由 bridge.vlan-default-pvid 属性�置的 default-pvid VLAN。在 nmcli 中，VLAN 列表�以使用以下语法指定： $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... 其中 $vid 是一个 1 到 4094 的 id，或是一个由短横线分隔的 id 所代表的范围。"
 
-#: ../clients/common/settings-docs.h.in:128
-#: ../clients/common/settings-docs.h.in:175
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
 msgstr "如果�零，�传输指定大�或更�的数�包，将较大的数�包分�多个帧。"
 
-#: ../clients/common/settings-docs.h.in:129
+#: ../clients/common/settings-docs.h.in:130
 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 "
 "used when required."
 msgstr "建立基于 CDMA 移动宽带网络连接的拨���，如果有的�。如未指定，需�时默认使用��（#777）。"
 
-#: ../clients/common/settings-docs.h.in:130
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:131
+#: ../clients/common/settings-docs.h.in:180
 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 "
 "password is required, it is specified here."
 msgstr "用于与网络验�的密�，如果需�。很多��商�需�密�，或是接�任何密�。但是如果需�密�，�在这里指定。"
 
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:186
 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 "
 "username is required, it is specified here."
 msgstr "用于与网络验�的用户�，如果需�。很多��商�需�用户�，或是接�任何用户�。但是如果需�用户�，�在这里指定。"
 
-#: ../clients/common/settings-docs.h.in:133
+#: ../clients/common/settings-docs.h.in:134
 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 "
 "set, the authentication retries for 3 times before failing the connection. "
 "Currently this only applies to 802-1x authentication."
-msgstr ""
-"验�的�试次数。零代表无�次数；-1 代表使用全局默认值。如果全局默认值未设定，�许连接失败�验��试 3 次。当�此属性�应用到 802.1x 验�。"
+msgstr "验�的�试次数。零代表无�次数；-1 代表使用全局默认值。如果全局默认值未设定，�许连接失败�验��试 3 次。当�此属性�应用到 802.1x 验�。"
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:135
 msgid ""
 "Whether or not the connection should be automatically connected by "
 "NetworkManager when the resources for the connection are available. TRUE to "
@@ -6985,29 +6799,25 @@ msgid ""
 "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\"。"
+msgstr "当连接资��用时，网络管�器（NetworkManager）是�自动连接。TRUE 为自动激活连接，FALSE 为请求手动介入�激活连接。注�自动连接未实现于 VPN �置集。�自动连接 VPN �置集请�阅作为备用方法的 \"secondaries\"。"
 
-#: ../clients/common/settings-docs.h.in:135
+#: ../clients/common/settings-docs.h.in:136
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
 msgstr "自动连接优先级。如果连接设为自动连接时，首选高优先级的连接。默认为 0。数值越高优先级越高。"
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:137
 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 "
 "overridden). Setting this to 1 means to try activation only once before "
 "blocking autoconnect. Note that after a timeout, NetworkManager will try to "
 "autoconnect again."
-msgstr ""
-"自动激活放弃�连接应该�试的次数。零表示从�，-1 表示全局默认值（未被覆盖时为 4 次）。设定此属性为 1 "
-"表示阻止自动连接���试一次激活。注�一段超时时间�，网络管�器（NetworkManager）将�新�试自动连接。"
+msgstr "自动激活放弃�连接应该�试的次数。零表示从�，-1 表示全局默认值（未被覆盖时为 4 次）。设定此属性为 1 表示阻止自动连接���试一次激活。注�一段超时时间�，网络管�器（NetworkManager）将�新�试自动连接。"
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "Whether or not slaves of this connection should be automatically brought up "
 "when NetworkManager activates this connection. This only has a real effect "
@@ -7017,25 +6827,21 @@ msgid ""
 "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 ""
-"NetworkManger 激活此连接时，是�自动�动此连接的从连接。这�对主连接有实际效果。属性 "
-"\"autoconnect\"�\"autoconnect-priority\" 和 \"autoconnect-retries\" "
-"跟此设置无关。�许的值有：0：��从连接��；1：激活此连接的所有从连接；-1：默认。如果设为 -1（默认）时，读�全局 connection."
-"autoconnect-slaves 以确定实际值。如果它也是默认的，此设置回�到 0。"
+msgstr "NetworkManger 激活此连接时，是�自动�动此连接的从连接。这�对主连接有实际效果。属性 \"autoconnect\"�\"autoconnect-priority\" 和 \"autoconnect-retries\" 跟此设置无关。�许的值有：0：��从连接��；1：激活此连接的所有从连接；-1：默认。如果设为 -1（默认）时，读�全局 connection.autoconnect-slaves 以确定实际值。如果它也是默认的，此设置回�到 0。"
 
-#: ../clients/common/settings-docs.h.in:138
+#: ../clients/common/settings-docs.h.in:139
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr "如果大于零，推迟 IP 寻�的�功，直到到达超时时间或 IP 网关应答了 ping。"
 
-#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:140
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr "用户�读的连接的唯一标识符，如 \"工作 Wi-Fi\" 或 \"��商 4G\"。"
 
-#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.h.in:141
 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 "
@@ -7046,15 +6852,13 @@ msgid ""
 "restricts the interfaces a connection can be used with, and if interface "
 "names change or are reordered the connection may be applied to the wrong "
 "interface."
-msgstr ""
-"此连接绑定的网络接��称。如果未设定，此连接�以连接到任何�适类型的接�（�其他设置的�制）。对于软件设备，此值指定创建设备的�称。对于其接��无法很容易固定的连接类型（例如 "
-"移动宽带或 USB 以太网），�应使用此属性。设置此属性会�制连接�以使用的接�，而且当接��改�或�新排�了，连接�能会应用到错误的接�。"
+msgstr "此连接绑定的网络接��称。如果未设定，此连接�以连接到任何�适类型的接�（�其他设置的�制）。对于软件设备，此值指定创建设备的�称。对于其接��无法很容易固定的连接类型（例如 移动宽带或 USB 以太网），�应使用此属性。设置此属性会�制连接�以使用的接�，而且当接��改�或�新排�了，连接�能会应用到错误的接�。"
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:142
 msgid "Whether LLDP is enabled for the connection."
 msgstr "是�为连接�用 LLDP。"
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:143
 msgid ""
 "Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the "
 "connection. LLMNR is a protocol based on the Domain Name System (DNS) packet "
@@ -7064,79 +6868,68 @@ msgid ""
 "interface, resolve: do not register hostname but allow resolving of LLMNR "
 "host names. This feature requires a plugin which supports LLMNR. One such "
 "plugin is dns-systemd-resolved."
-msgstr ""
-"连接是��用 LLMNR（Link-Local Multicast Name Resolution）。LLMNR 是一个基于 DNS "
-"的数�包格�，它�以使 IPv4 和 IPv6 主机对�于本地连接中的主机进行�称解�。它的值�以是: yes: 注册主机�并为连接进行解�，no: "
-"在接�中�用 LLMNR，resolve: �注册主机�，但�许解� LLMNR 主机�。这个功能需�支� LLMNR 的�件。例如，dns-"
-"systemd-resolved 就是这样一个�件。"
+msgstr "连接是��用 LLMNR（Link-Local Multicast Name Resolution）。LLMNR 是一个基于 DNS 的数�包格�，它�以使 IPv4 和 IPv6 主机对�于本地连接中的主机进行�称解�。它的值�以是: yes: 注册主机�并为连接进行解�，no: 在接�中�用 LLMNR，resolve: �注册主机�，但�许解� LLMNR 主机�。这个功能需�支� LLMNR 的�件。例如，dns-systemd-resolved 就是这样一个�件。"
 
-#: ../clients/common/settings-docs.h.in:143
+#: ../clients/common/settings-docs.h.in:144
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "主设备的接��或 UUID 或主连接。"
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:145
 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. This feature requires a plugin which supports mDNS. One such "
 "plugin is dns-systemd-resolved."
-msgstr ""
-"是�为连接�用 mDNS。它的值�以是：yes: 注册主机�并为连接进行解�，no: 接��用 mDNS，resolve: �注册主机�但�许解� "
-"mDNS 主机�。这个功能需�一个支� mDNS 的�件。dns-systemd-resolved 就是这样一个�件。"
+msgstr "是�为连接�用 mDNS。它的值�以是：yes: 注册主机�并为连接进行解�，no: 接��用 mDNS，resolve: �注册主机�但�许解� mDNS 主机�。这个功能需�一个支� mDNS 的�件。dns-systemd-resolved 就是这样一个�件。"
 
-#: ../clients/common/settings-docs.h.in:145
+#: ../clients/common/settings-docs.h.in:146
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
 msgstr "连接是�按��计费。当在当�激活的连接上更新此属性时，更改立�生效。"
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "Specifies whether the profile can be active multiple times at a particular "
 "moment. The value is of type NMConnectionMultiConnect."
 msgstr "指定�置集是�能在指定时刻激活多次。该值为 NMConnectionMultiConnect 类型。"
 
-#: ../clients/common/settings-docs.h.in:147
+#: ../clients/common/settings-docs.h.in:148
 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 connection; "
-"otherwise users are allowed if and only if they are in this list.  When this "
-"is not empty, the connection can be active only when one of the specified "
-"users is logged into an active session.  Each entry is of the form \"[type]:"
-"[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the "
-"\"user\" [type] is allowed.  Any other values are ignored and reserved for "
-"future use.  [id] is the username that this permission refers to, which may "
-"not contain the \":\" character. Any [reserved] information present must be "
-"ignored and is reserved for future use.  All of [type], [id], and [reserved] "
-"must be valid UTF-8."
-msgstr ""
-"字符串数组，用于定义给定用户对此连接的访问�。如果此属性为 NULL "
-"或空，�许所有用户访问此连接；�则��许在此列表中的用户。当此属性�空时，�有当指定用户之一登录到活动会�时，连接被激活。�个�目的形�为 \"[类型]:"
-"[ID]:[已�留]\"；例如 \"user:dcbw:blah\"。此时，��许用户 \"user\" "
-"[类型]。其他任何值被忽略并�留为将�使用。[ID] 是此��引用的用户�，�能包�冒� \":\" 字符。存在的任何 [已�留] "
-"信�都必须被忽略并�留为将�使用。所有的 [类型]�[ID] 和 [已�留] 都必须为有效的 UTF-8。"
+"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 "
+"connection; otherwise users are allowed if and only if they are in this "
+"list.  When this is not empty, the connection can be active only when one of "
+"the specified users is logged into an active session.  Each entry is of the "
+"form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this "
+"time only the \"user\" [type] is allowed.  Any other values are ignored and "
+"reserved for future use.  [id] is the username that this permission refers "
+"to, which may not contain the \":\" character. Any [reserved] information "
+"present must be ignored and is reserved for future use.  All of [type], "
+"[id], and [reserved] must be valid UTF-8."
+msgstr "字符串数组，用于定义给定用户对此连接的访问�。如果此属性为 NULL 或空，�许所有用户访问此连接；�则��许在此列表中的用户。当此属性�空时，�有当指定用户之一登录到活动会�时，连接被激活。�个�目的形�为 \"[类型]:[ID]:[已�留]\"；例如 \"user:dcbw:blah\"。此时，��许用户 \"user\" [类型]。其他任何值被忽略并�留为将�使用。[ID] 是此��引用的用户�，�能包�冒� \":\" 字符。存在的任何 [已�留] 信�都必须被忽略并�留为将�使用。所有的 [类型]�[ID] 和 [已�留] 都必须为有效的 UTF-8。"
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:149
 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 "
 "connection is read-only and cannot be modified."
 msgstr "如果连接�以用�供设置�务的 D-Bus 接�以正确的���修改，为 FALSE；如果连接为�读且无法修改，为 TRUE。"
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:150
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
 msgstr "当基础连接本身激活时应一�激活的连接 UUID 列表。当��支� VPN 连接。"
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:151
 msgid ""
-"Setting name of the device type of this slave's master connection (eg, "
-"\"bond\"), or NULL if this connection is not a slave."
+"Setting name of the device type of this slave's master connection (eg, \"bond"
+"\"), or NULL if this connection is not a slave."
 msgstr "此从连接的主连接设备类型的设置�称（例如 \"bond\"），或者为 NULL 如果此连接�是从连接。"
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:152
 msgid ""
 "This represents the identity of the connection used for various purposes. It "
 "allows to configure multiple profiles to share the identity. Also, the "
@@ -7165,45 +6958,27 @@ msgid ""
 "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 stable private 地�。它也被用�为 ethernet.cloned-mac-address=stable 和 wifi."
-"cloned-mac-address=stable 生�的克隆���。�时，它也被用�作为带有 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。"
+msgstr "这代表了用于多个目的的连接标识。它�许通过�置多个�置集�共享这个标识。�外，stable-id �以包括��符，以便根�上下文�动�地进行替�。stable-id 用�生�带有 ipv6.addr-gen-mode=stable-privacy 的 IPv6 stable private 地�。它也被用�为 ethernet.cloned-mac-address=stable 和 wifi.cloned-mac-address=stable 生�的克隆���。�时，它也被用�作为带有 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.h.in:152
+#: ../clients/common/settings-docs.h.in:153
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
 "timestamp periodically when the connection is active to ensure that an "
 "active connection has the latest timestamp. The property is only meant for "
 "reading (changes to this property will not be preserved)."
-msgstr ""
-"连接上次完全激活的时间，以秒计算和 Unix "
-"时间表示。当连接激活时网络管�器（NetworkManager）会定期更新连接的时间戳以确�活动连接有最新的时间戳。该用�读�（此属性的更改�被�留）。"
+msgstr "连接上次完全激活的时间，以秒计算和 Unix 时间表示。当连接激活时网络管�器（NetworkManager）会定期更新连接的时间戳以确�活动连接有最新的时间戳。该用�读�（此属性的更改�被�留）。"
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
 "ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-"
 "hardware dependent connections like VPN or otherwise, should contain the "
 "setting name of that setting type (ie, \"vpn\" or \"bridge\", etc)."
-msgstr ""
-"连接的基础类型。对于硬件相关的连接，应包�硬件类型特定设置的设置�称（例如 \"802-3-ethernet\" 或 \"802-11-"
-"wireless\" 或 \"bluetooth\"，等等），而对于�硬件相关的连接如 VPN 或其他的，应包�该设置类型的设置�称（例如 "
-"\"vpn\" 或 \"bridge\"，等等）。"
+msgstr "连接的基础类型。对于硬件相关的连接，应包�硬件类型特定设置的设置�称（例如 \"802-3-ethernet\" 或 \"802-11-wireless\" 或 \"bluetooth\"，等等），而对于�硬件相关的连接如 VPN 或其他的，应包�该设置类型的设置�称（例如 \"vpn\" 或 \"bridge\"，等等）。"
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:155
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -7213,13 +6988,9 @@ msgid ""
 "SSID, mobile broadband network provider, or \"type\" property changes. The "
 "UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, "
 "contains only hexadecimal characters and \"-\")."
-msgstr ""
-"用于连接的全局唯一标识符，例如以 libuuid 生�。它应该在连接创建时分�，并且��连接�应用到�个网络就�改�。例如，当 \"id\" 属性或 "
-"NMSettingIP4Config 更改时它�应改�；但当 Wi-Fi SSID�移动宽带网络��商或 \"type\" "
-"属性改�时它�能需��新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" "
-"的格�（示例，�包��六进制和 \"-\"）。"
+msgstr "用于连接的全局唯一标识符，例如以 libuuid 生�。它应该在连接创建时分�，并且��连接�应用到�个网络就�改�。例如，当 \"id\" 属性或 NMSettingIP4Config 更改时它�应改�；但当 Wi-Fi SSID�移动宽带网络��商或 \"type\" 属性改�时它�能需��新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" 的格�（示例，�包��六进制和 \"-\"）。"
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "Timeout in milliseconds to wait for device at startup. During boot, devices "
 "may take a while to be detected by the driver. This property will cause to "
@@ -7228,156 +6999,123 @@ msgid ""
 "NMSettingConnection:interface-name to identify the device that will be "
 "waited for. The value 0 means no wait time. The default value is -1, which "
 "currently has the same meaning as no wait time."
-msgstr ""
-"等待设备�动的超时时间（以毫秒为��）。在引导期间，设备�能需�一段时间�能被驱动程�检测到。使用此属性将�以延迟 NetworkManager-"
-"wait-online.service 和 nm-online 以使设备有时间�以被驱动程�检测到。请注�，此属性仅与 "
-"NMSettingConnection:interface-name 一起使用以标识将等待的设备。如果为 0，则表示没有等待时间。 默认值为 -"
-"1，当�代表无等待时间。"
+msgstr "等待设备�动的超时时间（以毫秒为��）。在引导期间，设备�能需�一段时间�能被驱动程�检测到。使用此属性将�以延迟 NetworkManager-wait-online.service 和 nm-online 以使设备有时间�以被驱动程�检测到。请注�，此属性仅与 NMSettingConnection:interface-name 一起使用以标识将等待的设备。如果为 0，则表示没有等待时间。 默认值为 -1，当�代表无等待时间。"
 
-#: ../clients/common/settings-docs.h.in:156
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
 "connection will be placed in the default zone as defined by the firewall. "
 "When updating this property on a currently activated connection, the change "
 "takes effect immediately."
-msgstr ""
-"连接的信任级别。格�自由��区分大�写的字符串（例如 \"Home\"�\"工作\"�\"公共\"）。NULL "
-"或为指定区域表示连接将放置到防�墙定义的默认区域。当在当�激活的连接上更新此属性时，更改立�生效。"
+msgstr "连接的信任级别。格�自由��区分大�写的字符串（例如 \"Home\"�\"工作\"�\"公共\"）。NULL 或为指定区域表示连接将放置到防�墙定义的默认区域。当在当�激活的连接上更新此属性时，更改立�生效。"
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"指定 DCB FCoE 应用程�的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) 的任�组�。"
+msgstr "指定 DCB FCoE 应用程�的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任�组�。"
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:159
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "FCoE 控制器模�；为 \"fabric\"（默认）或 \"vn2vn\"。"
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:160
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"FCoE 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。�当 \"app-fcoe-flags\" 属性包� "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
+msgstr "FCoE 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。�当 \"app-fcoe-flags\" 属性包� NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"指定 DCB FIP 应用程�的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) 的任�组�。"
+msgstr "指定 DCB FIP 应用程�的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任�组�。"
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:162
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"FIP 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。�当 \"app-fip-flags\" 属性包� "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
+msgstr "FIP 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。�当 \"app-fip-flags\" 属性包� NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"指定 DCB iSCSI 应用程�的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) 的任�组�。"
+msgstr "指定 DCB iSCSI 应用程�的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任�组�。"
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:164
 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 "
 "the NM_SETTING_DCB_FLAG_ENABLE (0x1) flag."
-msgstr ""
-"iSCSI 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。�当 \"app-iscsi-flags\" 属性包� "
-"NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
+msgstr "iSCSI 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。�当 \"app-iscsi-flags\" 属性包� NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:165
 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 "
 "priority's assigned group that the priority may use.  The sum of all "
 "percentages for priorities which belong to the same group must total 100 "
 "percents."
-msgstr ""
-"8 "
-"个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级�使用的优先级指定组的带宽百分比。属于�个组的所有优先级百分比总和必须为 "
-"100%。"
+msgstr "8 个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级�使用的优先级指定组的带宽百分比。属于�个组的所有优先级百分比总和必须为 100%。"
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:166
 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 "
 "priority should transmit priority pause."
 msgstr "8 个布尔值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示对应优先级是�应该传输优先级暂�。"
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:167
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"指定 DCB 优先级��控制（PFC）的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) 的任�组�。"
+msgstr "指定 DCB 优先级��控制（PFC）的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任�组�。"
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:168
 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 "
 "allocated to that group.  Allowed values are 0 - 100, and the sum of all "
 "values must total 100 percents."
-msgstr ""
-"8 个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示分�到该组的链路带宽百分比。�许的值为 0～100，且所有值的总和必须为 "
-"100%。"
+msgstr "8 个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示分�到该组的链路带宽百分比。�许的值为 0～100，且所有值的总和必须为 100%。"
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
 "NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4)."
-msgstr ""
-"指定 DCB 优先级组的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE "
-"(0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
-"(0x4) 的任�组�。"
+msgstr "指定 DCB 优先级组的 NMSettingDcbFlags。标志�以是 NM_SETTING_DCB_FLAG_ENABLE (0x1)�NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING (0x4) 的任�组�。"
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:170
 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 "
 "Priority Group ID values are 0 - 7 or 15 for the unrestricted group."
-msgstr ""
-"8 个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级组 ID。�许的优先级组 ID 值为 0～7，或 15 表示无�制组。"
+msgstr "8 个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级组 ID。�许的优先级组 ID 值为 0～7，或 15 表示无�制组。"
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:171
 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 "
 "all of the bandwidth allocated to its assigned group."
 msgstr "8 个布尔值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级是��以使用分�到它指定组的全部带宽。"
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:172
 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 "
 "the priority is mapped."
 msgstr "8 个无符�整数值组�的数组，其数组索引对应于用户优先级（0～7）而其值指示该优先级映射的��等级（0～7）。"
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:173
 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 "
@@ -7386,107 +7124,99 @@ msgid ""
 "to use the correct APN for the user's mobile broadband plan. The APN may "
 "only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section "
 "14.9."
-msgstr ""
-"当与基于 GSM 网络建立数�会�时指定使用的 APN 的 GPRS 接入点�称。APN "
-"通常确定了用户如何为他们的网络使用付费，和用户能�访问互�网或�是��商特定的�闭平�，因此为用户的移动带宽套�使用正确的 APN 很��。根� GSM "
-"03.60 章节 14.9，APN �能由字符 a～z�0～9�. 和 - 组�。"
+msgstr "当与基于 GSM 网络建立数�会�时指定使用的 APN 的 GPRS 接入点�称。APN 通常确定了用户如何为他们的网络使用付费，和用户能�访问互�网或�是��商特定的�闭平�，因此为用户的移动带宽套�使用正确的 APN 很��。根� GSM 03.60 章节 14.9，APN �能由字符 a～z�0～9�. 和 - 组�。"
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:174
+msgid ""
+"When TRUE, the settings such as APN, username, or password will default to "
+"values that match the network the modem will register to in the Mobile "
+"Broadband Provider database."
+msgstr "如果为TRUE，则设置（例如 APN，用户�或密�）将默认为与调制解调器将在移动宽带�供商数�库中注册的网络相匹�的值。"
+
+#: ../clients/common/settings-docs.h.in:175
 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 "
 "specified device."
 msgstr "此连接�应用的设备唯一标识符（由 WWAN 管��务给定）。如果给定了，连接将�应用到指定的设备。"
 
-#: ../clients/common/settings-docs.h.in:174
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
 msgstr "为 TRUE 时，将��许连接到本地网络，�会连接到漫游网络。"
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
 "to force the device to register only on the specified network. This can be "
 "used to ensure that the device does not roam when direct roaming control of "
 "the device is not otherwise possible."
-msgstr ""
-"�强制指定网络注册的网络 ID（GSM LAI 格�，如 MCC-MNC）。如果指定了网络 "
-"ID，网络管�器（NetworkManager）将�试强制设备�在指定的网络注册。当设备�能直接控制漫游时，这�以用于确�设备�漫游。"
+msgstr "�强制指定网络注册的网络 ID（GSM LAI 格�，如 MCC-MNC）。如果指定了网络 ID，网络管�器（NetworkManager）将�试强制设备�在指定的网络注册。当设备�能直接控制漫游时，这�以用于确�设备�漫游。"
 
-#: ../clients/common/settings-docs.h.in:177
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "Legacy setting that used to help establishing PPP data sessions for GSM-"
 "based modems. Deprecated: 1"
 msgstr "用�帮助基于 GSM 的调制解调器创建 PPP 数�会�的�的设置。已过期：1"
 
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:182
 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 "
 "device."
 msgstr "如果 SIM 被 PIN ��了，在请求任何其他�作�必须解�。在这里指定 PIN 以�许设备的�作。"
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:184
 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 "
 "any device also allowed by \"device-id\" which contains a SIM card matching "
 "the given identifier."
-msgstr ""
-"此连接应用的 SIM �的唯一标识符（由 WWAN 管��务给定）。如果给定了，此连接将应用到包�匹�给定标识符 SIM �的 \"device-"
-"id\" 所�许的任何设备。"
+msgstr "此连接应用的 SIM �的唯一标识符（由 WWAN 管��务给定）。如果给定了，此连接将应用到包�匹�给定标识符 SIM �的 \"device-id\" 所�许的任何设备。"
 
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:185
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
 "connection will apply to any device also allowed by \"device-id\" and \"sim-"
 "id\" which contains a SIM card provisioned by the given operator."
-msgstr ""
-"一个如 \"310260\" 或 \"21601\" 的 MCC/MNC "
-"字符串，用�鉴定此连接应用到的指定移动网络��商。如果给定了，连接将应用到包�给定��商�供 SIM �的 \"device-id\" 和 \"sim-"
-"id\" 所�许的任何设备。"
+msgstr "一个如 \"310260\" 或 \"21601\" 的 MCC/MNC 字符串，用�鉴定此连接应用到的指定移动网络��商。如果给定了，连接将应用到包�给定��商�供 SIM �的 \"device-id\" 和 \"sim-id\" 所�许的任何设备。"
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:187
 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 "
 "of the device (i.e. MAC spoofing)."
 msgstr "如指定了，此连接将�应用到符�永久 MAC 地�的 IPoIB 设备。此属性�会改�设备的 MAC 地�（例如 MAC 欺骗）。"
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:189
 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 "
 "unsigned integer, whose high bit is set if it is a \"full membership\" P_Key."
-""
-msgstr ""
-"用于此设备的 InfiniBand P_Key。值 -1 代表使用默认的 P_Key（�� \"索引 0 的 P_Key\"）。�则它是个 16 "
-"�无符�整数，其高�已设定如果它是个 \"正�会员\" P_Key。"
+msgstr "用于此设备的 InfiniBand P_Key。值 -1 代表使用默认的 P_Key（�� \"索引 0 的 P_Key\"）。�则它是个 16 �无符�整数，其高�已设定如果它是个 \"正�会员\" P_Key。"
 
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:190
 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 "
 "setting either this property or \"mac-address\"."
-msgstr ""
-"此设备的上级设备的接��称。一般是 NULL，但如果 \"p_key\" 已设定，您必须通过设置此属性或 \"mac-address\" "
-"�指定基础设备。"
+msgstr "此设备的上级设备的接��称。一般是 NULL，但如果 \"p_key\" 已设定，您必须通过设置此属性或 \"mac-address\" �指定基础设备。"
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:191
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr "IP-over-InfiniBand 传输模�。�么为 \"datagram\" �么为 \"connected\"。"
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr "�许多少个附加的�装等级预置到数�包。此属性值�应用到 IPv6 隧�。"
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "Tunnel flags. Currently the following values are supported: "
 "NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), "
@@ -7495,86 +7225,80 @@ msgid ""
 "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 隧�有效。"
+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:192
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr "�分�到隧�数�包的��标签。此属性�应用到 IPv6 隧�。"
 
-#: ../clients/common/settings-docs.h.in:193
+#: ../clients/common/settings-docs.h.in:195
 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."
 msgstr "用于隧�输入数�包的密钥。该属性值对�些隧�模�有效（GRE�IP6GRE）。如果留空则�使用密钥。"
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
 msgstr "隧�的本地端点。值�以为空，�则它必须包�一个 IPv4 或 IPv6 地�。"
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 msgstr "隧�模�，例如 NM_IP_TUNNEL_MODE_IPIP (1) 或 NM_IP_TUNNEL_MODE_GRE (2)。"
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
 msgstr "如果�零，�传输指定大�或更�的数�包，将较大的数�包分�多个帧。"
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:199
 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）。如果留空则�使用密钥。"
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:200
 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 "
 "that interface."
 msgstr "如果给定了，指定新设备将绑定到的上级接��或上级连接 UUID，以让隧�的数�包�能通过该接�进行路由。"
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:201
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "是�在此隧��用路径 MTU �现。"
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr "隧�的远程端点；值必须包�一个 IPv4 或 IPv6 地�。"
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
 msgstr "设定在隧�数�包上的�务类型（IPv4）或��等级（IPv6）字段。"
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
 msgstr "分�到隧�数�包的 TTL。0 为特殊值，表示数�包继承 TTL 值。"
 
-#: ../clients/common/settings-docs.h.in:203
-#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:228
 msgid "Array of IP addresses."
 msgstr "IP 地�数组。"
 
-#: ../clients/common/settings-docs.h.in:204
-#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:229
 msgid ""
 "Timeout in milliseconds used to check for the presence of duplicate IP "
 "addresses on the network.  If an address conflict is detected, the "
@@ -7582,11 +7306,9 @@ msgid ""
 "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."
-msgstr ""
-"用于检查网络中是�存在�� IP 地�的超时时间。如果检测到了冲�，激活将失败。零值表示�执行�� IP 检查，-1 表示默认值（�置 ipvx.dad-"
-"timeout 覆盖或 3 秒）。大于零的值为以毫秒计算的超时时间。该属性当��实现于 IPv4。"
+msgstr "用于检查网络中是�存在�� IP 地�的超时时间。如果检测到了冲�，激活将失败。零值表示�执行�� IP 检查，-1 表示默认值（�置 ipvx.dad-timeout 覆盖或 3 秒）。大于零的值为以毫秒计算的超时时间。该属性当��实现于 IPv4。"
 
-#: ../clients/common/settings-docs.h.in:205
+#: ../clients/common/settings-docs.h.in:207
 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 "
@@ -7600,75 +7322,96 @@ msgid ""
 "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 \"duid\" generates a RFC4361-compliant client "
-"identifier based on a hash of the interface name as IAID and /etc/machine-id."
-" The special value \"stable\" is supported to generate a type 0 client "
+"identifier based on a hash of the interface name as IAID and /etc/machine-"
+"id. 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 you set the stable-id, you may want to include the \"${DEVICE}\" or "
 "\"${MAC}\" specifier to get a per-device key. If unset, a globally "
 "configured default is used. If still unset, the default depends on the DHCP "
 "plugin."
-msgstr ""
-"��到 DHCP �务器的字符串，用以确定 DHCP �务器�能用于自定义 DHCP "
-"租约和选项的本地机器。当属性值为�六进制字符串时，将其解读为二进制的客户端 ID，这�情况下根� RFC 2132 章节 9.14 首字节被认为是 "
-"\"type\" 字段而剩下的字节�为一个硬件地�（例如 \"01:xx:xx:xx:xx:xx:xx\" 中 1 是以太网 ARP 类型而其余的是个 "
-"MAC 地�）。如果属性�是�六进制字符串，它被视作�硬件地�客户端 ID 且 \"type\" 字段被设为 0。支�特殊值 \"mac\" 和 "
-"\"perm-mac\"，其使用设备的当�或永久 MAC 地��生�类型为以太网类型 (01) "
-"的客户端标识符。当�这些选项仅适用于以太网类型的链路。支�特殊值 \"stable\" 基于 stable-id 和�个主机的密钥生�一个类型 0 "
-"的客户端标识符（�� connection.stable-id）。如果未设，使用全局默认值。如果�未设定，默认值�决于 DHCP �件。"
+msgstr "��到 DHCP �务器的字符串，用以确定 DHCP �务器�能用于自定义 DHCP 租约和选项的本地机器。当属性值为�六进制字符串时，将其解读为二进制的客户端 ID，这�情况下根� RFC 2132 章节 9.14 首字节被认为是 \"type\" 字段而剩下的字节�为一个硬件地�（例如 \"01:xx:xx:xx:xx:xx:xx\" 中 1 是以太网 ARP 类型而其余的是个 MAC 地�）。如果属性�是�六进制字符串，它被视作�硬件地�客户端 ID 且 \"type\" 字段被设为 0。支�特殊值 \"mac\" 和 \"perm-mac\"，其使用设备的当�或永久 MAC 地��生�类型为以太网类型 (01) 的客户端标识符。当�这些选项仅适用于以太网类型的链路。支�特殊值 \"stable\" 基于 stable-id 和�个主机的密钥生�一个类型 0 的客户端标识符（�� connection.stable-id）。如果未设，使用全局默认值。如果�未设定，默认值�决于 DHCP �件。"
 
-#: ../clients/common/settings-docs.h.in:206
+#: ../clients/common/settings-docs.h.in:208
 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-"
 "hostname\" are mutually exclusive and cannot be set at the same time."
-msgstr ""
-"如果 \"dhcp-send-hostname\" 属性为 TRUE，当获�租约时指定的 FQDN 将被��到 DHCP �务器。此属性与 \"dhcp-"
-"hostname\" 相互排斥而且无法被�时设定。"
+msgstr "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获�租约时指定的 FQDN 将被��到 DHCP �务器。此属性与 \"dhcp-hostname\" 相互排斥而且无法被�时设定。"
 
-#: ../clients/common/settings-docs.h.in:207
-#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:231
 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-"
 "fqdn\" are mutually exclusive and cannot be set at the same time."
-msgstr ""
-"如果 \"dhcp-send-hostname\" 属性为 TRUE，当获�租约时指定的�称将被��到 DHCP �务器。此属性与 \"dhcp-"
-"fqdn\" 相互排斥而且无法被�时设定。"
+msgstr "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获�租约时指定的�称将被��到 DHCP �务器。此属性与 \"dhcp-fqdn\" 相互排斥而且无法被�时设定。"
 
-#: ../clients/common/settings-docs.h.in:208
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:210
+#: ../clients/common/settings-docs.h.in:232
+msgid ""
+"Flags for the DHCP hostname and FQDN. Currently this property only includes "
+"flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN "
+"flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option "
+"will contain no flag. Otherwise, if no FQDN flag is set and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN "
+"flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and "
+"NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is "
+"set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default "
+"is looked up in NetworkManager configuration. If that value is unset or also "
+"NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described "
+"above are sent in the DHCP requests."
+msgstr "DHCP 主机�和 FQDN 的标志。当�，此属性仅包�用于控制在 DHCP FQDN 选项中设置的FQDN 标志的标志。支�的 FQDN 标志是NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1)� NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) 和 NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4)。如果未设置 FQDN  标志并且设置了NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8)，则 DHCP FQDN 选项将�包�标志。�则，如果未设置 FQDN 标志并且未设置NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8)，则将在请求中设置标准 FQDN 标志： NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1)�NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2)（IPv4）和 NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) （IPv6）。当此属性设置为默认值NM_DHCP_HOSTNAME_FLAG_NONE（0x0）时，将在NetworkManager�置中查找全局默认值。如果未设置该值，或者也未设置NM_DHCP_HOSTNAME_FLAG_NONE（0x0），则在DHCP请求中��上述标准FQDN标志。"
+
+#: ../clients/common/settings-docs.h.in:211
+#: ../clients/common/settings-docs.h.in:233
+msgid ""
+"A string containing the \"Identity Association Identifier\" (IAID) used by "
+"the DHCP client. The property is a 32-bit decimal value or a special value "
+"among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac"
+"\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC "
+"address are used as IAID. When set to \"ifname\", the IAID is computed by "
+"hashing the interface name. The special value \"stable\" can be used to "
+"generate an IAID based on the stable-id (see connection.stable-id), a per-"
+"host key and the interface name. When the property is unset, the value from "
+"global configuration is used; if no global default is set then the IAID is "
+"assumed to be \"ifname\". Note that at the moment this property is ignored "
+"for IPv6 by dhclient, which always derives the IAID from the MAC address."
+msgstr "一个包� DHCP 客户端使用的“身份关�标识符�（IAID）的字符串。该属性是一个 32 �的�进制值，或 “mac��“ perm-mac��“ifname� 和 “stable�特殊值中的一个。当设置为“ mac�（或“ perm-mac�）时，当�（或永久）MAC 地�的最� 4 个字节用作 IAID。当设置为 “ifname� 时，通过对接��称进行散列处��计算出 IAID。特殊值 “stable� �用于基于稳定 ID（请�阅connection.stable-id）��个主机的密钥和接��称�生�一个 IAID。�消设置属性�，将使用全局�置中的值；如果未设置全局默认值，则将 IAID �定为 “ifname�。请注�，此刻 dhclient 会忽略 IPv6 的此属性，该属性始终从 MAC 地�获� IAID。"
+
+#: ../clients/common/settings-docs.h.in:212
+#: ../clients/common/settings-docs.h.in:234
 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 "
 "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."
-msgstr ""
-"如果为 TRUE，当获�租约时��主机�到 DHCP �务器。有些 DHCP �务器使用这个主机��更新 DNS "
-"数�库，实质上为计算机�供了个��的主机�。如果 \"dhcp-hostname\" 属性为 NULL 且此属性为 TRUE，以计算机的当�永久主机。"
+msgstr "如果为 TRUE，当获�租约时��主机�到 DHCP �务器。有些 DHCP �务器使用这个主机��更新 DNS 数�库，实质上为计算机�供了个��的主机�。如果 \"dhcp-hostname\" 属性为 NULL 且此属性为 TRUE，以计算机的当�永久主机。"
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:235
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "DHCP 事务的超时时间，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:210
-#: ../clients/common/settings-docs.h.in:230
+#: ../clients/common/settings-docs.h.in:214
+#: ../clients/common/settings-docs.h.in:236
 msgid "Array of IP addresses of DNS servers."
 msgstr "DNS �务器的 IP 地�数组。"
 
-#: ../clients/common/settings-docs.h.in:211
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:215
+#: ../clients/common/settings-docs.h.in:237
 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 "
 "use default options. This is distinct from an empty list of properties."
-msgstr ""
-"在 man 5 resolv.conf 中�述的 DNS 选项数组。NULL "
-"代表选项未设定并�留默认值。此情况下网络管�器（NetworkManager）将使用默认选项。这跟空列表的属性��。"
+msgstr "在 man 5 resolv.conf 中�述的 DNS 选项数组。NULL 代表选项未设定并�留默认值。此情况下网络管�器（NetworkManager）将使用默认选项。这跟空列表的属性��。"
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:216
+#: ../clients/common/settings-docs.h.in:238
 msgid ""
 "DNS servers priority. The relative priority for DNS servers specified by "
 "this setting.  A lower value is better (higher priority). Zero selects a "
@@ -7686,26 +7429,17 @@ msgid ""
 "lowest priority value will be used. When using a DNS resolver that supports "
 "Conditional Forwarding 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 �务器的相关优先级。值越低优先级越高。零代表默认值，� 50 用于 VPN 和 100 "
-"用于其他连接。注�此优先级用于为多个活动连接排� DNS 设置。它�是对�个连接�置集中的多个 DNS �务器进行明确选择。当使用 dns="
-"default 时，更高优先级的�务器将在 resolv.conf "
-"里的更顶部。�让给定�务器优先于�连接内的�一�务器，��以期望的顺�指定它们就行。当多个设备�置了�样的优先级，将优先选择活动默认路由的那一个。注�当使用 "
-"dns=dnsmasq 时，此顺�无�义因为 dnsmasq "
-"�时转�查询到所有已知�务器。负值具有排除其他拥有更高优先级值的�置的特殊效果；所以存在至少一个负值优先级的情况下，�使用具有最低优先级值的连接的 "
-"DNS �务器。当使用支�拆分 DNS 为 dns=dnsmasq 或 dns=systemd-resolved 的 DNS "
-"解�器时，�个连接用于查询它�索列表中的域。未在任何�索列表中的域查询会由具有 \"~.\" "
-"特殊通�符的域进行路由，被自动以默认路由添加到连接（或�以手动添加）。当多个连接指定了�个域时，拥有最高��（最低的数值）的那个连接将获选。如果连接指定了个域，其为具有负 "
-"DNS 优先级值的�一域的�域，那这个�域会被忽略。"
+"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 �务器的相关优先级。值越低优先级越高。零代表默认值，� 50 用于 VPN 和 100 用于其他连接。注�此优先级用于为多个活动连接排� DNS 设置。它�是对�个连接�置集中的多个 DNS �务器进行明确选择。当使用 dns=default 时，更高优先级的�务器将在 resolv.conf 里的更顶部。�让给定�务器优先于�连接内的�一�务器，��以期望的顺�指定它们就行。当多个设备�置了�样的优先级，将优先选择活动默认路由的那一个。注�当使用 dns=dnsmasq 时，此顺�无�义因为 dnsmasq �时转�查询到所有已知�务器。负值具有排除其他拥有更高优先级值的�置的特殊效果；所以存在至少一个负值优先级的情况下，�使用具有最低优先级值的连接的 DNS �务器。当使用支�拆分 DNS 为 dns=dnsmasq 或 dns=systemd-resolved 的 DNS 解�器时，�个连接用于查询它�索列表中的域。未在任何�索列表中的域查询会由具有 \"~.\" 特殊通�符的域进行路由，被自动以默认路由添加到连接（或�以手动添加）。当多个连接指定了�个域时，拥有最高��（最低的数值）的那个连接将获选。如果连接指定了个域，其为具有负 DNS 优先级值的�一域的�域，那这个�域会被忽略。"
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:239
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
@@ -7713,36 +7447,32 @@ msgid ""
 "host names."
 msgstr "DNS �索域的数组。域以�角波浪�（\"~\"）开头的视为 \"路由\" 域并�用于确定查询必须转�的接�；它们�用于完全未�定的主机�。"
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:218
+#: ../clients/common/settings-docs.h.in:240
 msgid ""
 "The gateway associated with this configuration. This is only meaningful if "
 "\"addresses\" is also set."
 msgstr "与此�置关�的网关。这�在 \"addresses\" 也设定的时候有�义。"
 
-#: ../clients/common/settings-docs.h.in:215
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:219
+#: ../clients/common/settings-docs.h.in:241
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
 "and search domains specified in the \"dns\" and \"dns-search\" properties, "
 "if any, are used."
-msgstr ""
-"当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动�置的�称�务器和�索域被忽略且�有 \"dns\" 和 \"dns-"
-"search\" 属性中指定的�称�务器和�索域被使用，如果有的�。"
+msgstr "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动�置的�称�务器和�索域被忽略且�有 \"dns\" 和 \"dns-search\" 属性中指定的�称�务器和�索域被使用，如果有的�。"
 
-#: ../clients/common/settings-docs.h.in:216
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
 "property, if any, are used."
-msgstr ""
-"当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动�置的路由被忽略且�有 \"routes\" "
-"属性中指定的路由被使用，如果有的�。"
+msgstr "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动�置的路由被忽略且�有 \"routes\" 属性中指定的路由被使用，如果有的�。"
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:238
+#: ../clients/common/settings-docs.h.in:221
+#: ../clients/common/settings-docs.h.in:244
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -7750,42 +7480,34 @@ msgid ""
 "fail.  For example, in IPv6-only networks, setting this property to TRUE on "
 "the NMSettingIP4Config allows the overall network configuration to succeed "
 "if IPv4 configuration fails but IPv6 configuration completes successfully."
-msgstr ""
-"如果为 TURE，�许进行整体网络�置�管此属性指定的�置是�超时。注�至少�有一个 IP �置�功�然整体网络�置�将失败。示例，在纯 IPv6 "
-"网络，在 NMSettingIP4Config 设置此属性为 TRUE 时�许整体网络�置在 IPv4 �置失败但 IPv6 �置�功完�时�功。"
+msgstr "如果为 TURE，�许进行整体网络�置�管此属性指定的�置是�超时。注�至少�有一个 IP �置�功�然整体网络�置�将失败。示例，在纯 IPv6 网络，在 NMSettingIP4Config 设置此属性为 TRUE 时�许整体网络�置在 IPv4 �置失败但 IPv6 �置�功完�时�功。"
 
-#: ../clients/common/settings-docs.h.in:218
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:245
 msgid ""
 "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both "
 "support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the "
-"subclass-specific documentation for other values. In general, for the "
-"\"auto\" method, properties such as \"dns\" and \"routes\" specify "
-"information that is added on to the information returned from automatic "
-"configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" "
-"properties modify this behavior. For methods that imply no upstream network, "
-"such as \"shared\" or \"link-local\", these properties must be empty. For "
-"IPv4 method \"shared\", the IP subnet can be configured by adding one manual "
-"IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared "
-"method must be configured on the interface which shares the internet to a "
-"subnet, not on the uplink which is shared."
-msgstr ""
-"IP �置方法。 NMSettingIP4Config 和 NMSettingIP6Config 都支�“auto�，“manual�和“link-"
-"local�。对于其它值，请�阅相关�类的文档。通常情况下，对于“auto�方法，“dns�和“routes�等属性指定是在从自动�置返回的信�添加的信�。 "
-"\"ignore-auto-routes\" 和 \"ignore-auto-"
-"dns\"属性会改�这个行为。对于�味�没有上游网络的方法，如“shared�或“link-local�，这些性能必须为空。对于 IPv4 "
-"的方法“sharded�，IP �网�以通过加入一个手工 IPv4 地�或选择 10.42.x.0/24 ��置。注�，shared "
-"的方法必须在这个�网中的用�共享互�网的接�中进行�置，而�是在共享的上部连接中进行�置。"
+"subclass-specific documentation for other values. In general, for the \"auto"
+"\" method, properties such as \"dns\" and \"routes\" specify information "
+"that is added on to the information returned from automatic configuration.  "
+"The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this "
+"behavior. For methods that imply no upstream network, such as \"shared\" or "
+"\"link-local\", these properties must be empty. For IPv4 method \"shared\", "
+"the IP subnet can be configured by adding one manual IPv4 address or "
+"otherwise 10.42.x.0/24 is chosen. Note that the shared method must be "
+"configured on the interface which shares the internet to a subnet, not on "
+"the uplink which is shared."
+msgstr "IP �置方法。 NMSettingIP4Config 和 NMSettingIP6Config 都支�“auto�，“manual�和“link-local�。对于其它值，请�阅相关�类的文档。通常情况下，对于“auto�方法，“dns�和“routes�等属性指定是在从自动�置返回的信�添加的信�。 \"ignore-auto-routes\" 和 \"ignore-auto-dns\"属性会改�这个行为。对于�味�没有上游网络的方法，如“shared�或“link-local�，这些性能必须为空。对于 IPv4 的方法“sharded�，IP �网�以通过加入一个手工 IPv4 地�或选择 10.42.x.0/24 ��置。注�，shared 的方法必须在这个�网中的用�共享互�网的接�中进行�置，而�是在共享的上部连接中进行�置。"
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:240
+#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:246
 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."
 msgstr "如果为 TRUE，此连接将永��为此 IP 类型的默认连接，这表示网络管�器（NetworkManager）永远�会为其分�默认路由。"
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:224
+#: ../clients/common/settings-docs.h.in:247
 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 "
@@ -7794,13 +7516,10 @@ msgid ""
 "default route. Note that for IPv6, the kernel accepts zero (0) but coerces "
 "it to 1024 (user default). Hence, setting this property to zero effectively "
 "mean setting it to 1024. For IPv4, zero is a regular value for the metric."
-msgstr ""
-"用于没有明确指定跃点的路由器的默认跃点。默认值 -1 "
-"表示根�设备类型自动选择跃点。该跃点应用到自动路由�没有明确跃点设置的手动（��）路由�地��缀路由和默认路由。注�对于 "
-"IPv6，内核接�零值（0）但会将其转为 1024（用户默认）。因此，设置此属性为零等于设置它为 1024。对于 IPv4，零是跃点的常规值。"
+msgstr "用于没有明确指定跃点的路由器的默认跃点。默认值 -1 表示根�设备类型自动选择跃点。该跃点应用到自动路由�没有明确跃点设置的手动（��）路由�地��缀路由和默认路由。注�对于 IPv6，内核接�零值（0）但会将其转为 1024（用户默认）。因此，设置此属性为零等于设置它为 1024。对于 IPv4，零是跃点的常规值。"
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:248
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -7815,15 +7534,14 @@ msgid ""
 "will not delete any extraneous routes from tables except the main table. "
 "This is to preserve backward compatibility for users who manage routing "
 "tables outside of NetworkManager."
-msgstr ""
-"�用策略路由（�路由）并在添加路由时设定路由表。此属性影�所有的路由器，包括设备路由�IPv4LL�DHCP�SLAAC�默认路由和��路由。但请注���路由�以通过明确地指定�零的路由表�自己覆盖掉设置。如果表设置�留为零，它有�被全局�置覆盖。如果在应用全局�置值�属性�为零，对此连接的地���用策略路由。�用策略路由�味�网络管�器（NetworkManager）将添加所有路由到主表（除了明确�置了��路由表的��路由）。�外，网络管�器将�会从表中删除任何外部路由，除了主路由。这是为了给用网络管�器之外工具管�路由表的用户����兼容性。"
+msgstr "�用策略路由（�路由）并在添加路由时设定路由表。此属性影�所有的路由器，包括设备路由�IPv4LL�DHCP�SLAAC�默认路由和��路由。但请注���路由�以通过明确地指定�零的路由表�自己覆盖掉设置。如果表设置�留为零，它有�被全局�置覆盖。如果在应用全局�置值�属性�为零，对此连接的地���用策略路由。�用策略路由�味�网络管�器（NetworkManager）将添加所有路由到主表（除了明确�置了��路由表的��路由）。�外，网络管�器将�会从表中删除任何外部路由，除了主路由。这是为了给用网络管�器之外工具管�路由表的用户����兼容性。"
 
-#: ../clients/common/settings-docs.h.in:222
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:249
 msgid "Array of IP routes."
 msgstr "IP 路由数组。"
 
-#: ../clients/common/settings-docs.h.in:223
+#: ../clients/common/settings-docs.h.in:227
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -7843,17 +7561,9 @@ msgid ""
 "upgrade from older versions. Note that this setting is distinct from the "
 "Privacy Extensions as configured by \"ip6-privacy\" property and it does not "
 "affect the temporary addresses configured with this option."
-msgstr ""
-"创建用于 RFC4862 IPv6 "
-"无状�地�自动�置的地�的�置方法。�许的值有：NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 或 "
-"NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)。如果属性设为 "
-"EUI64，地�将使用�生自硬件地�的接�令牌�生�。这会让地�的主机部分����，使得在地��化时能够追踪主机的存在。接�硬件被替�时地�改�。stable-"
-"privacy 值�用主机特定密钥的加密安全散列，��连接的 stable-id 和由 RFC7217 "
-"指定的网络地�一起使用。这使得�以利用地�追踪主机的存在，且在网络接�硬件被替�时能��地�固定。在 D-Bus 上，没有 addr-gen-mode "
-"设置等于�用 stable-privacy。对于密钥文件，�盘上没有设置则表示 EUI6，因此属性在从旧版本�级时�会改�。注�此设置与由 \"ip6-"
-"privacy\" �置的��扩展��，而且它�会影�此选项�置的临时地�。"
+msgstr "创建用于 RFC4862 IPv6 无状�地�自动�置的地�的�置方法。�许的值有：NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 (0) 或 NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY (1)。如果属性设为 EUI64，地�将使用�生自硬件地�的接�令牌�生�。这会让地�的主机部分����，使得在地��化时能够追踪主机的存在。接�硬件被替�时地�改�。stable-privacy 值�用主机特定密钥的加密安全散列，��连接的 stable-id 和由 RFC7217 指定的网络地�一起使用。这使得�以利用地�追踪主机的存在，且在网络接�硬件被替�时能��地�固定。在 D-Bus 上，没有 addr-gen-mode 设置等于�用 stable-privacy。对于密钥文件，�盘上没有设置则表示 EUI6，因此属性在从旧版本�级时�会改�。注�此设置与由 \"ip6-privacy\" �置的��扩展��，而且它�会影�此选项�置的临时地�。"
 
-#: ../clients/common/settings-docs.h.in:226
+#: ../clients/common/settings-docs.h.in:230
 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 "
@@ -7880,20 +7590,9 @@ msgid ""
 "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 ""
-"包� DHCPv6 唯一标识符（DUID）的字符串，用于 dhcp 客户端鉴定它自己到 DHCPv6 �务器（RFC 3315）。DUID "
-"�带在客户端标识符选项中。如果属性为�六进制的字符串（\"aa:bb:cc\"），它被解读为二进制 DUID "
-"并在客户端标识符选项中以��明值填充。特殊值 \"lease\" 将�试连接所属租约文件上次使用的 DUID。如果为找到且 \"dhclient\" "
-"为�置的 dhcp 客户端，DUID 将在系统范围的 dhclient 租约文件中�索。如果�为找到 DUID 或使用了其他 dhcp 客户端，将基于 "
-"machine-id 生�全局和永久的 DUID-UUID（RFC 6355）。特殊值 \"llt\" 和 \"ll\" 将基于设备的当� MAC "
-"地�生� LLT 或 LL 类型的 DUID（�阅 RFC 3315）。为了试��供稳定的 DUID-"
-"LLT，时间字段将包�固定时间戳，用于全局（的所有�置集）且�留到�盘上。特殊值 \"stable-llt\"�\"stable-ll\" 和 "
-"\"stable-uuid\" 将生�相应类型的 DUID，�生自连接的 stable-id 和�个主机的唯一密钥。因此，\"stable-ll\" 和 "
-"\"stable-llt\" 的链路层地�将是�生自稳定 id 的生�地�。\"stable-llt\" 选项中的 DUID-LLT "
-"时间值将在��的三年时间跨度中选择（区间的上�与用在 \"llt\" 中的固定时间戳相�）。当属性未设定时，使用 \"ipv6.dhcp-duid\" "
-"�供的全局值。如果未�供全局值，认定为默认的 \"lease\" 值。"
+msgstr "包� DHCPv6 唯一标识符（DUID）的字符串，用于 dhcp 客户端鉴定它自己到 DHCPv6 �务器（RFC 3315）。DUID �带在客户端标识符选项中。如果属性为�六进制的字符串（\"aa:bb:cc\"），它被解读为二进制 DUID 并在客户端标识符选项中以��明值填充。特殊值 \"lease\" 将�试连接所属租约文件上次使用的 DUID。如果为找到且 \"dhclient\" 为�置的 dhcp 客户端，DUID 将在系统范围的 dhclient 租约文件中�索。如果�为找到 DUID 或使用了其他 dhcp 客户端，将基于 machine-id 生�全局和永久的 DUID-UUID（RFC 6355）。特殊值 \"llt\" 和 \"ll\" 将基于设备的当� MAC 地�生� LLT 或 LL 类型的 DUID（�阅 RFC 3315）。为了试��供稳定的 DUID-LLT，时间字段将包�固定时间戳，用于全局（的所有�置集）且�留到�盘上。特殊值 \"stable-llt\"�\"stable-ll\" 和 \"stable-uuid\" 将生�相应类型的 DUID，�生自连接的 stable-id 和�个主机的唯一密钥。因此，\"stable-ll\" 和 \"stable-llt\" 的链路层地�将是�生自稳定 id 的生�地�。\"stable-llt\" 选项中的 DUID-LLT 时间值将在��的三年时间跨度中选择（区间的上�与用在 \"llt\" 中的固定时间戳相�）。当属性未设定时，使用 \"ipv6.dhcp-duid\" �供的全局值。如果未�供全局值，认定为默认的 \"lease\" 值。"
 
-#: ../clients/common/settings-docs.h.in:237
+#: ../clients/common/settings-docs.h.in:243
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -7908,352 +7607,326 @@ msgid ""
 "Privacy addresses that can be enabled with the \"addr-gen-mode\" property's "
 "\"stable-privacy\" setting as another way of avoiding host tracking with "
 "IPv6 addresses."
-msgstr ""
-"�置 SLAAC 的 IPv6 ��扩展，�述于 RFC4941。如果�用，它让内核通过修改 EUI-64 生�临时的 IPv6 地�附加到从 MAC "
-"地�生�的公共地�上。此�以增强��性，但�一方�也�能在有些应用程�上引起问题。�许的值有：-"
-"1，未知；0：�用；1：�用（首选公共地�）；2：�用（首选临时地�）。把�个连接的设置设为 \"-1\" 表示其回�到全局�置 \"ipv6.ip6-"
-"privacy\"。如果全局�置也为�置或设为 \"-1\"，回�到读� \"/proc/sys/net/ipv6/conf/default/"
-"use_tempaddr\" 的值。注�此设置与固定��地���，�者�通过 \"addr-gen-mode\" 属性的 \"stable-"
-"privacy\" 设置�用，�作为�� IPv6 地�追踪的�一�方法。"
+msgstr "�置 SLAAC 的 IPv6 ��扩展，�述于 RFC4941。如果�用，它让内核通过修改 EUI-64 生�临时的 IPv6 地�附加到从 MAC 地�生�的公共地�上。此�以增强��性，但�一方�也�能在有些应用程�上引起问题。�许的值有：-1，未知；0：�用；1：�用（首选公共地�）；2：�用（首选临时地�）。把�个连接的设置设为 \"-1\" 表示其回�到全局�置 \"ipv6.ip6-privacy\"。如果全局�置也为�置或设为 \"-1\"，回�到读� \"/proc/sys/net/ipv6/conf/default/use_tempaddr\" 的值。注�此设置与固定��地���，�者�通过 \"addr-gen-mode\" 属性的 \"stable-privacy\" 设置�用，�作为�� IPv6 地�追踪的�一�方法。"
 
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
-msgstr ""
-"�置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接�标识符的令牌。对 eui64 "
-"addr-gen-mode 有用。"
+msgstr "�置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接�标识符的令牌。对 eui64 addr-gen-mode 有用。"
 
-#: ../clients/common/settings-docs.h.in:245
+#: ../clients/common/settings-docs.h.in:251
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "是�加密传输的��。"
 
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr "用于 MACsec 密钥�商的预共享 CAK。"
 
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:253
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "指示如何处� \"mka-cak\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr "用于 MACsec 密钥�商的预共享 CKN（连接关�密钥�称）。"
 
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:255
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr "指定如何获�用于 MKA（MACsec 密钥�商）的 CAK（连接关�密钥）。"
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:256
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"如果给定了，其指定从此 MACSEC 接�应该创建自的上级接��称或上级连接的 UUID。如果此属性未指定，该连接必须包�具有 \"mac-"
-"address\" 属性的 \"802-3-ethernet\" 设置。"
+msgstr "如果给定了，其指定从此 MACSEC 接�应该创建自的上级接��称或上级连接的 UUID。如果此属性未指定，该连接必须包�具有 \"mac-address\" 属性的 \"802-3-ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr "SCI（安全信�标识符）的端�组件，介于 1 和 65534 之间。"
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:258
 msgid ""
 "Specifies whether the SCI (Secure Channel Identifier) is included in every "
 "packet."
 msgstr "指定 SCI（安全信�标识符）是�包括在�个数�包中。"
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:259
 msgid "Specifies the validation mode for incoming frames."
 msgstr "指定传入帧的验�模�。"
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:260
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
 msgstr "macvlan 模�，它指定了�一低层设备上的多个 macvlans 之间的通信机制。"
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:261
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"如果给定了，其指定从此 MAC-VLAN 接�应该创建自的上级接��称或上级连接的 UUID。如果此属性未指定，该连接必须包�具有 \"mac-"
-"address\" 属性的 \"802-3-ethernet\" 设置。"
+msgstr "如果给定了，其指定从此 MAC-VLAN 接�应该创建自的上级接��称或上级连接的 UUID。如果此属性未指定，该连接必须包�具有 \"mac-address\" 属性的 \"802-3-ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:262
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "是�应将接�置于混�模�。"
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:263
 msgid "Whether the interface should be a MACVTAP."
 msgstr "接�是�应为 MACVTAP。"
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
-"A list of interface names to match. Each element is a shell wildcard pattern."
-"  When an element is prefixed with exclamation mark (!) the condition is "
-"inverted. A candidate interface name is considered matching when both these "
-"conditions are satisfied: (a) any of the elements not prefixed with '!' "
-"matches or there aren't such elements; (b) none of the elements prefixed "
-"with '!' match."
-msgstr ""
-"�匹�的接��列表。�个元素都为 shell 通�符模�。当元素以感��（!）为�缀时，�件�转。当满足下列�件时，视为匹�的候选接��：(a) 未�� "
-"\"!\" 的任�元素匹�或�存此类元素；(b) 无�� \"!\" 的元素匹�。"
+"A list of interface names to match. Each element is a shell wildcard "
+"pattern.  When an element is prefixed with exclamation mark (!) the "
+"condition is inverted. A candidate interface name is considered matching "
+"when both these conditions are satisfied: (a) any of the elements not "
+"prefixed with '!' matches or there aren't such elements; (b) none of the "
+"elements prefixed with '!' match."
+msgstr "�匹�的接��列表。�个元素都为 shell 通�符模�。当元素以感��（!）为�缀时，�件�转。当满足下列�件时，视为匹�的候选接��：(a) 未�� \"!\" 的任�元素匹�或�存此类元素；(b) 无�� \"!\" 的元素匹�。"
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:265
 msgid "The data path type. One of \"system\", \"netdev\" or empty."
 msgstr "数�路径类型。\"system\"�\"netdev\" 之一或留空。"
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:266
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr "网桥失败模�。\"secure\"�\"standalone\" 之一或留空。"
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:267
 msgid "Enable or disable multicast snooping."
 msgstr "�用或�用多播监�。"
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:268
 msgid "Enable or disable RSTP."
 msgstr "�用或�用 RSTP。"
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:269
 msgid "Enable or disable STP."
 msgstr "�用或�用 STP。"
 
-#: ../clients/common/settings-docs.h.in:264
+#: ../clients/common/settings-docs.h.in:270
 msgid "Open vSwitch DPDK device arguments."
 msgstr "Open vSwitch DPDK 设备�数。"
 
-#: ../clients/common/settings-docs.h.in:265
+#: ../clients/common/settings-docs.h.in:271
 msgid ""
 "The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or "
 "empty."
 msgstr "接�类型。\"internal\"�\"system\"�\"patch\"�\"dpdk\" 之一或留空。"
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:272
 msgid ""
 "Specifies the unicast destination IP address of a remote Open vSwitch bridge "
 "port to connect to."
 msgstr "指定�连接的远程 Open vSwitch 网桥端�的�播目标 IP 地�。"
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:273
 msgid "The time port must be inactive in order to be considered down."
 msgstr "端�被视为关闭所需�用的时间。"
 
-#: ../clients/common/settings-docs.h.in:268
-msgid "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
+#: ../clients/common/settings-docs.h.in:274
+msgid ""
+"Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr "绑定（Bonding）模�。\"active-backup\"�\"balance-slb\" 或 \"balance-tcp\" 之一。"
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:275
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr "端�开始��转�所需激活的时间。"
 
-#: ../clients/common/settings-docs.h.in:270
+#: ../clients/common/settings-docs.h.in:276
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "LACP 模�。\"active\"�\"off\" 或 \"passive\" 之一。"
 
-#: ../clients/common/settings-docs.h.in:271
+#: ../clients/common/settings-docs.h.in:277
 msgid "The VLAN tag in the range 0-4095."
 msgstr "VLAN 标记在 0～4095 范围内。"
 
-#: ../clients/common/settings-docs.h.in:272
+#: ../clients/common/settings-docs.h.in:278
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
 msgstr "VLAN 模�。\"access\"�\"native-tagged\"�\"native-untagged\"�\"trunk\" 之一或�设定。"
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:279
 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 the speed."
+"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 "
+"the speed."
 msgstr "如果�零，指示 pppd 设定串�到指定的波特率。�自动选择速度时此值通常�留为 0。"
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:280
 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 "
 "FALSE."
 msgstr "如果为 TRUE，指定 pppd 应设定串�以使用通过 RTS 和 CTS 信�的硬件��控制。此值通常应设为 FALSE。"
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:281
 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 "
 "\"lcp-echo-interval\" property must also be set to a non-zero value if this "
 "property is used."
-msgstr ""
-"如果�零，指示如果指定的 LCP 回�请求��未被节点回应时 pppd 就认定到节点的连接失败了。如果�使用此属性，\"lcp-echo-"
-"interval\" 属性也必须设为�零值。"
+msgstr "如果�零，指示如果指定的 LCP 回�请求��未被节点回应时 pppd 就认定到节点的连接失败了。如果�使用此属性，\"lcp-echo-interval\" 属性也必须设为�零值。"
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:282
 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 "
 "will respond to echo requests and some will not, and it is not possible to "
 "autodetect this."
-msgstr ""
-"如果�零，指示 pppd �几秒��一个 LCP 回�请求帧到节点（几秒为该属性指定）。注�有些 PPP "
-"节点将�应回�请求而有些�会，并且无法自动检测此行为。"
+msgstr "如果�零，指示 pppd �几秒��一个 LCP 回�请求帧到节点（几秒为该属性指定）。注�有些 PPP 节点将�应回�请求而有些�会，并且无法自动检测此行为。"
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:283
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr "如果为 TRUE，使用有状� MPPE。关于有状� MPPPE 的更多信�请查看 pppd 文档。"
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:284
 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 "
 "16384."
 msgstr "如果�零，指示 pppd 请求节点��的数�包��超过指定的大�。如果�零，MRU 应在 128 和 16384 之间。"
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:285
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
-""
 msgstr "如果�零，指示 pppd ����超过指定大�的数�包。"
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:286
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr "如果为 TRUE，将�请求压缩 Van Jacobsen TCP 首部。"
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
 "the remote side.  In almost all cases, this should be TRUE."
-msgstr ""
-"如果为 TRUE，�需�其他方（通常是 PPP �务器）验�自己到客户端。如果为 FALSE，需��自远端的验�。在大多数情况下，此属性应为 TRUE。"
+msgstr "如果为 TRUE，�需�其他方（通常是 PPP �务器）验�自己到客户端。如果为 FALSE，需��自远端的验�。在大多数情况下，此属性应为 TRUE。"
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:288
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "如果为 TURE，将�会请求 BSD 压缩。"
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:289
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "如果为 TURE，将�会请求 \"deflate\" 压缩。"
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:290
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "如果为 TRUE，将�会使用 CHAP 验�方法。"
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:291
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "如果为 TRUE，将�会使用 EAP 验�方法。"
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:292
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "如果为 TRUE，将�会使用 MSCHAP 验�方法。"
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:293
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "如果为 TRUE，将�会使用 MSCHAPv2 验�方法。"
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:294
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "如果为 TRUE，将�会使用 PAP 验�方法。"
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:295
 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 "
 "will fail.  Note that MPPE is not used on mobile broadband connections."
-msgstr ""
-"如果为 TRUE，PPP 会�将需� MPPE（微软点对点加密）。如果 64 �或 128 �的 MPPE 都��用，会�将失败。注� MPPE "
-"�用在移动宽带连接。"
+msgstr "如果为 TRUE，PPP 会�将需� MPPE（微软点对点加密）。如果 64 �或 128 �的 MPPE 都��用，会�将失败。注� MPPE �用在移动宽带连接。"
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:296
 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 "
 "TRUE.  If 128-bit MPPE is not available the session will fail."
-msgstr ""
-"如果为 TRUE，PPP 会�将需� MPPE（微软点对点加密）且 \"require-mppe\" 也必须设为 TRUE。如果 128 �的 MPPE "
-"��用，会�将失败。"
+msgstr "如果为 TRUE，PPP 会�将需� MPPE（微软点对点加密）且 \"require-mppe\" 也必须设为 TRUE。如果 128 �的 MPPE ��用，会�将失败。"
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:297
 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 "
 "activated on the interface specified in \"interface-name\" of "
 "NMSettingConnection."
-msgstr ""
-"如果给定了，指定此 PPPoE 连接应被创建在的上级接��。如果此属性未指定，连接将激活到 NMSettingConnection 的 "
-"\"interface-name\" 所指定的接�。"
+msgstr "如果给定了，指定此 PPPoE 连接应被创建在的上级接��。如果此属性未指定，连接将激活到 NMSettingConnection 的 \"interface-name\" 所指定的接�。"
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:298
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "用于 PPPoE �务验�的密�。"
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:300
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
 "should be left blank.  It is only required if there are multiple access "
 "concentrators or a specific service is known to be required."
-msgstr ""
-"如果指定了，指示 PPPoE "
-"��动与�供了指定�务的集线器的会�。对于大多数��商，此属性应留空。如果有多个集线器存在或者特定�务需�时，此属性�需�设定。"
+msgstr "如果指定了，指示 PPPoE ��动与�供了指定�务的集线器的会�。对于大多数��商，此属性应留空。如果有多个集线器存在或者特定�务需�时，此属性�需�设定。"
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:301
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "用于 PPPoE �务验�的用户�。"
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:302
 msgid "Whether the proxy configuration is for browser only."
 msgstr "代��置是��用于�览器。"
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:303
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr "代��置的方法，默认为 NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:304
 msgid "PAC script for the connection."
 msgstr "用于连接的 PAC 脚本。"
 
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:305
 msgid "PAC URL for obtaining PAC file."
 msgstr "用户获� PAC 文件的 PAC URL。"
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:306
 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 "
 "speed settings and use the highest available speed."
 msgstr "通过串�通信使用的速度。注�该值一般对移动宽带调制解调器没有效果，因为它们通常忽略速度设置并使用最高的�用速度。"
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:307
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "串�通信的字节宽度。以 \"8n1\" 中的 8 为例。"
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:308
 msgid "Parity setting of the serial port."
 msgstr "串�的奇�校验设置。"
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:309
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr "�次��字节到调制解调器的延迟时间，以微秒计。"
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:310
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
 msgstr "用在串�通信的�止�数�。�么是 1 �么是 2。以 \"8n1\" 中的 1 为例。"
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:311
 msgid ""
 "Whether to autoprobe virtual functions by a compatible driver. If set to "
 "NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver "
@@ -8262,61 +7935,48 @@ msgid ""
 "interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), "
 "the global default is used; in case the global default is unspecified it is "
 "assumed to be NM_TERNARY_TRUE (1)."
-msgstr ""
-"是�通过兼容的驱动程�自动探测虚拟功能（virtual function）。如果设为 NM_TERNARY_TRUE "
-"(1)，内核将�试绑定虚拟功能到兼容的驱动，而且如果�功，�个虚拟功能都将实例化一个新的网络接�。如果设为 NM_TERNARY_FALSE "
-"(0)，虚拟功能将�被声明且�会为它们创建网络接�。当设为 NM_TERNARY_DEFAULT (-1) "
-"时，使用全局默认值；全局默认未指定的情况下则�定为 NM_TERNARY_TRUE (1)。"
+msgstr "是�通过兼容的驱动程�自动探测虚拟功能（virtual function）。如果设为 NM_TERNARY_TRUE (1)，内核将�试绑定虚拟功能到兼容的驱动，而且如果�功，�个虚拟功能都将实例化一个新的网络接�。如果设为 NM_TERNARY_FALSE (0)，虚拟功能将�被声明且�会为它们创建网络接�。当设为 NM_TERNARY_DEFAULT (-1) 时，使用全局默认值；全局默认未指定的情况下则�定为 NM_TERNARY_TRUE (1)。"
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:312
 msgid ""
 "The total number of virtual functions to create. Note that when the sriov "
 "setting is present NetworkManager enforces the number of virtual functions "
 "on the interface also when it is zero. To prevent any changes to SR-IOV "
 "parameters don't add a sriov setting to the connection."
-msgstr ""
-"�创建的虚拟功能的总数。请注�，如果存在 sriov 设置（�使为 0），NetworkManager 都会强制实现在接�上的虚拟功能的数�。为了防止对 "
-"SR-IOV �数的任何改�，则���连接添加 sriov 设置。"
+msgstr "�创建的虚拟功能的总数。请注�，如果存在 sriov 设置（�使为 0），NetworkManager 都会强制实现在接�上的虚拟功能的数�。为了防止对 SR-IOV �数的任何改�，则���连接添加 sriov 设置。"
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:313
 msgid ""
 "Array of virtual function descriptors. Each VF descriptor is a dictionary "
 "mapping attribute names to GVariant values. The 'index' entry is mandatory "
-"for each VF. When represented as string a VF is in the form: \"INDEX [ATTR="
-"VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check="
-"true\". Multiple VFs can be specified using a comma as separator. Currently "
-"the following attributes are supported: mac, spoof-check, trust, min-tx-"
-"rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
+"for each VF. When represented as string a VF is in the form: \"INDEX "
+"[ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-"
+"check=true\". Multiple VFs can be specified using a comma as separator. "
+"Currently the following attributes are supported: mac, spoof-check, trust, "
+"min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a "
 "semicolon-separated list of VLAN descriptors, where each descriptor has the "
 "form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the "
 "default) or 'ad' for 802.1ad."
-msgstr ""
-"虚拟功能�述符阵列。�个虚拟功能�述符是个映射属性�到 GVariant 值的字典。\"index\" "
-"�目为�个虚拟功能的必填项。当表示为字符串时，虚拟功能的格�为：\"INDEX [ATTR=VALUE[ ATTR=VALUE]..."
-"]\"。例如：\"2 mac=00:11:22:33:44:55 spoof-check=true\"。\"vlans\" 属性表示为分�分隔的 "
-"VLAN �述符列表，其中�个�述符的格�为 \"ID[.PRIORITY[.PROTO]]\"。PROTO �以是用于 802.1Q（默认）的 "
-"\"q\" 或用于 802.1ad 的 \"ad\"。"
+msgstr "虚拟功能�述符阵列。�个虚拟功能�述符是个映射属性�到 GVariant 值的字典。\"index\" �目为�个虚拟功能的必填项。当表示为字符串时，虚拟功能的格�为：\"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\"。例如：\"2 mac=00:11:22:33:44:55 spoof-check=true\"。\"vlans\" 属性表示为分�分隔的 VLAN �述符列表，其中�个�述符的格�为 \"ID[.PRIORITY[.PROTO]]\"。PROTO �以是用于 802.1Q（默认）的 \"q\" 或用于 802.1ad 的 \"ad\"。"
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:314
 msgid "Array of TC queueing disciplines."
 msgstr "TC 排队规则阵列。"
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:315
 msgid "Array of TC traffic filters."
 msgstr "TC ��过滤器阵列。"
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:316
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
 "passed directly to teamd. If not specified, the default configuration is "
 "used.  See man teamd.conf for the format details."
-msgstr ""
-"组�（team）网络接�的 JSON �置。此属性应包�适用于 teamd 的原始 JSON �置，因为该值直接传递给 "
-"teamd。如果未指定则使用默认的�置。格�详情请�阅 teamd.conf 手册。"
+msgstr "组�（team）网络接�的 JSON �置。此属性应包�适用于 teamd 的原始 JSON �置，因为该值直接传递给 teamd。如果未指定则使用默认的�置。格�详情请�阅 teamd.conf 手册。"
 
-#: ../clients/common/settings-docs.h.in:311
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:335
 msgid ""
 "Link watchers configuration for the connection: each link watcher is defined "
 "by a dictionary, whose keys depend upon the selected link watcher. Available "
@@ -8326,166 +7986,150 @@ msgid ""
 "max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', "
 "'validate-active', 'validate-inactive', '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 页了解详细信�。"
+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.h.in:312
+#: ../clients/common/settings-docs.h.in:318
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "对应于 teamd mcast_rejoin.count。"
 
-#: ../clients/common/settings-docs.h.in:313
+#: ../clients/common/settings-docs.h.in:319
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "对应于 teamd mcast_rejoin.interval。"
 
-#: ../clients/common/settings-docs.h.in:314
+#: ../clients/common/settings-docs.h.in:320
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "对应于 teamd notify_peers.count。"
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:321
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "对应于 teamd notify_peers.interval。"
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:322
 msgid ""
 "Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", "
 "\"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\"."
-msgstr ""
-"对应于 teamd runner.name。�许的值为 \"roundrobin\"�\"broadcast\"�\"activebackup\"� "
-"\"loadbalance\"�\"lacp\"�\"random\"。"
+msgstr "对应于 teamd runner.name。�许的值为 \"roundrobin\"�\"broadcast\"�\"activebackup\"� \"loadbalance\"�\"lacp\"�\"random\"。"
 
-#: ../clients/common/settings-docs.h.in:317
+#: ../clients/common/settings-docs.h.in:323
 msgid "Corresponds to the teamd runner.active."
 msgstr "对应于 teamd runner.active。"
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:324
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "对应于 teamd runner.agg_select_policy。"
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:325
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "对应于 teamd runner.fast_rate。"
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:326
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "对应于 teamd runner.hwaddr_policy。"
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "对应于 teamd runner.min_ports。"
 
-#: ../clients/common/settings-docs.h.in:322
+#: ../clients/common/settings-docs.h.in:328
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "对应于 teamd runner.sys_prio。"
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "对应于 teamd runner.tx_balancer.name。"
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "对应于 teamd runner.tx_balancer.interval。"
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:331
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "对应于 teamd runner.tx_hash。"
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:332
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
 "directly to teamd. If not specified, the default configuration is used. See "
 "man teamd.conf for the format details."
-msgstr ""
-"组�（team）接�的 JSON �置。此属性应包�适用于 teamd 的原始 JSON �置，因为该值直接传递给 "
-"teamd。如果未指定则使用默认的�置。格�详情请�阅 teamd.conf 手册。"
+msgstr "组�（team）接�的 JSON �置。此属性应包�适用于 teamd 的原始 JSON �置，因为该值直接传递给 teamd。如果未指定则使用默认的�置。格�详情请�阅 teamd.conf 手册。"
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。"
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。"
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "对应于 teamd ports.PORTIFNAME.prio。"
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:337
 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.h.in:332
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "对应于 teamd ports.PORTIFNAME.sticky。"
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:339
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr "将拥有设备的组 ID。如果设为 NULL 则�个人都能使用设备。"
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:340
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
 "NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one."
-msgstr ""
-"虚拟设备的�作模�。�许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 NM_SETTING_TUN_MODE_TAP "
-"(2) 以创建类以太网的第二层设备。"
+msgstr "虚拟设备的�作模�。�许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 NM_SETTING_TUN_MODE_TAP (2) 以创建类以太网的第二层设备。"
 
-#: ../clients/common/settings-docs.h.in:335
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
 msgstr "如果属性设为 TRUE，接�将支�多个文件�述符（队列）以并行化数�包的��和接收，接�将�支��个队列。"
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:342
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr "将拥有设备的用户 ID。如果设为 NULL 则�个人都能使用设备。"
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:343
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
 msgstr "如果为 TRUE，接�将�置一个�述到数�包的物�接�的 4 字节首部。"
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:344
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
 msgstr "如果为 TRUE，隧�数�包的 IFF_VNET_HDR 将包�一个 virtio 网络首部。"
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:345
 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 "
 "support a strict ascii format, but the values can be arbitrary UTF8 strings "
 "up to a certain length."
-msgstr ""
-"包�用户数�的键/值对字典。此数�被网络管�器（NetworkManager）忽略且�被用户��使用。键�支�严格的 ASCII "
-"格�，但是值�以为长度有�的任� UTF8 字符串。"
+msgstr "包�用户数�的键/值对字典。此数�被网络管�器（NetworkManager）忽略且�被用户��使用。键�支�严格的 ASCII 格�，但是值�以为长度有�的任� UTF8 字符串。"
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:346
 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\" and \"to\" are unsigned integers, ie \"7:3\"."
-msgstr ""
-"用于传出的数�包，从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:到\" 的格�给定，其中 \"从\" 和 \"到\" "
-"都是无符�整数，如 \"7:3\"。"
+"priorities.  The mapping is given in the format \"from:to\" where both \"from"
+"\" and \"to\" are unsigned integers, ie \"7:3\"."
+msgstr "用于传出的数�包，从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:到\" 的格�给定，其中 \"从\" 和 \"到\" 都是无符�整数，如 \"7:3\"。"
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:347
 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 "
@@ -8496,76 +8140,63 @@ msgid ""
 "NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward "
 "compatibility, the default-value in the D-Bus API continues to be 0 and a "
 "missing property on D-Bus is still considered as 0."
-msgstr ""
-"控制 VLAN 接�的行为和功能的一个或多个标志。标识包� NM_VLAN_FLAG_REORDER_HEADERS "
-"(0x1)（�新排�输出数�包首部）�NM_VLAN_FLAG_GVRP (0x2)（使用 GVRP "
-"�议）�NM_VLAN_FLAG_LOOSE_BINDING (0x4)（接�到它主设备�行状�的�散绑定）和 NM_VLAN_FLAG_MVRP "
-"(0x8)（使用 MVRP �议）。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS，但它以�是 0。为了����兼容性，D-"
-"Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时�视为 0。"
+msgstr "控制 VLAN 接�的行为和功能的一个或多个标志。标识包� NM_VLAN_FLAG_REORDER_HEADERS (0x1)（�新排�输出数�包首部）�NM_VLAN_FLAG_GVRP (0x2)（使用 GVRP �议）�NM_VLAN_FLAG_LOOSE_BINDING (0x4)（接�到它主设备�行状�的�散绑定）和 NM_VLAN_FLAG_MVRP (0x8)（使用 MVRP �议）。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS，但它以�是 0。为了����兼容性，D-Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时�视为 0。"
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:348
 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."
 msgstr "由此连接创建的接�应该分�的 VLAN 标识符。有效范围为从 0 到 4094，�包括�留的 ID 4095。"
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:349
 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\" and \"to\" are unsigned integers, ie \"7:3\"."
-msgstr ""
-"用于传入的数�包，从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:到\" 的格�给定，其中 \"从\" 和 \"到\" "
-"都是无符�整数，如 \"7:3\"。"
+"priorities.  The mapping is given in the format \"from:to\" where both \"from"
+"\" and \"to\" are unsigned integers, ie \"7:3\"."
+msgstr "用于传入的数�包，从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:到\" 的格�给定，其中 \"从\" 和 \"到\" 都是无符�整数，如 \"7:3\"。"
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:350
 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 "
 "specified, the connection must contain an \"802-3-ethernet\" setting with a "
 "\"mac-address\" property."
-msgstr ""
-"如果给定了，其指定从此 VLAN 接�应该创建自的上级接��称或上级连接的 UUID。如果此属性未指定，该连接必须包�具有 \"mac-"
-"address\" 属性的 \"802-3-ethernet\" 设置。"
+msgstr "如果给定了，其指定从此 VLAN 接�应该创建自的上级接��称或上级连接的 UUID。如果此属性未指定，该连接必须包�具有 \"mac-address\" 属性的 \"802-3-ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
 msgstr "VPN �件特定数�的键/值对字典。键和值都必须为字符串。"
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:352
 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 "
 "explicitly disconnected."
 msgstr "如果 VPN �务支��久连接，并且此属性为 TRUE，VPN 将�试在链路更改和中断的整个期间都��连接，直到手动断开连接。"
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
 msgstr "VPN �件指定如密�或密钥的密钥（secret）的键/值对字典。键和值都必须为字符串。"
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:354
 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."
-msgstr ""
-"此连接用于连接到它网络的 VPN �件的 D-Bus �务�。例如 org.freedesktop.NetworkManager.vpnc 用于 "
-"vpnc �件。"
+msgstr "此连接用于连接到它网络的 VPN �件的 D-Bus �务�。例如 org.freedesktop.NetworkManager.vpnc 用于 vpnc �件。"
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:355
 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 "
 "is 60 seconds (unless overridden by vpn.timeout in configuration file). "
 "Values greater than zero mean timeout in seconds."
-msgstr ""
-"VPN �务建立连接的超时时间。有些�务�能需�很多时间�能连接。值 0 表示默认的超时，� 60 秒（除�被�置文件中的 vpn.timeout "
-"覆盖）。大于零的值表示以秒计算的超时时间。"
+msgstr "VPN �务建立连接的超时时间。有些�务�能需�很多时间�能连接。值 0 表示默认的超时，� 60 秒（除�被�置文件中的 vpn.timeout 覆盖）。大于零的值表示以秒计算的超时时间。"
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:356
 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 "
@@ -8573,139 +8204,131 @@ msgid ""
 "this property empty.  If this property is empty, NetworkManager will "
 "automatically supply the username of the user which requested the VPN "
 "connection."
-msgstr ""
-"如果 VPN 连接需�用户�用于验�，应在这里�供。如果连接�用于多个用户，且 VPN "
-"需��个用户�供个��的�称，那么让此属性留空。如果此属性留空，网络管�器（NetworkManager）将自动�供 VPN 连接所需�用户的用户�。"
+msgstr "如果 VPN 连接需�用户�用于验�，应在这里�供。如果连接�用于多个用户，且 VPN 需��个用户�供个��的�称，那么让此属性留空。如果此属性留空，网络管�器（NetworkManager）将自动�供 VPN 连接所需�用户的用户�。"
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:357
 msgid "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "指定内核已获知 FDB �目的生存期，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
 msgstr "指定连接到远程 VXLAN 隧�端点的 UDP 目标端�。"
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr "指定�使用的 VXLAN 网络标识符（或 VXLAN 分段标识符）。"
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:360
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "指定是�生�网络链路 LL ADDR 未命中通知。"
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:361
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "指定是�生�网络链路 IP ADDR 未命中通知。"
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
 msgstr "指定是�让未知��的链路层地�和 IP 地�输入进 VXLAN 设备转�数�库。"
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
 msgstr "指定 FDB �目的最大数�。零值表示�许内核存储���的�目。"
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:364
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr "如果给定，指定�在传出数�包使用的�� IP 地�。"
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr "如果给定了，其指定上级接��称或上级连接的 UUID。"
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:366
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "指定是�打开 ARP 代�。"
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:367
 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 "
 "forwarding database, or the multicast IP address to join."
 msgstr "指定当目标链路层地�在 VXLAN 设备转�数�库中未知时�在传出数�包中使用的�播目标 IP 地�，或者�加入的多播 IP 地�。"
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:368
 msgid "Specifies whether route short circuit is turned on."
 msgstr "指定是�打开路由短路。"
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr "指定连接到远程 VXLAN 隧�端点的最大 UDP ��端�。"
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:370
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr "指定连接到远程 VXLAN 隧�端点的最� UDP ��端�。"
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "指定�在传出数�包使用的 TOS 值。"
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:372
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr "指定�在传出数�包使用的存活时间值。"
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "The P2P device that should be connected to. Currently this is the only way "
 "to create or join a group."
 msgstr "应该连接到的 P2P 设备。目�，这是唯一创建或加入一个组的方法。"
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:374
 msgid ""
 "The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display "
 "requires a protocol specific information element to be set in certain Wi-Fi "
 "frames. These can be specified here for the purpose of establishing a "
 "connection. This setting is only useful when implementing a Wi-Fi Display "
 "client."
-msgstr ""
-"�设置的 WFD（Wi-Fi Display）IE（Information Elements）。WFD 需�在特定 Wi-Fi "
-"数�帧中设置一个特定于�议的 IE。它们�以在这里设置�建立连接。这个设置�在实现一个 WFD 客户端时有用。"
+msgstr "�设置的 WFD（Wi-Fi Display）IE（Information Elements）。WFD 需�在特定 Wi-Fi 数�帧中设置一个特定于�议的 IE。它们�以在这里设置�建立连接。这个设置�在实现一个 WFD 客户端时有用。"
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "Flags indicating which mode of WPS is to be used. There's little point in "
 "changing the default setting as NetworkManager will automatically determine "
 "the best method to use."
-msgstr ""
-"指示使用哪� WPS 模�（如果�用）的标志。由于网络管�器（NetworkManager）会自动决定�使用的最佳方法，因此改�默认设置几乎没有�义。"
+msgstr "指示使用哪� WPS 模�（如果�用）的标志。由于网络管�器（NetworkManager）会自动决定�使用的最佳方法，因此改�默认设置几乎没有�义。"
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:376
 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 "
 "(known as MAC spoofing). Deprecated: 1"
 msgstr "如指定了，此连接将�应用到其 MAC 地�符�的 WiMAX 设备。此属性�会改�设备的 MAC 地�（�� MAC 欺骗）。已弃用：1"
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:377
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
 msgstr "此连接应使用的 WiMAX 网络�务�供商（NSP）的�称。已弃用：1"
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:378
 msgid ""
 "The use of fwmark is optional and is by default off. Setting it to 0 "
 "disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that "
 "\"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to "
 "automatically choose a fwmark."
-msgstr ""
-"使用 fwmark 是�选的，它在默认情况下被�用。如果把它设为 0，则代表被�用，其他情况下，它是一个用于出站数�包的 32 � "
-"fwmark。请注�，如果 \"ip4-auto-default-route\" 或 \"ip6-auto-default-route\" "
-"已�用，则�味�自动选择一个 fwmark。"
+msgstr "使用 fwmark 是�选的，它在默认情况下被�用。如果把它设为 0，则代表被�用，其他情况下，它是一个用于出站数�包的 32 � fwmark。请注�，如果 \"ip4-auto-default-route\" 或 \"ip6-auto-default-route\" 已�用，则�味�自动选择一个 fwmark。"
 
-#: ../clients/common/settings-docs.h.in:373
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Whether to enable special handling of the IPv4 default route. If enabled, "
 "the IPv4 default route will be placed to a dedicated routing-table and two "
@@ -8715,3634 +8338,3654 @@ msgid ""
 "Table=auto. Leaving this at the default will enable this option "
 "automatically if ipv4.never-default is not set and there are any peers that "
 "use a default-route as allowed-ips."
-msgstr ""
-"是��用 IPv4 默认路由的特殊处�。 如果�用，IPv4 默认路由将被放置到专用路由表中，并将添加两个策略路由规则。 fwmark "
-"编�也用作默认路由的路由表，如果 fwmark 为零，则自动选择未使用的 fwmark/table。 这与 wg-quick 设置了 Table = "
-"auto 的作用相�。如果 ipv4.never-default 没有设置且有使用 default-route 作为 allowed-ips 的 "
-"peer 存在时，将此值�留为默认值将自动�用此选项。"
+msgstr "是��用 IPv4 默认路由的特殊处�。 如果�用，IPv4 默认路由将被放置到专用路由表中，并将添加两个策略路由规则。 fwmark 编�也用作默认路由的路由表，如果 fwmark 为零，则自动选择未使用的 fwmark/table。 这与 wg-quick 设置了 Table = auto 的作用相�。如果 ipv4.never-default 没有设置且有使用 default-route 作为 allowed-ips 的 peer 存在时，将此值�留为默认值将自动�用此选项。"
 
-#: ../clients/common/settings-docs.h.in:374
+#: ../clients/common/settings-docs.h.in:380
 msgid "Like ip4-auto-default-route, but for the IPv6 default route."
 msgstr "与 ip4-auto-default-route 相�，但针对于 IPv6 默认路由。"
 
-#: ../clients/common/settings-docs.h.in:375
+#: ../clients/common/settings-docs.h.in:381
 msgid ""
 "The listen-port. If listen-port is not specified, the port will be chosen "
 "randomly when the interface comes up."
 msgstr "listen-port。如果 listen-port 没有被指定，则会在接�使用�机选择端�。"
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:382
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments. If zero a default MTU is "
 "used. Note that contrary to wg-quick's MTU setting, this does not take into "
 "account the current routes at the time of activation."
-msgstr ""
-"如果�零，�传输指定大�或更�的数�包，大的数�包会被分�多个以太网帧。如果为 0， 则使用默认的 MTU。请注�，与 wg-quick 的 MTU "
-"��，它�会考虑在激活时当�的路由。"
+msgstr "如果�零，�传输指定大�或更�的数�包，大的数�包会被分�多个以太网帧。如果为 0， 则使用默认的 MTU。请注�，与 wg-quick 的 MTU ��，它�会考虑在激活时当�的路由。"
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:383
 msgid ""
 "Whether to automatically add routes for the AllowedIPs ranges of the peers. "
 "If TRUE (the default), NetworkManager will automatically add routes in the "
 "routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, "
 "no such routes are added automatically. In this case, the user may want to "
 "configure static routes in ipv4.routes and ipv6.routes, respectively."
-msgstr ""
-"是�为 peer 的 AllowedIPs 范围自动添加路由。如果为 TRUE (默认设置)，NetworkManager 会根� ipv4.route-"
-"table 和 ipv6.route-table 在路由表中自动添加路由。如果为 FALSE，�会自动添加路由。在这�情况下，用户需�分别在 ipv4."
-"routes 和  ipv6.routes 中添加��路由。"
+msgstr "是�为 peer 的 AllowedIPs 范围自动添加路由。如果为 TRUE (默认设置)，NetworkManager 会根� ipv4.route-table 和 ipv6.route-table 在路由表中自动添加路由。如果为 FALSE，�会自动添加路由。在这�情况下，用户需�分别在 ipv4.routes 和  ipv6.routes 中添加��路由。"
 
-#: ../clients/common/settings-docs.h.in:378
+#: ../clients/common/settings-docs.h.in:384
 msgid "The 256 bit private-key in base64 encoding."
 msgstr "以 base64 编�的 256 为�钥。"
 
-#: ../clients/common/settings-docs.h.in:379
+#: ../clients/common/settings-docs.h.in:385
 msgid "Flags indicating how to handle the \"private-key\" property."
 msgstr "指示如何处� \"private-key\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:380
+#: ../clients/common/settings-docs.h.in:386
 msgid ""
 "IEEE 802.15.4 channel. A positive integer or -1, meaning \"do not set, use "
 "whatever the device is already set to\"."
 msgstr "IEEE 802.15.4 频�。一个正整数，或 -1 �味�“�设置，使用设置的设置�。"
 
-#: ../clients/common/settings-docs.h.in:381
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) "
 "MAC layer device whose permanent MAC address matches."
 msgstr "如果指定了，此连接将�应用到其永久 MAC 地�匹�的 IEEE 802.15.4 (WPAN) MAC 层设备。"
 
-#: ../clients/common/settings-docs.h.in:382
+#: ../clients/common/settings-docs.h.in:388
 msgid ""
 "IEEE 802.15.4 channel page. A positive integer or -1, meaning \"do not set, "
 "use whatever the device is already set to\"."
 msgstr "IEEE 802.15.4 频�页。一个正整数，或 -1 �味�“�设置，使用设备的设置�。"
 
-#: ../clients/common/settings-docs.h.in:383
+#: ../clients/common/settings-docs.h.in:389
 msgid "IEEE 802.15.4 Personal Area Network (PAN) identifier."
 msgstr "IEEE 802.15.4 个人区域网络（PAN）标识符。"
 
-#: ../clients/common/settings-docs.h.in:384
-msgid ""
-"Short IEEE 802.15.4 address to be used within a restricted environment."
+#: ../clients/common/settings-docs.h.in:390
+msgid "Short IEEE 802.15.4 address to be used within a restricted environment."
 msgstr "在��环境中使用的短 IEEE 802.15.4 地�。"
 
-#: ../clients/nm-online.c:89
+#: ../clients/nm-online.c:75
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../clients/nm-online.c:205
+#: ../clients/nm-online.c:191
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr "错误：创建 NMClient 对象时超时\n"
 
-#: ../clients/nm-online.c:225
+#: ../clients/nm-online.c:211
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "错误：无法创建 NMClient 对象：%s\n"
 
-#: ../clients/nm-online.c:251
+#: ../clients/nm-online.c:237
 msgid "Don't print anything"
 msgstr "�输出任何结果"
 
-#: ../clients/nm-online.c:252
+#: ../clients/nm-online.c:238
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "等待网络管�器�动而�是连接"
 
-#: ../clients/nm-online.c:253
+#: ../clients/nm-online.c:239
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
 msgstr "等待连接时间，以秒计（没有该选项时，默认为 30）"
 
-#: ../clients/nm-online.c:254
+#: ../clients/nm-online.c:240
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "如果网络管�器未�行或连接则立�退出"
 
-#: ../clients/nm-online.c:274
+#: ../clients/nm-online.c:260
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr "等待网络管�完�激活�动网络连接。"
 
-#: ../clients/nm-online.c:281 ../clients/nm-online.c:287
+#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr "无效选项。请使用 --help 查看有效选项列表。"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:175 ../clients/tui/nmt-editor.c:432
-#: ../clients/tui/nmt-password-dialog.c:173
-#: ../clients/tui/nmt-route-editor.c:121 ../clients/tui/nmtui-hostname.c:68
-#: ../clients/tui/nmtui.c:133
+#: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
+#: ../clients/tui/nmt-password-dialog.c:161
+#: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
+#: ../clients/tui/nmtui.c:121
 msgid "OK"
 msgstr "确定"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:323
-#: ../clients/tui/newt/nmt-newt-utils.c:355
+#: ../clients/tui/newt/nmt-newt-utils.c:311
+#: ../clients/tui/newt/nmt-newt-utils.c:343
 #, c-format
 msgid "Could not create temporary file: %s"
 msgstr "无法创建临时文件：%s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:361
+#: ../clients/tui/newt/nmt-newt-utils.c:349
 #, c-format
 msgid "Editor failed: %s"
 msgstr "编辑器失败：%s"
 
-#: ../clients/tui/newt/nmt-newt-utils.c:367
+#: ../clients/tui/newt/nmt-newt-utils.c:355
 #, c-format
 msgid "Could not re-read file: %s"
 msgstr "无法�新读�文件：%s"
 
-#: ../clients/tui/nm-editor-utils.c:152 ../libnm/nm-device.c:1379
+#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
 msgid "Ethernet"
 msgstr "以太网"
 
-#: ../clients/tui/nm-editor-utils.c:156
+#: ../clients/tui/nm-editor-utils.c:144
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "以太网连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:160 ../libnm/nm-device.c:1381
+#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/tui/nm-editor-utils.c:164
+#: ../clients/tui/nm-editor-utils.c:152
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:169 ../libnm-core/nm-connection.c:2742
-#: ../libnm/nm-device.c:1397
+#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
+#: ../libnm/nm-device.c:1473
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:173
+#: ../clients/tui/nm-editor-utils.c:161
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:178 ../libnm/nm-device.c:1395
+#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
-#: ../clients/tui/nm-editor-utils.c:181
+#: ../clients/tui/nm-editor-utils.c:169
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "移动宽带连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:187 ../clients/tui/nmt-page-dsl.c:61
+#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:191
+#: ../clients/tui/nm-editor-utils.c:179
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:196 ../libnm-core/nm-connection.c:2734
-#: ../libnm/nm-device.c:1399
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4935
+#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
+#: ../libnm/nm-device.c:1475
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
 msgid "Bond"
 msgstr "绑定"
 
-#: ../clients/tui/nm-editor-utils.c:200
+#: ../clients/tui/nm-editor-utils.c:188
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:205 ../libnm-core/nm-connection.c:2738
-#: ../libnm/nm-device.c:1403
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5290
+#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
+#: ../libnm/nm-device.c:1479
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
 msgid "Bridge"
 msgstr "网桥"
 
-#: ../clients/tui/nm-editor-utils.c:210
+#: ../clients/tui/nm-editor-utils.c:198
 #, c-format
 msgid "Bridge connection %d"
 msgstr "网桥连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:214 ../libnm-core/nm-connection.c:2736
-#: ../libnm/nm-device.c:1401
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5008
+#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
+#: ../libnm/nm-device.c:1477
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
 msgid "Team"
 msgstr "组�"
 
-#: ../clients/tui/nm-editor-utils.c:219
+#: ../clients/tui/nm-editor-utils.c:207
 #, c-format
 msgid "Team connection %d"
 msgstr "组�连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:223 ../clients/tui/nmt-page-vlan.c:81
-#: ../libnm-core/nm-connection.c:2740 ../libnm/nm-device.c:1405
+#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
+#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:227
+#: ../clients/tui/nm-editor-utils.c:215
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:231 ../clients/tui/nmt-page-ip-tunnel.c:135
+#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
 msgid "IP tunnel"
 msgstr "IP 隧�"
 
-#: ../clients/tui/nm-editor-utils.c:235
+#: ../clients/tui/nm-editor-utils.c:223
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP 隧�连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:250
+#: ../clients/tui/nm-editor-utils.c:238
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 连接 %d"
 
-#: ../clients/tui/nmt-device-entry.c:367
+#: ../clients/tui/nmt-device-entry.c:355
 msgid "Select..."
 msgstr "选择..."
 
-#: ../clients/tui/nmt-edit-connection-list.c:109
+#: ../clients/tui/nmt-edit-connection-list.c:97
 msgid "Add"
 msgstr "添加"
 
-#: ../clients/tui/nmt-edit-connection-list.c:112
-#: ../clients/tui/nmt-page-ip4.c:168 ../clients/tui/nmt-page-ip6.c:167
-#: ../clients/tui/nmt-page-team-port.c:108 ../clients/tui/nmt-page-team.c:172
+#: ../clients/tui/nmt-edit-connection-list.c:100
+#: ../clients/tui/nmt-page-ip4.c:156 ../clients/tui/nmt-page-ip6.c:155
+#: ../clients/tui/nmt-page-team-port.c:96 ../clients/tui/nmt-page-team.c:160
 msgid "Edit..."
 msgstr "编辑..."
 
-#: ../clients/tui/nmt-edit-connection-list.c:115
-#: ../clients/tui/nmtui-edit.c:528
+#: ../clients/tui/nmt-edit-connection-list.c:103
+#: ../clients/tui/nmtui-edit.c:516
 msgid "Delete"
 msgstr "删除"
 
-#: ../clients/tui/nmt-editor-section.c:102
+#: ../clients/tui/nmt-editor-section.c:90
 msgid "Hide"
 msgstr "��"
 
-#: ../clients/tui/nmt-editor-section.c:102
+#: ../clients/tui/nmt-editor-section.c:90
 msgid "Show"
 msgstr "显示"
 
-#: ../clients/tui/nmt-editor.c:99
+#: ../clients/tui/nmt-editor.c:87
 #, c-format
 msgid "Could not create editor for connection '%s' of type '%s'."
 msgstr "无法为类型 \"%s\" 的连接 \"%s\" 创建编辑器。"
 
-#: ../clients/tui/nmt-editor.c:103
+#: ../clients/tui/nmt-editor.c:91
 #, c-format
 msgid "Could not create editor for invalid connection '%s'."
 msgstr "无法为无效的连接 \"%s\" 创建编辑器。"
 
-#: ../clients/tui/nmt-editor.c:113
+#: ../clients/tui/nmt-editor.c:101
 msgid "Edit Connection"
 msgstr "编辑连接"
 
-#: ../clients/tui/nmt-editor.c:174
+#: ../clients/tui/nmt-editor.c:162
 #, c-format
 msgid "Unable to save connection: %s"
 msgstr "无法�存连接：%s"
 
-#: ../clients/tui/nmt-editor.c:188
+#: ../clients/tui/nmt-editor.c:176
 #, c-format
 msgid "Unable to add new connection: %s"
 msgstr "无法添加新连接：%s"
 
-#: ../clients/tui/nmt-editor.c:335
+#: ../clients/tui/nmt-editor.c:323
 msgid "Profile name"
 msgstr "�置集�称"
 
-#: ../clients/tui/nmt-editor.c:346
+#: ../clients/tui/nmt-editor.c:334
 msgid "Ethernet device"
 msgstr "以太网设备"
 
-#: ../clients/tui/nmt-editor.c:348
+#: ../clients/tui/nmt-editor.c:336
 msgid "Device"
 msgstr "设备"
 
 #. And finally the bottom widgets
-#: ../clients/tui/nmt-editor.c:408
+#: ../clients/tui/nmt-editor.c:396
 msgid "Automatically connect"
 msgstr "自动连接"
 
-#: ../clients/tui/nmt-editor.c:414
+#: ../clients/tui/nmt-editor.c:402
 msgid "Available to all users"
 msgstr "对所有用户有效"
 
-#: ../clients/tui/nmt-editor.c:429 ../clients/tui/nmt-password-dialog.c:170
-#: ../clients/tui/nmt-route-editor.c:114 ../clients/tui/nmtui-edit.c:219
-#: ../clients/tui/nmtui-edit.c:527 ../clients/tui/nmtui-hostname.c:66
+#: ../clients/tui/nmt-editor.c:417 ../clients/tui/nmt-password-dialog.c:158
+#: ../clients/tui/nmt-route-editor.c:102 ../clients/tui/nmtui-edit.c:207
+#: ../clients/tui/nmtui-edit.c:515 ../clients/tui/nmtui-hostname.c:54
 msgid "Cancel"
 msgstr "�消"
 
-#: ../clients/tui/nmt-mtu-entry.c:83
+#: ../clients/tui/nmt-mtu-entry.c:71
 msgid "(default)"
 msgstr "（默认）"
 
-#: ../clients/tui/nmt-mtu-entry.c:85 ../clients/tui/nmt-mtu-entry.c:116
+#: ../clients/tui/nmt-mtu-entry.c:73 ../clients/tui/nmt-mtu-entry.c:104
 msgid "bytes"
 msgstr "字节"
 
-#: ../clients/tui/nmt-page-bond.c:87
+#: ../clients/tui/nmt-page-bond.c:75
 msgid "Round-robin"
 msgstr "轮询"
 
-#: ../clients/tui/nmt-page-bond.c:88
+#: ../clients/tui/nmt-page-bond.c:76
 msgid "Active Backup"
 msgstr "热备"
 
-#: ../clients/tui/nmt-page-bond.c:89
+#: ../clients/tui/nmt-page-bond.c:77
 msgid "XOR"
 msgstr "异或"
 
-#: ../clients/tui/nmt-page-bond.c:90
+#: ../clients/tui/nmt-page-bond.c:78
 msgid "Broadcast"
 msgstr "广播"
 
-#: ../clients/tui/nmt-page-bond.c:91
+#: ../clients/tui/nmt-page-bond.c:79
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../clients/tui/nmt-page-bond.c:92
+#: ../clients/tui/nmt-page-bond.c:80
 msgid "Adaptive Transmit Load Balancing (tlb)"
 msgstr "自适应传输负载�衡（tlb）"
 
-#: ../clients/tui/nmt-page-bond.c:93
+#: ../clients/tui/nmt-page-bond.c:81
 msgid "Adaptive Load Balancing (alb)"
 msgstr "自适应负载�衡（alb）"
 
-#: ../clients/tui/nmt-page-bond.c:99
+#: ../clients/tui/nmt-page-bond.c:87
 msgid "MII (recommended)"
 msgstr "MII（推�）"
 
-#: ../clients/tui/nmt-page-bond.c:100
+#: ../clients/tui/nmt-page-bond.c:88
 msgid "ARP"
 msgstr "ARP"
 
-#: ../clients/tui/nmt-page-bond.c:361
+#: ../clients/tui/nmt-page-bond.c:349
 msgid "BOND"
 msgstr "绑定"
 
-#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-bridge.c:84
-#: ../clients/tui/nmt-page-team.c:151
+#: ../clients/tui/nmt-page-bond.c:353 ../clients/tui/nmt-page-bridge.c:72
+#: ../clients/tui/nmt-page-team.c:139
 msgid "Slaves"
 msgstr "从机"
 
-#: ../clients/tui/nmt-page-bond.c:377 ../clients/tui/nmt-page-ip-tunnel.c:147
-#: ../clients/tui/nmt-page-wifi.c:229
+#: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
+#: ../clients/tui/nmt-page-wifi.c:218
 msgid "Mode"
 msgstr "模�"
 
-#: ../clients/tui/nmt-page-bond.c:383
+#: ../clients/tui/nmt-page-bond.c:371
 msgid "Primary"
 msgstr "主机"
 
-#: ../clients/tui/nmt-page-bond.c:389
+#: ../clients/tui/nmt-page-bond.c:377
 msgid "Link monitoring"
 msgstr "链路监测"
 
-#: ../clients/tui/nmt-page-bond.c:395 ../clients/tui/nmt-page-bond.c:402
-#: ../clients/tui/nmt-page-bond.c:409 ../clients/tui/nmt-page-bond.c:416
+#: ../clients/tui/nmt-page-bond.c:383 ../clients/tui/nmt-page-bond.c:390
+#: ../clients/tui/nmt-page-bond.c:397 ../clients/tui/nmt-page-bond.c:404
 msgctxt "milliseconds"
 msgid "ms"
 msgstr "毫秒"
 
-#: ../clients/tui/nmt-page-bond.c:396 ../clients/tui/nmt-page-bond.c:417
+#: ../clients/tui/nmt-page-bond.c:384 ../clients/tui/nmt-page-bond.c:405
 msgid "Monitoring frequency"
 msgstr "监控频率"
 
-#: ../clients/tui/nmt-page-bond.c:403
+#: ../clients/tui/nmt-page-bond.c:391
 msgid "Link up delay"
 msgstr "链路开�延时"
 
-#: ../clients/tui/nmt-page-bond.c:410
+#: ../clients/tui/nmt-page-bond.c:398
 msgid "Link down delay"
 msgstr "链路关闭延时"
 
-#: ../clients/tui/nmt-page-bond.c:423
+#: ../clients/tui/nmt-page-bond.c:411
 msgid "ARP targets"
 msgstr "ARP 目标"
 
-#: ../clients/tui/nmt-page-bond.c:430 ../clients/tui/nmt-page-ethernet.c:76
-#: ../clients/tui/nmt-page-vlan.c:109 ../clients/tui/nmt-page-wifi.c:363
+#: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
 msgid "Cloned MAC address"
 msgstr "克隆的 MAC 地�"
 
-#: ../clients/tui/nmt-page-bridge-port.c:59
+#: ../clients/tui/nmt-page-bridge-port.c:47
 msgid "BRIDGE PORT"
 msgstr "网桥端�"
 
-#: ../clients/tui/nmt-page-bridge-port.c:66
-#: ../clients/tui/nmt-page-bridge.c:117
+#: ../clients/tui/nmt-page-bridge-port.c:54
+#: ../clients/tui/nmt-page-bridge.c:105
 msgid "Priority"
 msgstr "优先级"
 
-#: ../clients/tui/nmt-page-bridge-port.c:72
+#: ../clients/tui/nmt-page-bridge-port.c:60
 msgid "Path cost"
 msgstr "路径开销"
 
-#: ../clients/tui/nmt-page-bridge-port.c:74
+#: ../clients/tui/nmt-page-bridge-port.c:62
 msgid "Hairpin mode"
 msgstr "Hairpin 模�"
 
-#: ../clients/tui/nmt-page-bridge.c:80
+#: ../clients/tui/nmt-page-bridge.c:68
 msgid "BRIDGE"
 msgstr "网桥"
 
-#: ../clients/tui/nmt-page-bridge.c:95 ../clients/tui/nmt-page-bridge.c:126
-#: ../clients/tui/nmt-page-bridge.c:136 ../clients/tui/nmt-page-bridge.c:146
+#: ../clients/tui/nmt-page-bridge.c:83 ../clients/tui/nmt-page-bridge.c:114
+#: ../clients/tui/nmt-page-bridge.c:124 ../clients/tui/nmt-page-bridge.c:134
 msgid "seconds"
 msgstr "秒"
 
-#: ../clients/tui/nmt-page-bridge.c:96
+#: ../clients/tui/nmt-page-bridge.c:84
 msgid "Aging time"
 msgstr "�化时间"
 
-#: ../clients/tui/nmt-page-bridge.c:98
+#: ../clients/tui/nmt-page-bridge.c:86
 msgid "Enable IGMP snooping"
 msgstr "�用 IGMP 监�"
 
-#: ../clients/tui/nmt-page-bridge.c:104
+#: ../clients/tui/nmt-page-bridge.c:92
 msgid "Enable STP (Spanning Tree Protocol)"
 msgstr "�用 STP（生�树�议）"
 
-#: ../clients/tui/nmt-page-bridge.c:127
+#: ../clients/tui/nmt-page-bridge.c:115
 msgid "Forward delay"
 msgstr "转�延时"
 
-#: ../clients/tui/nmt-page-bridge.c:137
+#: ../clients/tui/nmt-page-bridge.c:125
 msgid "Hello time"
 msgstr "问候时间"
 
-#: ../clients/tui/nmt-page-bridge.c:147
+#: ../clients/tui/nmt-page-bridge.c:135
 msgid "Max age"
 msgstr "最大寿命"
 
-#: ../clients/tui/nmt-page-bridge.c:153
+#: ../clients/tui/nmt-page-bridge.c:141
 msgid "Group forward mask"
 msgstr "组��掩�"
 
-#: ../clients/tui/nmt-page-ethernet.c:69
+#: ../clients/tui/nmt-page-ethernet.c:57
 msgid "ETHERNET"
 msgstr "以太网"
 
-#: ../clients/tui/nmt-page-ethernet.c:82
-#: ../clients/tui/nmt-page-infiniband.c:93
-#: ../clients/tui/nmt-page-ip-tunnel.c:185 ../clients/tui/nmt-page-vlan.c:115
-#: ../clients/tui/nmt-page-wifi.c:369
+#: ../clients/tui/nmt-page-ethernet.c:70
+#: ../clients/tui/nmt-page-infiniband.c:81
+#: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
+#: ../clients/tui/nmt-page-wifi.c:359
 msgid "MTU"
 msgstr "MTU"
 
-#: ../clients/tui/nmt-page-infiniband.c:46
+#: ../clients/tui/nmt-page-infiniband.c:34
 msgid "Datagram"
 msgstr "数�报"
 
-#: ../clients/tui/nmt-page-infiniband.c:47
+#: ../clients/tui/nmt-page-infiniband.c:35
 msgid "Connected"
 msgstr "已连接"
 
-#: ../clients/tui/nmt-page-infiniband.c:80
+#: ../clients/tui/nmt-page-infiniband.c:68
 msgid "INFINIBAND"
 msgstr "INFINIBAND"
 
-#: ../clients/tui/nmt-page-infiniband.c:87
+#: ../clients/tui/nmt-page-infiniband.c:75
 msgid "Transport mode"
 msgstr "传输模�"
 
-#: ../clients/tui/nmt-page-ip4.c:37 ../clients/tui/nmt-page-ip6.c:42
+#: ../clients/tui/nmt-page-ip4.c:25 ../clients/tui/nmt-page-ip6.c:30
 msgid "Disabled"
 msgstr "�用"
 
-#: ../clients/tui/nmt-page-ip4.c:38 ../clients/tui/nmt-page-ip6.c:38
+#: ../clients/tui/nmt-page-ip4.c:26 ../clients/tui/nmt-page-ip6.c:26
 msgid "Automatic"
 msgstr "自动"
 
-#: ../clients/tui/nmt-page-ip4.c:39 ../clients/tui/nmt-page-ip6.c:40
+#: ../clients/tui/nmt-page-ip4.c:27 ../clients/tui/nmt-page-ip6.c:28
 msgid "Link-Local"
 msgstr "本地链路"
 
-#: ../clients/tui/nmt-page-ip4.c:40 ../clients/tui/nmt-page-ip6.c:41
+#: ../clients/tui/nmt-page-ip4.c:28 ../clients/tui/nmt-page-ip6.c:29
 msgid "Manual"
 msgstr "手动"
 
-#: ../clients/tui/nmt-page-ip4.c:41
+#: ../clients/tui/nmt-page-ip4.c:29
 msgid "Shared"
 msgstr "共享"
 
-#: ../clients/tui/nmt-page-ip4.c:81 ../clients/tui/nmt-page-ip6.c:82
+#: ../clients/tui/nmt-page-ip4.c:69 ../clients/tui/nmt-page-ip6.c:70
 msgid "(No custom routes)"
 msgstr "（没有自定义路由）"
 
-#: ../clients/tui/nmt-page-ip4.c:84 ../clients/tui/nmt-page-ip6.c:85
+#: ../clients/tui/nmt-page-ip4.c:72 ../clients/tui/nmt-page-ip6.c:73
 #, c-format
 msgid "One custom route"
 msgid_plural "%d custom routes"
-msgstr[0] " 个自定义路由"
+msgstr[0] "个自定义路由"
 
-#: ../clients/tui/nmt-page-ip4.c:127
+#: ../clients/tui/nmt-page-ip4.c:115
 msgid "IPv4 CONFIGURATION"
 msgstr "IPv4 �置"
 
-#: ../clients/tui/nmt-page-ip4.c:135 ../clients/tui/nmt-page-ip6.c:136
+#: ../clients/tui/nmt-page-ip4.c:123 ../clients/tui/nmt-page-ip6.c:124
 msgid "Addresses"
 msgstr "地�"
 
-#: ../clients/tui/nmt-page-ip4.c:149 ../clients/tui/nmt-page-ip6.c:150
+#: ../clients/tui/nmt-page-ip4.c:137 ../clients/tui/nmt-page-ip6.c:138
 msgid "DNS servers"
 msgstr "DNS �务器"
 
-#: ../clients/tui/nmt-page-ip4.c:155 ../clients/tui/nmt-page-ip6.c:156
+#: ../clients/tui/nmt-page-ip4.c:143 ../clients/tui/nmt-page-ip6.c:144
 msgid "Search domains"
 msgstr "�索域"
 
-#: ../clients/tui/nmt-page-ip4.c:170 ../clients/tui/nmt-page-ip6.c:169
+#: ../clients/tui/nmt-page-ip4.c:158 ../clients/tui/nmt-page-ip6.c:157
 msgid "Routing"
 msgstr "路由"
 
-#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
+#: ../clients/tui/nmt-page-ip4.c:160 ../clients/tui/nmt-page-ip6.c:159
 msgid "Never use this network for default route"
 msgstr "始终�使用此网络于默认路由"
 
-#: ../clients/tui/nmt-page-ip4.c:178 ../clients/tui/nmt-page-ip6.c:177
+#: ../clients/tui/nmt-page-ip4.c:166 ../clients/tui/nmt-page-ip6.c:165
 msgid "Ignore automatically obtained routes"
 msgstr "忽略自动获�的路由"
 
-#: ../clients/tui/nmt-page-ip4.c:184 ../clients/tui/nmt-page-ip6.c:183
+#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:171
 msgid "Ignore automatically obtained DNS parameters"
 msgstr "忽略自动获�的 DNS �数"
 
-#: ../clients/tui/nmt-page-ip4.c:192
+#: ../clients/tui/nmt-page-ip4.c:180
 msgid "Require IPv4 addressing for this connection"
 msgstr "需� IPv4 地��完�这个连接"
 
-#: ../clients/tui/nmt-page-ip6.c:37
+#: ../clients/tui/nmt-page-ip6.c:25
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../clients/tui/nmt-page-ip6.c:39
+#: ../clients/tui/nmt-page-ip6.c:27
 msgid "Automatic (DHCP-only)"
 msgstr "自动（仅 DHCP）"
 
-#: ../clients/tui/nmt-page-ip6.c:128
+#: ../clients/tui/nmt-page-ip6.c:116
 msgid "IPv6 CONFIGURATION"
 msgstr "IPv6 �置"
 
-#: ../clients/tui/nmt-page-ip6.c:191
+#: ../clients/tui/nmt-page-ip6.c:179
 msgid "Require IPv6 addressing for this connection"
 msgstr "需� IPv6 地��完�这个连接"
 
 #. The order must match the NM_IP_TUNNEL_MODE_* enum
-#: ../clients/tui/nmt-page-ip-tunnel.c:77
+#: ../clients/tui/nmt-page-ip-tunnel.c:65
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:78
+#: ../clients/tui/nmt-page-ip-tunnel.c:66
 msgid "GRE"
 msgstr "GRE"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:79
+#: ../clients/tui/nmt-page-ip-tunnel.c:67
 msgid "SIT"
 msgstr "SIT"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:80
+#: ../clients/tui/nmt-page-ip-tunnel.c:68
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:81
+#: ../clients/tui/nmt-page-ip-tunnel.c:69
 msgid "VTI"
 msgstr "VTI"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:82
+#: ../clients/tui/nmt-page-ip-tunnel.c:70
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:83
+#: ../clients/tui/nmt-page-ip-tunnel.c:71
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:84
+#: ../clients/tui/nmt-page-ip-tunnel.c:72
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:85
+#: ../clients/tui/nmt-page-ip-tunnel.c:73
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:149 ../clients/tui/nmt-page-vlan.c:86
+#: ../clients/tui/nmt-page-ip-tunnel.c:137 ../clients/tui/nmt-page-vlan.c:74
 msgid "Parent"
 msgstr "上级"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:156
+#: ../clients/tui/nmt-page-ip-tunnel.c:144
 msgid "Local IP"
 msgstr "本地 IP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:162
+#: ../clients/tui/nmt-page-ip-tunnel.c:150
 msgid "Remote IP"
 msgstr "远程 IP"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:168
+#: ../clients/tui/nmt-page-ip-tunnel.c:156
 msgid "Input key"
 msgstr "输入密钥"
 
-#: ../clients/tui/nmt-page-ip-tunnel.c:175
+#: ../clients/tui/nmt-page-ip-tunnel.c:163
 msgid "Output key"
 msgstr "输出密钥"
 
-#: ../clients/tui/nmt-page-ppp.c:130
+#: ../clients/tui/nmt-page-ppp.c:118
 msgid "PPP CONFIGURATION"
 msgstr "PPP �置"
 
-#: ../clients/tui/nmt-page-ppp.c:139
+#: ../clients/tui/nmt-page-ppp.c:127
 msgid "Allowed authentication methods:"
 msgstr "�许的验�方法："
 
-#: ../clients/tui/nmt-page-ppp.c:146
+#: ../clients/tui/nmt-page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
 
-#: ../clients/tui/nmt-page-ppp.c:154
+#: ../clients/tui/nmt-page-ppp.c:142
 msgid "PAP"
 msgstr "PAP"
 
-#: ../clients/tui/nmt-page-ppp.c:162
+#: ../clients/tui/nmt-page-ppp.c:150
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../clients/tui/nmt-page-ppp.c:170
+#: ../clients/tui/nmt-page-ppp.c:158
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../clients/tui/nmt-page-ppp.c:178
+#: ../clients/tui/nmt-page-ppp.c:166
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../clients/tui/nmt-page-ppp.c:194
+#: ../clients/tui/nmt-page-ppp.c:182
 msgid "Use point-to-point encryption (MPPE)"
 msgstr "使用点到点加密（MPPE）"
 
-#: ../clients/tui/nmt-page-ppp.c:206
+#: ../clients/tui/nmt-page-ppp.c:194
 msgid "Require 128-bit encryption"
 msgstr "需� 128 �加密"
 
-#: ../clients/tui/nmt-page-ppp.c:216
+#: ../clients/tui/nmt-page-ppp.c:204
 msgid "Use stateful MPPE"
 msgstr "使用有状� MPPE"
 
-#: ../clients/tui/nmt-page-ppp.c:228
+#: ../clients/tui/nmt-page-ppp.c:216
 msgid "Allow BSD data compression"
 msgstr "�许 BSD 数�压缩"
 
-#: ../clients/tui/nmt-page-ppp.c:236
+#: ../clients/tui/nmt-page-ppp.c:224
 msgid "Allow Deflate data compression"
 msgstr "�许 Deflate 数�压缩"
 
-#: ../clients/tui/nmt-page-ppp.c:244
+#: ../clients/tui/nmt-page-ppp.c:232
 msgid "Use TCP header compression"
 msgstr "使用 TCP 首部压缩"
 
-#: ../clients/tui/nmt-page-ppp.c:254
+#: ../clients/tui/nmt-page-ppp.c:242
 msgid "Send PPP echo packets"
 msgstr "�� PPP 回�数�包"
 
-#: ../clients/tui/nmt-page-team-port.c:91
+#: ../clients/tui/nmt-page-team-port.c:79
 msgid "TEAM PORT"
 msgstr "组�端�"
 
-#: ../clients/tui/nmt-page-team-port.c:98 ../clients/tui/nmt-page-team.c:162
+#: ../clients/tui/nmt-page-team-port.c:86 ../clients/tui/nmt-page-team.c:150
 msgid "JSON configuration"
 msgstr "JSON �置"
 
-#: ../clients/tui/nmt-page-team.c:144
+#: ../clients/tui/nmt-page-team.c:132
 msgid "TEAM"
 msgstr "组�"
 
-#: ../clients/tui/nmt-page-vlan.c:101
+#: ../clients/tui/nmt-page-vlan.c:89
 msgid "VLAN id"
 msgstr "VLAN 标识"
 
-#: ../clients/tui/nmt-page-wifi.c:63
+#: ../clients/tui/nmt-page-wifi.c:51
 msgctxt "Wi-Fi"
 msgid "Client"
 msgstr "客户端"
 
-#: ../clients/tui/nmt-page-wifi.c:64
+#: ../clients/tui/nmt-page-wifi.c:52
 msgid "Access Point"
 msgstr "接入点"
 
-#: ../clients/tui/nmt-page-wifi.c:65
+#: ../clients/tui/nmt-page-wifi.c:53
 msgid "Ad-Hoc Network"
 msgstr "Ad-Hoc 网络"
 
-#: ../clients/tui/nmt-page-wifi.c:70
+#: ../clients/tui/nmt-page-wifi.c:58
 msgctxt "Wi-Fi"
 msgid "Automatic"
 msgstr "自动"
 
 #. 802.11a Wi-Fi network
-#: ../clients/tui/nmt-page-wifi.c:72
+#: ../clients/tui/nmt-page-wifi.c:60
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
 #. 802.11b / 802.11g Wi-Fi network
-#: ../clients/tui/nmt-page-wifi.c:74
+#: ../clients/tui/nmt-page-wifi.c:62
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../clients/tui/nmt-page-wifi.c:79
+#: ../clients/tui/nmt-page-wifi.c:67
 msgctxt "Wi-Fi security"
 msgid "None"
 msgstr "æ— "
 
-#: ../clients/tui/nmt-page-wifi.c:80
+#: ../clients/tui/nmt-page-wifi.c:68
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 个人"
 
-#: ../clients/tui/nmt-page-wifi.c:81
+#: ../clients/tui/nmt-page-wifi.c:69
+msgid "WPA3 Personal"
+msgstr "WPA3 Personal"
+
+#: ../clients/tui/nmt-page-wifi.c:70
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 �业"
 
-#: ../clients/tui/nmt-page-wifi.c:82
+#: ../clients/tui/nmt-page-wifi.c:71
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 �密钥（Hex 或者 ASCII）"
 
-#: ../clients/tui/nmt-page-wifi.c:83
+#: ../clients/tui/nmt-page-wifi.c:72
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128� 密�"
 
-#: ../clients/tui/nmt-page-wifi.c:84
+#: ../clients/tui/nmt-page-wifi.c:73
 msgid "Dynamic WEP (802.1x)"
 msgstr "动� WEP（802.1x）"
 
-#: ../clients/tui/nmt-page-wifi.c:85
+#: ../clients/tui/nmt-page-wifi.c:74
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../clients/tui/nmt-page-wifi.c:90
+#: ../clients/tui/nmt-page-wifi.c:79
 msgctxt "WEP key index"
 msgid "1 (Default)"
 msgstr "1（默认）"
 
-#: ../clients/tui/nmt-page-wifi.c:91
+#: ../clients/tui/nmt-page-wifi.c:80
 msgctxt "WEP key index"
 msgid "2"
 msgstr "2"
 
-#: ../clients/tui/nmt-page-wifi.c:92
+#: ../clients/tui/nmt-page-wifi.c:81
 msgctxt "WEP key index"
 msgid "3"
 msgstr "3"
 
-#: ../clients/tui/nmt-page-wifi.c:93
+#: ../clients/tui/nmt-page-wifi.c:82
 msgctxt "WEP key index"
 msgid "4"
 msgstr "4"
 
-#: ../clients/tui/nmt-page-wifi.c:98
+#: ../clients/tui/nmt-page-wifi.c:87
 msgid "Open System"
 msgstr "开放系统"
 
-#: ../clients/tui/nmt-page-wifi.c:99
+#: ../clients/tui/nmt-page-wifi.c:88
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: ../clients/tui/nmt-page-wifi.c:213
+#: ../clients/tui/nmt-page-wifi.c:202
 msgid "WI-FI"
 msgstr "WI-FI"
 
-#: ../clients/tui/nmt-page-wifi.c:255
+#: ../clients/tui/nmt-page-wifi.c:244
 msgid "Channel"
 msgstr "信�"
 
-#: ../clients/tui/nmt-page-wifi.c:260
-msgid "Security"
-msgstr "安全性"
-
 #. "wpa-enterprise"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:281
+#: ../clients/tui/nmt-page-wifi.c:271
 msgid "(No support for wpa-enterprise yet...)"
 msgstr "（还未支� WPA �业...）"
 
-#: ../clients/tui/nmt-page-wifi.c:291 ../clients/tui/nmt-page-wifi.c:310
+#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
 msgid "WEP index"
 msgstr "WEP 索引"
 
-#: ../clients/tui/nmt-page-wifi.c:299 ../clients/tui/nmt-page-wifi.c:318
+#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
 msgid "Authentication"
 msgstr "验�"
 
 #. "dynamic-wep"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:324
+#: ../clients/tui/nmt-page-wifi.c:314
 msgid "(No support for dynamic-wep yet...)"
 msgstr "（还未支�动� WEP...）"
 
-#: ../clients/tui/nmt-page-wifi.c:357
+#: ../clients/tui/nmt-page-wifi.c:347
 msgid "BSSID"
 msgstr "BSSID"
 
-#: ../clients/tui/nmt-password-fields.c:127
+#: ../clients/tui/nmt-password-fields.c:115
 msgid "Ask for this password every time"
 msgstr "�次都询问这个密�"
 
-#: ../clients/tui/nmt-password-fields.c:128
+#: ../clients/tui/nmt-password-fields.c:116
 msgid "Show password"
 msgstr "显示密�"
 
-#: ../clients/tui/nmt-route-table.c:186
+#: ../clients/tui/nmt-route-table.c:174
 msgid "Destination"
 msgstr "目标"
 
-#: ../clients/tui/nmt-route-table.c:186
+#: ../clients/tui/nmt-route-table.c:174
 msgid "Prefix"
 msgstr "�缀"
 
-#: ../clients/tui/nmt-route-table.c:195
+#: ../clients/tui/nmt-route-table.c:183
 msgid "Next Hop"
 msgstr "下一个跃点"
 
-#: ../clients/tui/nmt-route-table.c:203
+#: ../clients/tui/nmt-route-table.c:191
 msgid "Metric"
 msgstr "跃点数"
 
-#: ../clients/tui/nmt-route-table.c:223
+#: ../clients/tui/nmt-route-table.c:211
 msgid "No custom routes are defined."
 msgstr "未定义自定义陆游。"
 
-#: ../clients/tui/nmt-slave-list.c:133
+#: ../clients/tui/nmt-slave-list.c:121
 msgid "Select the type of slave connection you wish to add."
 msgstr "选择您�添加的从连接类型。"
 
-#: ../clients/tui/nmt-widget-list.c:138
+#: ../clients/tui/nmt-widget-list.c:126
 msgid "Add..."
 msgstr "添加..."
 
-#: ../clients/tui/nmt-widget-list.c:201
+#: ../clients/tui/nmt-widget-list.c:189
 msgid "Remove"
 msgstr "移除"
 
-#: ../clients/tui/nmtui-connect.c:54
+#: ../clients/tui/nmtui-connect.c:42
 msgid ""
 "openconnect will be run to authenticate.\n"
 "It will return to nmtui when completed."
 msgstr "openconnect 将�行以进行验�，完��它将返回至 nmtui。"
 
-#: ../clients/tui/nmtui-connect.c:68
+#: ../clients/tui/nmtui-connect.c:56
 #, c-format
 msgid "Error: openconnect failed: %s"
 msgstr "错误：openconnect 失败：%s"
 
-#: ../clients/tui/nmtui-connect.c:75
+#: ../clients/tui/nmtui-connect.c:63
 #, c-format
 msgid "openconnect failed with status %d"
 msgstr "openconnect 失败，状�为 %d"
 
-#: ../clients/tui/nmtui-connect.c:79
+#: ../clients/tui/nmtui-connect.c:67
 #, c-format
 msgid "openconnect failed with signal %d"
 msgstr "openconnect 失败，信�为 %d"
 
-#: ../clients/tui/nmtui-connect.c:182
+#: ../clients/tui/nmtui-connect.c:170
 #, c-format
 msgid "Activation failed: %s"
 msgstr "激活失败：%s"
 
-#: ../clients/tui/nmtui-connect.c:253
+#: ../clients/tui/nmtui-connect.c:241
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../clients/tui/nmtui-connect.c:291 ../clients/tui/nmtui-connect.c:328
+#: ../clients/tui/nmtui-connect.c:279 ../clients/tui/nmtui-connect.c:316
 #, c-format
 msgid "Could not activate connection: %s"
 msgstr "无法激活连接：%s"
 
-#: ../clients/tui/nmtui-connect.c:390 ../clients/tui/nmtui-connect.c:439
+#: ../clients/tui/nmtui-connect.c:378 ../clients/tui/nmtui-connect.c:427
 msgid "Activate"
 msgstr "激活"
 
-#: ../clients/tui/nmtui-connect.c:392
+#: ../clients/tui/nmtui-connect.c:380
 msgid "Deactivate"
 msgstr "�用"
 
-#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
-#: ../clients/tui/nmtui.c:127
+#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
+#: ../clients/tui/nmtui.c:115
 msgid "Quit"
 msgstr "退出"
 
-#: ../clients/tui/nmtui-connect.c:444 ../clients/tui/nmtui-edit.c:117
+#: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
 msgid "Back"
 msgstr "返回"
 
-#: ../clients/tui/nmtui-connect.c:467
+#: ../clients/tui/nmtui-connect.c:455
 #, c-format
 msgid "No such connection '%s'"
 msgstr "无此连接 \"%s\""
 
-#: ../clients/tui/nmtui-connect.c:469
+#: ../clients/tui/nmtui-connect.c:457
 msgid "Connection is already active"
 msgstr "连接已�激活"
 
-#: ../clients/tui/nmtui-edit.c:227
+#: ../clients/tui/nmtui-edit.c:215
 msgid "Create"
 msgstr "创建"
 
-#: ../clients/tui/nmtui-edit.c:369
+#: ../clients/tui/nmtui-edit.c:357
 msgid "Select the type of connection you wish to create."
 msgstr "选择您�创建的连接类型。"
 
-#: ../clients/tui/nmtui-edit.c:377
+#: ../clients/tui/nmtui-edit.c:365
 msgid ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr "如果您想创建一个 VPN 但列表中没有您想�创建的 VPN 类型，这很�能是您没有安装正确的 VPN �件。"
 
-#: ../clients/tui/nmtui-edit.c:413 ../clients/tui/nmtui-edit.c:429
+#: ../clients/tui/nmtui-edit.c:401 ../clients/tui/nmtui-edit.c:417
 msgid "New Connection"
 msgstr "新建连接"
 
-#: ../clients/tui/nmtui-edit.c:468
+#: ../clients/tui/nmtui-edit.c:456
 #, c-format
 msgid "Unable to delete connection: %s"
 msgstr "无法删除连接：%s"
 
-#: ../clients/tui/nmtui-edit.c:507
+#: ../clients/tui/nmtui-edit.c:495
 #, c-format
 msgid "Could not delete connection '%s': %s"
 msgstr "无法删除连接 \"%s\"：%s"
 
-#: ../clients/tui/nmtui-edit.c:529
+#: ../clients/tui/nmtui-edit.c:517
 #, c-format
 msgid "Are you sure you want to delete the connection '%s'?"
 msgstr "您确定�删除连接 \"%s\" �？"
 
-#: ../clients/tui/nmtui-hostname.c:44
+#: ../clients/tui/nmtui-hostname.c:32
 msgid "Set Hostname"
 msgstr "设置主机�"
 
-#: ../clients/tui/nmtui-hostname.c:52
+#: ../clients/tui/nmtui-hostname.c:40
 msgid "Hostname"
 msgstr "主机�"
 
 #. TRANSLATORS: this indicates the result. ie, "I have set the hostname to ..."
-#: ../clients/tui/nmtui-hostname.c:115
+#: ../clients/tui/nmtui-hostname.c:103
 #, c-format
 msgid "Set hostname to '%s'"
 msgstr "主机�已设为 \"%s\""
 
-#: ../clients/tui/nmtui-hostname.c:117
+#: ../clients/tui/nmtui-hostname.c:105
 #, c-format
 msgid "Unable to set hostname: %s"
 msgstr "无法设置主机�：%s"
 
-#: ../clients/tui/nmtui.c:50 ../clients/tui/nmtui.c:53
+#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
 msgid "connection"
 msgstr "连接"
 
-#: ../clients/tui/nmtui.c:51
+#: ../clients/tui/nmtui.c:39
 msgid "Edit a connection"
 msgstr "编辑连接"
 
-#: ../clients/tui/nmtui.c:54
+#: ../clients/tui/nmtui.c:42
 msgid "Activate a connection"
 msgstr "�用连接"
 
-#: ../clients/tui/nmtui.c:56
+#: ../clients/tui/nmtui.c:44
 msgid "new hostname"
 msgstr "新主机�"
 
-#: ../clients/tui/nmtui.c:57
+#: ../clients/tui/nmtui.c:45
 msgid "Set system hostname"
 msgstr "设置系统主机�"
 
-#: ../clients/tui/nmtui.c:101
+#: ../clients/tui/nmtui.c:89
 msgid "NetworkManager TUI"
 msgstr "网络管�器文本用户界�"
 
-#: ../clients/tui/nmtui.c:109
+#: ../clients/tui/nmtui.c:97
 msgid "Please select an option"
 msgstr "请选择选项"
 
-#: ../clients/tui/nmtui.c:157
+#: ../clients/tui/nmtui.c:145
 msgid "Usage"
 msgstr "用法"
 
-#: ../clients/tui/nmtui.c:238
+#: ../clients/tui/nmtui.c:226
 msgid "Could not parse arguments"
 msgstr "无法解��数"
 
-#: ../clients/tui/nmtui.c:248
+#: ../clients/tui/nmtui.c:236
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "无法�系网络管�器：%s\n"
 
-#: ../clients/tui/nmtui.c:253
+#: ../clients/tui/nmtui.c:241
 msgid "NetworkManager is not running."
 msgstr "NetworkManaer 未�行。"
 
-#: ../libnm-core/nm-crypto.c:219
+#: ../libnm-core/nm-crypto.c:204
 #, c-format
 msgid "PEM key file had no start tag"
 msgstr "PEM 密钥文件没有 start tag"
 
-#: ../libnm-core/nm-crypto.c:227
+#: ../libnm-core/nm-crypto.c:212
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM 密钥文件没有结�标记 \"%s\"。"
 
-#: ../libnm-core/nm-crypto.c:254
+#: ../libnm-core/nm-crypto.c:239
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "错误的 PEM 文件格�：Proc-Type �是第一个标记。"
 
-#: ../libnm-core/nm-crypto.c:262
+#: ../libnm-core/nm-crypto.c:247
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "错误的 PEM 文件格�：未知的 Proc-Type 标记 \"%s\"。"
 
-#: ../libnm-core/nm-crypto.c:274
+#: ../libnm-core/nm-crypto.c:259
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "错误的 PEM 文件格�：DEK-Info �是第二个标记。"
 
-#: ../libnm-core/nm-crypto.c:285
+#: ../libnm-core/nm-crypto.c:270
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "错误的 PEM 文件格�：没有在 DEK-Info 标记找到�始��。"
 
-#: ../libnm-core/nm-crypto.c:293
+#: ../libnm-core/nm-crypto.c:278
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr "错误的 PEM 文件格�：DEK-Info 标签中的�始��格�无效。"
 
-#: ../libnm-core/nm-crypto.c:304
+#: ../libnm-core/nm-crypto.c:289
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "错误的 PEM 文件格�：未知的�钥密� \"%s\"。"
 
-#: ../libnm-core/nm-crypto.c:325
+#: ../libnm-core/nm-crypto.c:310
 #, c-format
 msgid "Could not decode private key."
 msgstr "无法解��钥。"
 
-#: ../libnm-core/nm-crypto.c:366
+#: ../libnm-core/nm-crypto.c:351
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "无法找到预期的 PKCS#8 起始标记。"
 
-#: ../libnm-core/nm-crypto.c:374
+#: ../libnm-core/nm-crypto.c:359
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "无法找到预期的 PKCS#8 结�标记\"%s\"。"
 
-#: ../libnm-core/nm-crypto.c:386
+#: ../libnm-core/nm-crypto.c:371
 msgid "Failed to decode PKCS#8 private key."
 msgstr "无法解� PKCS#8 �钥。"
 
-#: ../libnm-core/nm-crypto.c:415
+#: ../libnm-core/nm-crypto.c:400
 msgid "Failed to find expected TSS start tag."
 msgstr "无法找到预期的 TSS 起始标记。"
 
-#: ../libnm-core/nm-crypto.c:423
+#: ../libnm-core/nm-crypto.c:408
 #, c-format
 msgid "Failed to find expected TSS end tag '%s'."
 msgstr "无法找到预期的 TSS 结�标记 '%s'。"
 
-#: ../libnm-core/nm-crypto.c:482
+#: ../libnm-core/nm-crypto.c:468
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "�始��长度必须是�数字节。"
 
-#: ../libnm-core/nm-crypto.c:498
+#: ../libnm-core/nm-crypto.c:484
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "�始��中包���六进制数字。"
 
-#: ../libnm-core/nm-crypto.c:574
+#: ../libnm-core/nm-crypto.c:560
 #, c-format
 msgid "IV must contain at least 8 characters"
 msgstr "IV 需�最少包括 8 个字符"
 
-#: ../libnm-core/nm-crypto.c:622
+#: ../libnm-core/nm-crypto.c:608
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "无法确定�钥类型。"
 
-#: ../libnm-core/nm-crypto.c:634
+#: ../libnm-core/nm-crypto.c:620
 #, c-format
 msgid "Password provided, but key was not encrypted."
 msgstr "已�供密�，但密钥没有加密。"
 
-#: ../libnm-core/nm-crypto.c:695
+#: ../libnm-core/nm-crypto.c:681
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "PEM �书没有起始标记 \"%s\"。"
 
-#: ../libnm-core/nm-crypto.c:704
+#: ../libnm-core/nm-crypto.c:690
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "PEM �书没有结�标记 \"%s\"。"
 
-#: ../libnm-core/nm-crypto.c:716
+#: ../libnm-core/nm-crypto.c:702
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "无法解��书。"
 
-#: ../libnm-core/nm-crypto.c:745 ../libnm-core/nm-crypto.c:798
+#: ../libnm-core/nm-crypto.c:731 ../libnm-core/nm-crypto.c:784
 #, c-format
 msgid "Certificate file is empty"
 msgstr "整数文件为空"
 
-#: ../libnm-core/nm-crypto.c:778
+#: ../libnm-core/nm-crypto.c:764
 #, c-format
 msgid "Failed to recognize certificate"
 msgstr "识别�书失败。"
 
-#: ../libnm-core/nm-crypto.c:890
+#: ../libnm-core/nm-crypto.c:876
 #, c-format
 msgid "not a valid private key"
 msgstr "无效的�钥"
 
-#: ../libnm-core/nm-crypto-gnutls.c:74
+#: ../libnm-core/nm-crypto-gnutls.c:58
 msgid "Failed to initialize the crypto engine."
 msgstr "�始化加密引擎失败。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:106 ../libnm-core/nm-crypto-nss.c:127
+#: ../libnm-core/nm-crypto-gnutls.c:90 ../libnm-core/nm-crypto-nss.c:112
 #, c-format
 msgid "Unsupported key cipher for decryption"
 msgstr "解密�支�的密钥密�"
 
-#: ../libnm-core/nm-crypto-gnutls.c:116 ../libnm-core/nm-crypto-nss.c:134
+#: ../libnm-core/nm-crypto-gnutls.c:100 ../libnm-core/nm-crypto-nss.c:119
 #, c-format
 msgid "Invalid IV length (must be at least %u)."
 msgstr "无效的�始��长度（至少为 %u）。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:133
+#: ../libnm-core/nm-crypto-gnutls.c:117
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s (%s)"
 msgstr "�始化解密计算内容失败：%s（%s）"
 
-#: ../libnm-core/nm-crypto-gnutls.c:145
+#: ../libnm-core/nm-crypto-gnutls.c:129
 #, c-format
 msgid "Failed to decrypt the private key: %s (%s)"
 msgstr "解密�钥失败：%s（%s）"
 
-#: ../libnm-core/nm-crypto-gnutls.c:159 ../libnm-core/nm-crypto-nss.c:221
+#: ../libnm-core/nm-crypto-gnutls.c:143 ../libnm-core/nm-crypto-nss.c:206
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "解密�钥失败：�外的填充长度。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:170 ../libnm-core/nm-crypto-nss.c:232
+#: ../libnm-core/nm-crypto-gnutls.c:154 ../libnm-core/nm-crypto-nss.c:217
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "解密�钥失败。"
 
-#: ../libnm-core/nm-crypto-gnutls.c:204 ../libnm-core/nm-crypto-nss.c:287
+#: ../libnm-core/nm-crypto-gnutls.c:188 ../libnm-core/nm-crypto-nss.c:272
 #, c-format
 msgid "Unsupported key cipher for encryption"
 msgstr "加密�支�的密钥密�"
 
-#: ../libnm-core/nm-crypto-gnutls.c:220
+#: ../libnm-core/nm-crypto-gnutls.c:204
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s (%s)"
 msgstr "�始化加密计算内容失败：%s（%s）"
 
-#: ../libnm-core/nm-crypto-gnutls.c:246
+#: ../libnm-core/nm-crypto-gnutls.c:230
 #, c-format
 msgid "Failed to encrypt the data: %s (%s)"
 msgstr "加密数�失败：%s（%s）"
 
-#: ../libnm-core/nm-crypto-gnutls.c:271
+#: ../libnm-core/nm-crypto-gnutls.c:255
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "�始化�书数�出错：%s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:293
+#: ../libnm-core/nm-crypto-gnutls.c:277
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "无法解��书：%s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:320
+#: ../libnm-core/nm-crypto-gnutls.c:304
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "无法�始化 PKCS#12 解�器：%s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:333
+#: ../libnm-core/nm-crypto-gnutls.c:317
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "无法解� PKCS#12 文件：%s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:347
+#: ../libnm-core/nm-crypto-gnutls.c:331
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "无法校验 PKCS#12 文件：%s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:375
+#: ../libnm-core/nm-crypto-gnutls.c:359
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "无法�始化 PKCS#8 解�器：%s"
 
-#: ../libnm-core/nm-crypto-gnutls.c:402
+#: ../libnm-core/nm-crypto-gnutls.c:386
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "无法解� PKCS#8 文件：%s"
 
-#: ../libnm-core/nm-crypto-nss.c:80
+#: ../libnm-core/nm-crypto-nss.c:65
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "�始化加密引擎失败：%d。"
 
-#: ../libnm-core/nm-crypto-nss.c:146
+#: ../libnm-core/nm-crypto-nss.c:131
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "�始化解密计算�槽失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:156
+#: ../libnm-core/nm-crypto-nss.c:141
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "为解密设置对称密钥失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:166
+#: ../libnm-core/nm-crypto-nss.c:151
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "为解密设置�始��失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:174
+#: ../libnm-core/nm-crypto-nss.c:159
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "�始化解密环境失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:190
+#: ../libnm-core/nm-crypto-nss.c:175
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "解密�钥失败：%d。"
 
-#: ../libnm-core/nm-crypto-nss.c:198
+#: ../libnm-core/nm-crypto-nss.c:183
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr "解密�钥失败：解密�的数�太大。"
 
-#: ../libnm-core/nm-crypto-nss.c:209
+#: ../libnm-core/nm-crypto-nss.c:194
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "结�解密�钥失败：%d。"
 
-#: ../libnm-core/nm-crypto-nss.c:298
+#: ../libnm-core/nm-crypto-nss.c:283
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "�始化加密计算�槽空间失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:306
+#: ../libnm-core/nm-crypto-nss.c:291
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "为加密设置对称密钥失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:314
+#: ../libnm-core/nm-crypto-nss.c:299
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "为加密设置�始��失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:322
+#: ../libnm-core/nm-crypto-nss.c:307
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "�始化加密内容失败。"
 
-#: ../libnm-core/nm-crypto-nss.c:345
+#: ../libnm-core/nm-crypto-nss.c:330
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "加密失败：%d。"
 
-#: ../libnm-core/nm-crypto-nss.c:353
+#: ../libnm-core/nm-crypto-nss.c:338
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "加密��外的数��。"
 
-#: ../libnm-core/nm-crypto-nss.c:391
+#: ../libnm-core/nm-crypto-nss.c:376
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "无法解��书：%d"
 
-#: ../libnm-core/nm-crypto-nss.c:437
+#: ../libnm-core/nm-crypto-nss.c:422
 #, c-format
 msgid "Password must be UTF-8"
 msgstr "密�必须是 UTF-8 格�"
 
-#: ../libnm-core/nm-crypto-nss.c:460
+#: ../libnm-core/nm-crypto-nss.c:445
 #, c-format
 msgid "Couldn't initialize slot"
 msgstr "无法�始 slot"
 
-#: ../libnm-core/nm-crypto-nss.c:468
+#: ../libnm-core/nm-crypto-nss.c:453
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "无法�始化 PKCS#12 解�器：%d"
 
-#: ../libnm-core/nm-crypto-nss.c:477
+#: ../libnm-core/nm-crypto-nss.c:462
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "无法解� PKCS#12 文件：%d"
 
-#: ../libnm-core/nm-crypto-nss.c:486
+#: ../libnm-core/nm-crypto-nss.c:471
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "无法校验 PKCS#12 文件：%d"
 
-#: ../libnm-core/nm-crypto-nss.c:536
+#: ../libnm-core/nm-crypto-nss.c:521
 msgid "Could not generate random data."
 msgstr "无法生��机数�。"
 
-#: ../libnm-core/nm-connection.c:320
+#: ../libnm-core/nm-connection.c:306
 msgid "wrong type; should be a list of strings."
 msgstr "错误的类型；应为一个字符串列表。"
 
-#: ../libnm-core/nm-connection.c:390
+#: ../libnm-core/nm-connection.c:376
 msgid "unknown setting name"
 msgstr "未知的设置�称"
 
-#: ../libnm-core/nm-connection.c:402
+#: ../libnm-core/nm-connection.c:388
 msgid "duplicate setting name"
 msgstr "��的设置�称"
 
-#: ../libnm-core/nm-connection.c:1414
+#: ../libnm-core/nm-connection.c:1423
 msgid "setting not found"
 msgstr "未找到设置"
 
-#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-connection.c:1505
-#: ../libnm-core/nm-connection.c:1530
+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
+#: ../libnm-core/nm-connection.c:1539
 msgid "setting is required for non-slave connections"
 msgstr "对于�从连接，设置是必需的"
 
-#: ../libnm-core/nm-connection.c:1493 ../libnm-core/nm-connection.c:1518
-#: ../libnm-core/nm-connection.c:1543
+#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
+#: ../libnm-core/nm-connection.c:1552
 msgid "setting not allowed in slave connection"
 msgstr "从连接中��许设置"
 
-#: ../libnm-core/nm-connection.c:1647
+#: ../libnm-core/nm-connection.c:1657
 msgid "Unexpected failure to normalize the connection"
 msgstr "正常化连接�外地失败"
 
-#: ../libnm-core/nm-connection.c:1710
+#: ../libnm-core/nm-connection.c:1720
 msgid "Unexpected failure to verify the connection"
 msgstr "检验连接�外地失败"
 
-#: ../libnm-core/nm-connection.c:1746
+#: ../libnm-core/nm-connection.c:1756
 #, c-format
 msgid "unexpected uuid %s instead of %s"
 msgstr "�预期的 uuid %s，而�是 %s"
 
-#: ../libnm-core/nm-connection.c:2599 ../libnm-core/nm-setting-8021x.c:2567
-#: ../libnm-core/nm-setting-8021x.c:2584 ../libnm-core/nm-setting-8021x.c:2615
-#: ../libnm-core/nm-setting-8021x.c:2632 ../libnm-core/nm-setting-8021x.c:2674
-#: ../libnm-core/nm-setting-8021x.c:2686 ../libnm-core/nm-setting-8021x.c:2704
-#: ../libnm-core/nm-setting-8021x.c:2716 ../libnm-core/nm-setting-8021x.c:2740
-#: ../libnm-core/nm-setting-8021x.c:2822 ../libnm-core/nm-setting-adsl.c:172
-#: ../libnm-core/nm-setting-bluetooth.c:123
-#: ../libnm-core/nm-setting-bluetooth.c:181
-#: ../libnm-core/nm-setting-bluetooth.c:195 ../libnm-core/nm-setting-cdma.c:142
-#: ../libnm-core/nm-setting-connection.c:968
-#: ../libnm-core/nm-setting-connection.c:1011
-#: ../libnm-core/nm-setting-connection.c:1191
-#: ../libnm-core/nm-setting-ip-config.c:4905
-#: ../libnm-core/nm-setting-ip-tunnel.c:373
-#: ../libnm-core/nm-setting-olpc-mesh.c:98
-#: ../libnm-core/nm-setting-ovs-patch.c:91 ../libnm-core/nm-setting-pppoe.c:144
-#: ../libnm-core/nm-setting-vpn.c:530 ../libnm-core/nm-setting-vxlan.c:337
-#: ../libnm-core/nm-setting-wifi-p2p.c:136 ../libnm-core/nm-setting-wimax.c:108
-#: ../libnm-core/nm-setting-wireless-security.c:917
-#: ../libnm-core/nm-setting-wireless.c:776
+#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
+#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
+#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
+#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
+#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
+#: ../libnm-core/nm-setting-bluetooth.c:109
+#: ../libnm-core/nm-setting-bluetooth.c:167
+#: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
+#: ../libnm-core/nm-setting-connection.c:954
+#: ../libnm-core/nm-setting-connection.c:997
+#: ../libnm-core/nm-setting-connection.c:1177
+#: ../libnm-core/nm-setting-ip-config.c:4946
+#: ../libnm-core/nm-setting-ip-tunnel.c:359
+#: ../libnm-core/nm-setting-olpc-mesh.c:84
+#: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
+#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
+#: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
+#: ../libnm-core/nm-setting-wireless-security.c:902
+#: ../libnm-core/nm-setting-wireless.c:759
 msgid "property is missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-connection.c:2745
+#: ../libnm-core/nm-connection.c:2755
 msgid "IP Tunnel"
 msgstr "IP 隧�"
 
-#: ../libnm-core/nm-dbus-utils.c:199
+#: ../libnm-core/nm-dbus-utils.c:185
 #, c-format
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\""
 
-#: ../libnm-core/nm-keyfile-utils.c:246
+#: ../libnm-core/nm-keyfile-utils.c:242
 #, c-format
 msgid "value is not an integer in range [%lld, %lld]"
 msgstr "值�是在 [%lld, %lld] 范围内的一个整数"
 
-#: ../libnm-core/nm-keyfile.c:210
+#: ../libnm-core/nm-keyfile.c:196
 msgid "ignoring missing number"
 msgstr "忽略缺失的数字"
 
-#: ../libnm-core/nm-keyfile.c:218
+#: ../libnm-core/nm-keyfile.c:204
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "忽略无效的数字 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:239
+#: ../libnm-core/nm-keyfile.c:225
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "忽略无效的 %s 地�：%s"
 
-#: ../libnm-core/nm-keyfile.c:281
+#: ../libnm-core/nm-keyfile.c:268
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "忽略 %s%s 路由的无效网关 \"\""
 
-#: ../libnm-core/nm-keyfile.c:302
+#: ../libnm-core/nm-keyfile.c:292
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "忽略无效的 %s 路由：%s"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../libnm-core/nm-keyfile.c:464
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "对于地� %2$s 的�外字符 \"%1$c\"：\"%3$s\"（�置 %4$td）"
 
-#: ../libnm-core/nm-keyfile.c:484
+#: ../libnm-core/nm-keyfile.c:474
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "对于 %2$s 的�外字符 \"%1$c\"：\"%3$s\"（�置 %4$td）"
 
-#: ../libnm-core/nm-keyfile.c:493
+#: ../libnm-core/nm-keyfile.c:483
 #, c-format
 msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "对于 %2$s，�缀长度中有�外字符 \"%1$c\"：\"%3$s\"（�置 %4$td）"
 
-#: ../libnm-core/nm-keyfile.c:504
+#: ../libnm-core/nm-keyfile.c:494
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "值 %s 的末尾有无用信�：\"%s\""
 
-#: ../libnm-core/nm-keyfile.c:510
+#: ../libnm-core/nm-keyfile.c:500
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "值 %s 的末尾有�弃的分�：\"%s\""
 
-#: ../libnm-core/nm-keyfile.c:525
+#: ../libnm-core/nm-keyfile.c:514
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s 的�缀长度 \"%s\" 无效，默认为 %d"
 
-#: ../libnm-core/nm-keyfile.c:532
+#: ../libnm-core/nm-keyfile.c:521
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "缺少 %s 的�缀长度  \"%s\"，默认为 %d"
 
-#: ../libnm-core/nm-keyfile.c:860 ../libnm-core/nm-setting-user.c:372
+#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "对 \"%s\" 无效的值：%s"
 
-#: ../libnm-core/nm-keyfile.c:898
+#: ../libnm-core/nm-keyfile.c:894
 #, c-format
 msgid "ignoring invalid DNS server IPv%c address '%s'"
 msgstr "忽略无效的 DNS �务器 IPv%c 地� \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:994 ../libnm-core/nm-keyfile.c:3122
+#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "忽略无效的字节元素 \"%d\"（�在 0 和 255 之间）"
 
-#: ../libnm-core/nm-keyfile.c:1005
+#: ../libnm-core/nm-keyfile.c:1001
 msgid "ignoring invalid MAC address"
 msgstr "忽略无效的 MAC 地�"
 
-#: ../libnm-core/nm-keyfile.c:1264
+#: ../libnm-core/nm-keyfile.c:1260
 msgid "ignoring invalid SSID"
 msgstr "忽略无效的 SSID"
 
-#: ../libnm-core/nm-keyfile.c:1280
+#: ../libnm-core/nm-keyfile.c:1276
 msgid "ignoring invalid raw password"
 msgstr "忽略无效的原始密�"
 
-#: ../libnm-core/nm-keyfile.c:1417
+#: ../libnm-core/nm-keyfile.c:1416
 msgid "invalid key/cert value"
 msgstr "无效的密钥/�书值"
 
-#: ../libnm-core/nm-keyfile.c:1428
+#: ../libnm-core/nm-keyfile.c:1427
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "无效的密钥/�书值路径 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1444 ../libnm-core/nm-keyfile.c:1527
+#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "�书或密钥文件 \"%s\" �存在"
 
-#: ../libnm-core/nm-keyfile.c:1453
+#: ../libnm-core/nm-keyfile.c:1456
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "无效的 PKCS#11 URI \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1497
+#: ../libnm-core/nm-keyfile.c:1500
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "无效的密钥/�书值 data:;base64，�是 base64"
 
-#: ../libnm-core/nm-keyfile.c:1506
+#: ../libnm-core/nm-keyfile.c:1509
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "无效的密钥/�书值 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1539
+#: ../libnm-core/nm-keyfile.c:1542
 msgid "invalid key/cert value is not a valid blob"
 msgstr "无效的密钥/�书值，�是有效的比特�（blob）"
 
-#: ../libnm-core/nm-keyfile.c:1641
+#: ../libnm-core/nm-keyfile.c:1644
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "无效的奇�校验值 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1658 ../libnm-core/nm-keyfile.c:3177
+#: ../libnm-core/nm-keyfile.c:1661 ../libnm-core/nm-keyfile.c:3198
 #, c-format
 msgid "invalid setting: %s"
 msgstr "无效设置：%s"
 
-#: ../libnm-core/nm-keyfile.c:1675
+#: ../libnm-core/nm-keyfile.c:1678
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "忽略无效的组�（team）�置：%s"
 
-#: ../libnm-core/nm-keyfile.c:1753
+#: ../libnm-core/nm-keyfile.c:1756
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "无效的排队规则（qdisc）：%s"
 
-#: ../libnm-core/nm-keyfile.c:1799
+#: ../libnm-core/nm-keyfile.c:1802
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "无效的��过滤器（tfilter）：%s"
 
-#: ../libnm-core/nm-keyfile.c:3021
+#: ../libnm-core/nm-keyfile.c:3042
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "加载设置值时出错：%s"
 
-#: ../libnm-core/nm-keyfile.c:3049 ../libnm-core/nm-keyfile.c:3060
-#: ../libnm-core/nm-keyfile.c:3078 ../libnm-core/nm-keyfile.c:3089
-#: ../libnm-core/nm-keyfile.c:3100 ../libnm-core/nm-keyfile.c:3152
-#: ../libnm-core/nm-keyfile.c:3163
+#: ../libnm-core/nm-keyfile.c:3070 ../libnm-core/nm-keyfile.c:3081
+#: ../libnm-core/nm-keyfile.c:3099 ../libnm-core/nm-keyfile.c:3110
+#: ../libnm-core/nm-keyfile.c:3121 ../libnm-core/nm-keyfile.c:3173
+#: ../libnm-core/nm-keyfile.c:3184
 msgid "value cannot be interpreted as integer"
 msgstr "值无法被解�为整数"
 
-#: ../libnm-core/nm-keyfile.c:3198
+#: ../libnm-core/nm-keyfile.c:3219
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "无效的设置�称 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:3243
+#: ../libnm-core/nm-keyfile.c:3264
 #, c-format
 msgid "invalid key '%s.%s'"
 msgstr "无效的密钥 \"%s.%s\""
 
-#: ../libnm-core/nm-keyfile.c:3258
+#: ../libnm-core/nm-keyfile.c:3279
 #, c-format
 msgid "key '%s.%s' is not boolean"
 msgstr "密钥 \"%s.%s\" �是布尔值"
 
-#: ../libnm-core/nm-keyfile.c:3315
+#: ../libnm-core/nm-keyfile.c:3336
 #, c-format
 msgid "invalid peer public key in section '%s'"
 msgstr "'%s' 项中无效的 peer 公钥"
 
-#: ../libnm-core/nm-keyfile.c:3327
+#: ../libnm-core/nm-keyfile.c:3348
 #, c-format
 msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding"
 msgstr "密钥 '%s.%s' �是一个以 base64 编�的有效的 256 �密钥"
 
-#: ../libnm-core/nm-keyfile.c:3340
+#: ../libnm-core/nm-keyfile.c:3361
 #, c-format
 msgid "key '%s.%s' is not a valid secret flag"
-msgstr " '%s.%s' �是一个有效的 secret 标记"
+msgstr "'%s.%s' �是一个有效的 secret 标记"
 
-#: ../libnm-core/nm-keyfile.c:3352
+#: ../libnm-core/nm-keyfile.c:3373
 #, c-format
 msgid "key '%s.%s' is not a integer in range 0 to 2^32"
 msgstr "'%s.%s' �是在 0 到 2^32 范围内的一个整数"
 
-#: ../libnm-core/nm-keyfile.c:3364
+#: ../libnm-core/nm-keyfile.c:3385
 #, c-format
 msgid "key '%s.%s' is not a valid endpoint"
 msgstr "'%s.%s' �是一个有效的端点"
 
-#: ../libnm-core/nm-keyfile.c:3386
+#: ../libnm-core/nm-keyfile.c:3407
 #, c-format
 msgid "key '%s.%s' has invalid allowed-ips"
 msgstr "'%s.%s' 包括无效的 allowed-ips"
 
-#: ../libnm-core/nm-keyfile.c:3398
+#: ../libnm-core/nm-keyfile.c:3419
 #, c-format
 msgid "peer '%s' is invalid: %s"
 msgstr "peer '%s' 无效 : %s"
 
-#: ../libnm-core/nm-setting-6lowpan.c:93
+#: ../libnm-core/nm-setting-6lowpan.c:79
 #, c-format
 msgid "property is not specified"
 msgstr "未指定属性"
 
-#: ../libnm-core/nm-setting-6lowpan.c:115 ../libnm-core/nm-setting-macsec.c:301
-#: ../libnm-core/nm-setting-vlan.c:613
+#: ../libnm-core/nm-setting-6lowpan.c:101 ../libnm-core/nm-setting-macsec.c:287
+#: ../libnm-core/nm-setting-vlan.c:600
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
 msgstr "\"%s\" 值与 \"%s=%s\" �匹�"
 
-#: ../libnm-core/nm-setting-6lowpan.c:126
-#: ../libnm-core/nm-setting-ip-tunnel.c:351
-#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
-#: ../libnm-core/nm-setting-vlan.c:624 ../libnm-core/nm-setting-vxlan.c:380
+#: ../libnm-core/nm-setting-6lowpan.c:112
+#: ../libnm-core/nm-setting-ip-tunnel.c:337
+#: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
+#: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "\"%s\" �是 UUID 或接��称"
 
-#: ../libnm-core/nm-setting-8021x.c:225
+#: ../libnm-core/nm-setting-8021x.c:213
 msgid "binary data missing"
 msgstr "二进制数�缺失"
 
-#: ../libnm-core/nm-setting-8021x.c:253
+#: ../libnm-core/nm-setting-8021x.c:241
 msgid "URI not NUL terminated"
 msgstr "URI � NUL 终止符"
 
-#: ../libnm-core/nm-setting-8021x.c:262
+#: ../libnm-core/nm-setting-8021x.c:250
 msgid "URI is empty"
 msgstr "URI 为空"
 
-#: ../libnm-core/nm-setting-8021x.c:270
+#: ../libnm-core/nm-setting-8021x.c:258
 msgid "URI is not valid UTF-8"
 msgstr "URI �是有效的 UTF-8"
 
-#: ../libnm-core/nm-setting-8021x.c:288
+#: ../libnm-core/nm-setting-8021x.c:276
 msgid "data missing"
 msgstr "数�缺失"
 
-#: ../libnm-core/nm-setting-8021x.c:311 ../libnm-core/nm-setting-8021x.c:678
+#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "�书是无效的：%s"
 
-#: ../libnm-core/nm-setting-8021x.c:319
+#: ../libnm-core/nm-setting-8021x.c:307
 #, c-format
 msgid "certificate detected as invalid scheme"
 msgstr "�书无效"
 
-#: ../libnm-core/nm-setting-8021x.c:533
+#: ../libnm-core/nm-setting-8021x.c:521
 msgid "CA certificate must be in X.509 format"
 msgstr "CA �书必须是 X.509 格�"
 
-#: ../libnm-core/nm-setting-8021x.c:549
+#: ../libnm-core/nm-setting-8021x.c:537
 msgid "invalid certificate format"
 msgstr "无效的�书格�"
 
-#: ../libnm-core/nm-setting-8021x.c:688
+#: ../libnm-core/nm-setting-8021x.c:676
 #, 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:2574 ../libnm-core/nm-setting-8021x.c:2591
-#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-core/nm-setting-8021x.c:2639
-#: ../libnm-core/nm-setting-8021x.c:2680 ../libnm-core/nm-setting-8021x.c:2692
-#: ../libnm-core/nm-setting-8021x.c:2710 ../libnm-core/nm-setting-8021x.c:2722
-#: ../libnm-core/nm-setting-8021x.c:2747 ../libnm-core/nm-setting-adsl.c:179
-#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-core/nm-setting-cdma.c:158
-#: ../libnm-core/nm-setting-connection.c:975
-#: ../libnm-core/nm-setting-connection.c:1023
-#: ../libnm-core/nm-setting-gsm.c:284 ../libnm-core/nm-setting-gsm.c:341
-#: ../libnm-core/nm-setting-gsm.c:378 ../libnm-core/nm-setting-gsm.c:387
-#: ../libnm-core/nm-setting-ip-config.c:4912
-#: ../libnm-core/nm-setting-ip4-config.c:181
-#: ../libnm-core/nm-setting-ip4-config.c:188
-#: ../libnm-core/nm-setting-pppoe.c:151 ../libnm-core/nm-setting-pppoe.c:160
-#: ../libnm-core/nm-setting-vpn.c:539 ../libnm-core/nm-setting-vpn.c:549
-#: ../libnm-core/nm-setting-wimax.c:117
-#: ../libnm-core/nm-setting-wireless-security.c:960
-#: ../libnm-core/nm-setting-wireless-security.c:984
-#: ../libnm-core/nm-setting.c:1355
+#: ../libnm-core/nm-setting-8021x.c:2581 ../libnm-core/nm-setting-8021x.c:2598
+#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
+#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
+#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
+#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
+#: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
+#: ../libnm-core/nm-setting-connection.c:961
+#: ../libnm-core/nm-setting-connection.c:1009
+#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
+#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
+#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip4-config.c:167
+#: ../libnm-core/nm-setting-ip4-config.c:174
+#: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
+#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
+#: ../libnm-core/nm-setting-wimax.c:103
+#: ../libnm-core/nm-setting-wireless-security.c:945
+#: ../libnm-core/nm-setting-wireless-security.c:969
+#: ../libnm-core/nm-setting.c:1243
 msgid "property is empty"
 msgstr "属性为空"
 
-#: ../libnm-core/nm-setting-8021x.c:2604 ../libnm-core/nm-setting-8021x.c:2652
+#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "必须匹� PKCS#12 的 \"%s\" 属性"
 
 #: ../libnm-core/nm-setting-8021x.c:2831
-#: ../libnm-core/nm-setting-bluetooth.c:108
-#: ../libnm-core/nm-setting-infiniband.c:176
-#: ../libnm-core/nm-setting-infiniband.c:186
-#: ../libnm-core/nm-setting-ip4-config.c:172
-#: ../libnm-core/nm-setting-ip6-config.c:221
-#: ../libnm-core/nm-setting-ip6-config.c:232
-#: ../libnm-core/nm-setting-olpc-mesh.c:127
-#: ../libnm-core/nm-setting-wifi-p2p.c:145 ../libnm-core/nm-setting-wimax.c:126
-#: ../libnm-core/nm-setting-wired.c:799 ../libnm-core/nm-setting-wired.c:809
-#: ../libnm-core/nm-setting-wireless-security.c:1003
-#: ../libnm-core/nm-setting-wireless-security.c:1012
-#: ../libnm-core/nm-setting-wireless-security.c:1021
-#: ../libnm-core/nm-setting-wireless-security.c:1057
-#: ../libnm-core/nm-setting-wireless-security.c:1067
-#: ../libnm-core/nm-setting-wireless-security.c:1090
+msgid "can be enabled only on Ethernet connections"
+msgstr "�能为以太网连接�用"
+
+#: ../libnm-core/nm-setting-8021x.c:2849
+#: ../libnm-core/nm-setting-bluetooth.c:94
+#: ../libnm-core/nm-setting-infiniband.c:162
+#: ../libnm-core/nm-setting-infiniband.c:172
+#: ../libnm-core/nm-setting-ip4-config.c:158
+#: ../libnm-core/nm-setting-ip6-config.c:207
+#: ../libnm-core/nm-setting-ip6-config.c:218
+#: ../libnm-core/nm-setting-olpc-mesh.c:113
+#: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
+#: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
+#: ../libnm-core/nm-setting-wireless-security.c:988
+#: ../libnm-core/nm-setting-wireless-security.c:997
+#: ../libnm-core/nm-setting-wireless-security.c:1006
+#: ../libnm-core/nm-setting-wireless-security.c:1016
+#: ../libnm-core/nm-setting-wireless-security.c:1026
+#: ../libnm-core/nm-setting-wireless-security.c:1049
+#: ../libnm-core/nm-setting-wireless-security.c:1087
 #: ../libnm-core/nm-setting-wireless-security.c:1128
-#: ../libnm-core/nm-setting-wireless-security.c:1169
-#: ../libnm-core/nm-setting-wireless.c:847
-#: ../libnm-core/nm-setting-wireless.c:856
-#: ../libnm-core/nm-setting-wireless.c:867 ../libnm-core/nm-setting-wpan.c:176
-#: ../libnm-core/nm-utils.c:4543
+#: ../libnm-core/nm-setting-wireless.c:830
+#: ../libnm-core/nm-setting-wireless.c:839
+#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
+#: ../libnm-core/nm-utils.c:4566
 msgid "property is invalid"
 msgstr "属性无效"
 
-#: ../libnm-core/nm-setting-8021x.c:2858 ../libnm-core/nm-setting-8021x.c:2870
-#: ../libnm-core/nm-setting-8021x.c:2884 ../libnm-core/nm-setting-8021x.c:2911
-#: ../libnm-core/nm-setting-8021x.c:2926 ../libnm-core/nm-setting-adsl.c:191
-#: ../libnm-core/nm-setting-adsl.c:203 ../libnm-core/nm-setting-bluetooth.c:136
-#: ../libnm-core/nm-setting-wireless-security.c:938
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
+#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
+#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
+#: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
+#: ../libnm-core/nm-setting-wireless-security.c:923
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "\"%s\" �是该属性的有效�值"
 
-#: ../libnm-core/nm-setting-8021x.c:2894
+#: ../libnm-core/nm-setting-8021x.c:2912
 msgid "invalid auth flags"
 msgstr "无效的验�标记"
 
-#: ../libnm-core/nm-setting-bluetooth.c:158
+#: ../libnm-core/nm-setting-bluetooth.c:144
 #, c-format
 msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "\"%s\" 连接需� \"%s\" 或者 \"%s\" 设置"
 
-#: ../libnm-core/nm-setting-bluetooth.c:204
+#: ../libnm-core/nm-setting-bluetooth.c:190
 #, c-format
 msgid "'%s' connection requires '%s' setting"
 msgstr "\"%s\" 连接需� \"%s\" 设置"
 
-#: ../libnm-core/nm-setting-bond.c:555
+#: ../libnm-core/nm-setting-bond.c:541
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "无效的选项 \"%s\" 或其值 \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:580
+#: ../libnm-core/nm-setting-bond.c:566
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "�能设置 \"%s\" 和 \"%s\" 中的一个"
 
-#: ../libnm-core/nm-setting-bond.c:593
+#: ../libnm-core/nm-setting-bond.c:579
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "缺少必填选项 \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:603
+#: ../libnm-core/nm-setting-bond.c:589
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "\"%s\" �是 \"%s\" 的有效�值"
 
-#: ../libnm-core/nm-setting-bond.c:617
+#: ../libnm-core/nm-setting-bond.c:603
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "\"%s=%s\" 与 \"%s > 0\" �兼容"
 
-#: ../libnm-core/nm-setting-bond.c:632
+#: ../libnm-core/nm-setting-bond.c:618
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "\"%s\" 对 \"%s\" 选项无效：%s"
 
-#: ../libnm-core/nm-setting-bond.c:643
+#: ../libnm-core/nm-setting-bond.c:629
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "\"%s\" 选项�能在 \"%s=%s\" 中使用"
 
-#: ../libnm-core/nm-setting-bond.c:656
+#: ../libnm-core/nm-setting-bond.c:642
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "\"%s=%s\" �是 \"%s\" 的有效�置"
 
-#: ../libnm-core/nm-setting-bond.c:669 ../libnm-core/nm-setting-bond.c:678
-#: ../libnm-core/nm-setting-bond.c:698 ../libnm-core/nm-setting-bond.c:734
+#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
+#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "\"%s\" 选项需�设置 \"%s\" 选项"
 
-#: ../libnm-core/nm-setting-bond.c:709
+#: ../libnm-core/nm-setting-bond.c:695
 #, c-format
 msgid "'%s' option is empty"
 msgstr "\"%s\"选项为空"
 
-#: ../libnm-core/nm-setting-bond.c:721
+#: ../libnm-core/nm-setting-bond.c:707
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "\"%s\" �是 \"%s\" 选项的有效 IPv4 地�"
 
-#: ../libnm-core/nm-setting-bond.c:749
+#: ../libnm-core/nm-setting-bond.c:735
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "\"%s\" 选项�在 \"%s\" 模�里有效"
 
-#: ../libnm-core/nm-setting-bond.c:760
+#: ../libnm-core/nm-setting-bond.c:746
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "\"%s\" 和 \"%s\" �能有��的值"
 
-#: ../libnm-core/nm-setting-bond.c:776
+#: ../libnm-core/nm-setting-bond.c:762
 #, c-format
 msgid "'%s' option should be string"
 msgstr "\"%s\" 选项应该为字符串"
 
-#: ../libnm-core/nm-setting-bond.c:792
+#: ../libnm-core/nm-setting-bond.c:778
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "\"%s\" 选项在 \"%s\" 模�里无效"
 
-#: ../libnm-core/nm-setting-bridge-port.c:315
-#: ../libnm-core/nm-setting-ovs-bridge.c:167
-#: ../libnm-core/nm-setting-ovs-interface.c:273
-#: ../libnm-core/nm-setting-ovs-port.c:186
-#: ../libnm-core/nm-setting-team-port.c:313
+#: ../libnm-core/nm-setting-bridge-port.c:301
+#: ../libnm-core/nm-setting-ovs-bridge.c:153
+#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-port.c:172
+#: ../libnm-core/nm-setting-team-port.c:299
 #, c-format
 msgid "missing setting"
 msgstr "缺少设置"
 
-#: ../libnm-core/nm-setting-bridge-port.c:326
-#: ../libnm-core/nm-setting-ovs-interface.c:294
-#: ../libnm-core/nm-setting-ovs-port.c:207
-#: ../libnm-core/nm-setting-team-port.c:324
+#: ../libnm-core/nm-setting-bridge-port.c:312
+#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-port.c:193
+#: ../libnm-core/nm-setting-team-port.c:310
 #, c-format
 msgid ""
 "A connection with a '%s' setting must have the slave-type set to '%s'. "
 "Instead it is '%s'"
 msgstr "具有 \"%s\" 设置的连接必须将 slave-type 设置为 \"%s\"。而它是 \"%s\""
 
-#: ../libnm-core/nm-setting-bridge.c:910
+#: ../libnm-core/nm-setting-bridge.c:896
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "值 '%d' 超出了范围 <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:927
+#: ../libnm-core/nm-setting-bridge.c:913
 msgid "is not a valid MAC address"
 msgstr "�是有效的 MAC 地�"
 
-#: ../libnm-core/nm-setting-bridge.c:968
+#: ../libnm-core/nm-setting-bridge.c:954
 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:945
+#: ../libnm-core/nm-setting-connection.c:931
 #, c-format
 msgid "setting required for connection of type '%s'"
 msgstr "类型为 \"%s\" 的连接需�设置"
 
-#: ../libnm-core/nm-setting-connection.c:984
+#: ../libnm-core/nm-setting-connection.c:970
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "\"%s\"�是有效的 UUID"
 
-#: ../libnm-core/nm-setting-connection.c:1034
+#: ../libnm-core/nm-setting-connection.c:1020
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "连接类型 \"%s\" 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1070
+#: ../libnm-core/nm-setting-connection.c:1056
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "未知的从类型 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1081
+#: ../libnm-core/nm-setting-connection.c:1067
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "从连接需�有效的 \"%s\" 属性"
 
-#: ../libnm-core/nm-setting-connection.c:1102
+#: ../libnm-core/nm-setting-connection.c:1088
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "没有 \"%s\" 无法设置 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1116
+#: ../libnm-core/nm-setting-connection.c:1102
 #, c-format
 msgid "'%s' connections must be enslaved to '%s', not '%s'"
 msgstr "\"%s\" 连接必须从属于 \"%s\"，而�是 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1130
+#: ../libnm-core/nm-setting-connection.c:1116
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "计�值 %d 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1141
-#: ../libnm-core/nm-setting-connection.c:1152
-#: ../libnm-core/nm-setting-connection.c:1165
+#: ../libnm-core/nm-setting-connection.c:1127
+#: ../libnm-core/nm-setting-connection.c:1138
+#: ../libnm-core/nm-setting-connection.c:1151
 #, c-format
 msgid "value %d is not valid"
 msgstr "值 %d 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1178
+#: ../libnm-core/nm-setting-connection.c:1164
 #, c-format
 msgid "wait-device-timeout requires %s"
 msgstr "wait-device-timeout 需� %s"
 
-#: ../libnm-core/nm-setting-connection.c:1200
+#: ../libnm-core/nm-setting-connection.c:1186
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "属性类型应该设置为 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1215
+#: ../libnm-core/nm-setting-connection.c:1201
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "slave-type \"%s\" �求连接中有 \"%s\" 设置"
 
-#: ../libnm-core/nm-setting-connection.c:1225
+#: ../libnm-core/nm-setting-connection.c:1211
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr "检测到设置了 \"%s\" 和端�类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1242
+#: ../libnm-core/nm-setting-connection.c:1228
 #, 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:506
+#: ../libnm-core/nm-setting-dcb.c:492
 msgid "flags invalid"
 msgstr "标志无效"
 
-#: ../libnm-core/nm-setting-dcb.c:515
+#: ../libnm-core/nm-setting-dcb.c:501
 msgid "flags invalid - disabled"
 msgstr "标志无效 — 已�用"
 
-#: ../libnm-core/nm-setting-dcb.c:541 ../libnm-core/nm-setting-dcb.c:590
+#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
 msgid "property invalid (not enabled)"
 msgstr "属性无效（未�用）"
 
-#: ../libnm-core/nm-setting-dcb.c:550
+#: ../libnm-core/nm-setting-dcb.c:536
 msgid "element invalid"
 msgstr "元素无效"
 
-#: ../libnm-core/nm-setting-dcb.c:565
+#: ../libnm-core/nm-setting-dcb.c:551
 msgid "sum not 100%"
 msgstr "总和�是 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:599 ../libnm-core/nm-setting-dcb.c:631
+#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
 msgid "property invalid"
 msgstr "属性无效"
 
-#: ../libnm-core/nm-setting-dcb.c:621
+#: ../libnm-core/nm-setting-dcb.c:607
 msgid "property missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-setting-ethtool.c:305
+#: ../libnm-core/nm-setting-ethtool.c:291
 msgid "unsupported offload feature"
 msgstr "�支�的�载功能"
 
-#: ../libnm-core/nm-setting-ethtool.c:313
+#: ../libnm-core/nm-setting-ethtool.c:299
 msgid "offload feature has invalid variant type"
 msgstr "�载功能有无效的��类型"
 
-#: ../libnm-core/nm-setting-ethtool.c:336
+#: ../libnm-core/nm-setting-ethtool.c:322
 #, c-format
 msgid "unknown ethtool option '%s'"
 msgstr "未知的 ethtool 选项 \"%s\""
 
-#: ../libnm-core/nm-setting-gsm.c:297
+#: ../libnm-core/nm-setting-gsm.c:302
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "属性值 \"%s\" 为空或过长（>64）"
 
-#: ../libnm-core/nm-setting-gsm.c:329
+#: ../libnm-core/nm-setting-gsm.c:334
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "\"%s\" 包�无效字符（请使用 [A-Za-z._-]）"
 
-#: ../libnm-core/nm-setting-gsm.c:355
+#: ../libnm-core/nm-setting-gsm.c:361
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "\"%s\" 长度无效（应为 5 �或 6 �数）"
 
-#: ../libnm-core/nm-setting-gsm.c:366
+#: ../libnm-core/nm-setting-gsm.c:372
 #, c-format
 msgid "'%s' is not a number"
 msgstr "\"%s\" �是数字"
 
-#: ../libnm-core/nm-setting-gsm.c:400
+#: ../libnm-core/nm-setting-gsm.c:406
 msgid "property is empty or wrong size"
 msgstr "属性为空或大�错误"
 
-#: ../libnm-core/nm-setting-gsm.c:410
+#: ../libnm-core/nm-setting-gsm.c:416
 msgid "property must contain only digits"
 msgstr "属性必须�包�数字"
 
-#: ../libnm-core/nm-setting-infiniband.c:207
+#: ../libnm-core/nm-setting-gsm.c:428
+msgid "can't be enabled when manual configuration is present"
+msgstr "如果手工�置，则�能�用"
+
+#: ../libnm-core/nm-setting-infiniband.c:193
 msgid "Must specify a P_Key if specifying parent"
 msgstr "如果指定上级接�，则必须指定 P_Key"
 
-#: ../libnm-core/nm-setting-infiniband.c:217
+#: ../libnm-core/nm-setting-infiniband.c:203
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "InfiniBand P_Key 连接未指定上级接��"
 
-#: ../libnm-core/nm-setting-infiniband.c:255
+#: ../libnm-core/nm-setting-infiniband.c:241
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr "软件 infiniband 设备的接��必须为 \"%s\" 或未设置（但现在是 \"%s\"）"
 
-#: ../libnm-core/nm-setting-infiniband.c:279
+#: ../libnm-core/nm-setting-infiniband.c:265
 #, c-format
 msgid "mtu can be at most %u but it is %u"
 msgstr "mtu 最大为 %u，但它的值是 %u"
 
-#: ../libnm-core/nm-setting-ip-config.c:134
+#: ../libnm-core/nm-setting-ip-config.c:120
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "缺失 IPv4 地�"
 
-#: ../libnm-core/nm-setting-ip-config.c:134
+#: ../libnm-core/nm-setting-ip-config.c:120
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "缺失 IPv6 地�"
 
-#: ../libnm-core/nm-setting-ip-config.c:139
+#: ../libnm-core/nm-setting-ip-config.c:125
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "无效的 IPv4 地� \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:139
+#: ../libnm-core/nm-setting-ip-config.c:125
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "无效的 IPv6 地� \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:154
+#: ../libnm-core/nm-setting-ip-config.c:140
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "无效 IPv4 地��缀 \"%u\""
 
-#: ../libnm-core/nm-setting-ip-config.c:154
+#: ../libnm-core/nm-setting-ip-config.c:140
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "无效 IPv6 地��缀 \"%u\""
 
-#: ../libnm-core/nm-setting-ip-config.c:169
+#: ../libnm-core/nm-setting-ip-config.c:155
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "无效的路由度� \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:1287
-#: ../libnm-core/nm-setting-sriov.c:417
+#: ../libnm-core/nm-setting-ip-config.c:1282
+#: ../libnm-core/nm-setting-sriov.c:409
 msgid "unknown attribute"
 msgstr "未知属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:1297
-#: ../libnm-core/nm-setting-sriov.c:427
+#: ../libnm-core/nm-setting-ip-config.c:1292
+#: ../libnm-core/nm-setting-sriov.c:419
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "无效的属性类型 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1303
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "属性对 IPv4 路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:1309
+#: ../libnm-core/nm-setting-ip-config.c:1304
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "属性对 IPv6 路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:1325
-#: ../libnm-core/nm-setting-ip-config.c:1349
+#: ../libnm-core/nm-setting-ip-config.c:1318
+#: ../libnm-core/nm-setting-ip-config.c:1346
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "\"%s\" �是有效的 IPv4 地�"
 
-#: ../libnm-core/nm-setting-ip-config.c:1326
-#: ../libnm-core/nm-setting-ip-config.c:1350
+#: ../libnm-core/nm-setting-ip-config.c:1319
+#: ../libnm-core/nm-setting-ip-config.c:1347
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "\"%s\" �是有效的 IPv6 地�"
 
-#: ../libnm-core/nm-setting-ip-config.c:1340
+#: ../libnm-core/nm-setting-ip-config.c:1337
 #, c-format
 msgid "invalid prefix %s"
 msgstr "无效的�缀 %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2515
+#: ../libnm-core/nm-setting-ip-config.c:2513
 msgid "invalid priority"
 msgstr "无效的优先级"
 
-#: ../libnm-core/nm-setting-ip-config.c:2526
+#: ../libnm-core/nm-setting-ip-config.c:2524
 msgid "missing table"
 msgstr "缺少表"
 
-#: ../libnm-core/nm-setting-ip-config.c:2532
+#: ../libnm-core/nm-setting-ip-config.c:2530
 msgid "invalid action"
 msgstr "无效�作"
 
-#: ../libnm-core/nm-setting-ip-config.c:2539
+#: ../libnm-core/nm-setting-ip-config.c:2537
 msgid "has from/src but the prefix-length is zero"
 msgstr "带有 from/src 但是 prefix-length 为 0"
 
-#: ../libnm-core/nm-setting-ip-config.c:2546
+#: ../libnm-core/nm-setting-ip-config.c:2544
 msgid "missing from/src for a non zero prefix-length"
 msgstr "一个� 0 的 prefix-length 但没有 from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2551
+#: ../libnm-core/nm-setting-ip-config.c:2549
 msgid "invalid from/src"
 msgstr "无效的 from/src"
 
-#: ../libnm-core/nm-setting-ip-config.c:2556
+#: ../libnm-core/nm-setting-ip-config.c:2554
 msgid "invalid prefix length for from/src"
 msgstr "from/src 无效的�缀长度"
 
-#: ../libnm-core/nm-setting-ip-config.c:2563
+#: ../libnm-core/nm-setting-ip-config.c:2561
 msgid "has to/dst but the prefix-length is zero"
 msgstr "带有 to/dst 但是 prefix-length 为 0"
 
-#: ../libnm-core/nm-setting-ip-config.c:2570
+#: ../libnm-core/nm-setting-ip-config.c:2568
 msgid "missing to/dst for a non zero prefix-length"
 msgstr "一个� 0 的 prefix-length 但没有 to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2575
+#: ../libnm-core/nm-setting-ip-config.c:2573
 msgid "invalid to/dst"
 msgstr "无效的 to/dst"
 
-#: ../libnm-core/nm-setting-ip-config.c:2580
+#: ../libnm-core/nm-setting-ip-config.c:2578
 msgid "invalid prefix length for to/dst"
 msgstr "to/dst 无效的�缀长度"
 
-#: ../libnm-core/nm-setting-ip-config.c:2588
+#: ../libnm-core/nm-setting-ip-config.c:2586
 msgid "invalid iifname"
 msgstr "无效的 iifname"
 
-#: ../libnm-core/nm-setting-ip-config.c:2596
+#: ../libnm-core/nm-setting-ip-config.c:2594
 msgid "invalid oifname"
 msgstr "无效的 oifname"
 
-#: ../libnm-core/nm-setting-ip-config.c:2602
+#: ../libnm-core/nm-setting-ip-config.c:2600
 msgid "invalid source port range"
 msgstr "无效的�端�范围"
 
-#: ../libnm-core/nm-setting-ip-config.c:2608
+#: ../libnm-core/nm-setting-ip-config.c:2606
 msgid "invalid destination port range"
 msgstr "无效的目标端�范围"
 
-#: ../libnm-core/nm-setting-ip-config.c:2616
+#: ../libnm-core/nm-setting-ip-config.c:2614
 msgid "suppress_prefixlength out of range"
 msgstr "suppress_prefixlength 超出范围"
 
-#: ../libnm-core/nm-setting-ip-config.c:2621
+#: ../libnm-core/nm-setting-ip-config.c:2619
 msgid "suppress_prefixlength is only allowed with the to-table action"
 msgstr "�有 to-table �作�许 suppress_prefixlength"
 
-#: ../libnm-core/nm-setting-ip-config.c:2728
+#: ../libnm-core/nm-setting-ip-config.c:2726
 #, c-format
 msgid "duplicate key %s"
 msgstr "��的 %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:2742
+#: ../libnm-core/nm-setting-ip-config.c:2740
 #, c-format
 msgid "invalid key \"%s\""
 msgstr "无效的  \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:2755
+#: ../libnm-core/nm-setting-ip-config.c:2753
 #, c-format
 msgid "invalid variant type '%s' for \"%s\""
 msgstr "无效的�体类型 '%s'（对于 \"%s\"）"
 
-#: ../libnm-core/nm-setting-ip-config.c:2764
+#: ../libnm-core/nm-setting-ip-config.c:2762
 msgid "missing \""
 msgstr "缺少 \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2770
+#: ../libnm-core/nm-setting-ip-config.c:2768
 msgid "invalid \""
 msgstr "无效 \""
 
-#: ../libnm-core/nm-setting-ip-config.c:2967
+#: ../libnm-core/nm-setting-ip-config.c:2965
 msgid "Unsupported to-string-flags argument"
 msgstr "�支�的 to-string-flags �数"
 
-#: ../libnm-core/nm-setting-ip-config.c:2974
+#: ../libnm-core/nm-setting-ip-config.c:2972
 msgid "Unsupported extra-argument"
 msgstr "�支�的 extra-argument"
 
-#: ../libnm-core/nm-setting-ip-config.c:3240
+#: ../libnm-core/nm-setting-ip-config.c:3239
 #, c-format
 msgid "unsupported key \"%s\""
 msgstr "�支�的 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:3245
+#: ../libnm-core/nm-setting-ip-config.c:3244
 #, c-format
 msgid "duplicate key \"%s\""
 msgstr "��的 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:3250
+#: ../libnm-core/nm-setting-ip-config.c:3249
 #, c-format
 msgid "invalid value for \"%s\""
 msgstr "\"%s\" 无效的值"
 
-#: ../libnm-core/nm-setting-ip-config.c:3260
+#: ../libnm-core/nm-setting-ip-config.c:3259
 msgid "empty text does not describe a rule"
 msgstr "空文本没有�述一个规则"
 
-#: ../libnm-core/nm-setting-ip-config.c:3266
+#: ../libnm-core/nm-setting-ip-config.c:3265
 #, c-format
 msgid "missing argument for \"%s\""
 msgstr "\"%s\" 缺少�数"
 
-#: ../libnm-core/nm-setting-ip-config.c:3278
+#: ../libnm-core/nm-setting-ip-config.c:3277
 msgid "invalid \"from\" part"
 msgstr "无效的 \"from\" 部分"
 
-#: ../libnm-core/nm-setting-ip-config.c:3292
+#: ../libnm-core/nm-setting-ip-config.c:3291
 msgid "invalid \"to\" part"
 msgstr "无效的 \"to\" 部分"
 
-#: ../libnm-core/nm-setting-ip-config.c:3301
+#: ../libnm-core/nm-setting-ip-config.c:3300
 #, c-format
 msgid "cannot detect address family for rule"
 msgstr "无法为规则检测到地�家�"
 
-#: ../libnm-core/nm-setting-ip-config.c:3361
-#: ../libnm-core/nm-setting-ip-config.c:3455
+#: ../libnm-core/nm-setting-ip-config.c:3360
+#: ../libnm-core/nm-setting-ip-config.c:3454
 #, c-format
 msgid "rule is invalid: %s"
 msgstr "规则无效：%s"
 
-#: ../libnm-core/nm-setting-ip-config.c:3438
+#: ../libnm-core/nm-setting-ip-config.c:3437
 msgid "invalid address family"
 msgstr "无效的 地�家�"
 
-#: ../libnm-core/nm-setting-ip-config.c:4707
+#: ../libnm-core/nm-setting-ip-config.c:4710
 #, c-format
 msgid "rule #%u is invalid: %s"
 msgstr "规则 #%u 无效：%s"
 
-#: ../libnm-core/nm-setting-ip-config.c:4925
+#: ../libnm-core/nm-setting-ip-config.c:4966
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d。DNS �务器地�无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:4941
+#: ../libnm-core/nm-setting-ip-config.c:4982
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d。IP 地�无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-ip-config.c:4994
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d。IP 地�有无效类型的 \"label\" 属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:4962
+#: ../libnm-core/nm-setting-ip-config.c:5003
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d。IP 地�有无效标签 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:4976
+#: ../libnm-core/nm-setting-ip-config.c:5017
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "如果没有�置地�，网关会无法设置"
 
-#: ../libnm-core/nm-setting-ip-config.c:4985
+#: ../libnm-core/nm-setting-ip-config.c:5026
 msgid "gateway is invalid"
 msgstr "网关无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:4999
+#: ../libnm-core/nm-setting-ip-config.c:5040
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d。路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:5008
-#, c-format
-msgid "%d. route cannot be a default route"
-msgstr "%d。路由�能是默认路由"
-
-#: ../libnm-core/nm-setting-ip-config.c:5024
+#: ../libnm-core/nm-setting-ip-config.c:5056
 #, c-format
 msgid "%u. rule has wrong address-family"
 msgstr "%u. 规则带有错误的地�家�"
 
-#: ../libnm-core/nm-setting-ip-config.c:5033
+#: ../libnm-core/nm-setting-ip-config.c:5065
 #, c-format
 msgid "%u. rule is invalid: %s"
 msgstr "%u. 规则无效：%s"
 
-#: ../libnm-core/nm-setting-ip-config.c:5046
+#: ../libnm-core/nm-setting-ip-config.c:5079
+#, c-format
+msgid "'%s' is not a valid IAID"
+msgstr "'%s' �是一个有效的 IAID"
+
+#: ../libnm-core/nm-setting-ip-config.c:5093
+#, c-format
+msgid "the property cannot be set when '%s' is disabled"
+msgstr "当 '%s' 被�用时�能设置这个属性"
+
+#: ../libnm-core/nm-setting-ip-config.c:5115
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "网关与 \"%s\" �兼容"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:339
+#: ../libnm-core/nm-setting-ip-tunnel.c:325
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr "\"%d\" 是无效的隧�模�"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:362
-#: ../libnm-core/nm-setting-ip-tunnel.c:382
+#: ../libnm-core/nm-setting-ip-tunnel.c:348
+#: ../libnm-core/nm-setting-ip-tunnel.c:368
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "\"%s\" �是有效的 IPv%c 地�"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:399
+#: ../libnm-core/nm-setting-ip-tunnel.c:385
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "�能为 GRE 隧�指定隧�密钥"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:412
-#: ../libnm-core/nm-setting-ip-tunnel.c:428
+#: ../libnm-core/nm-setting-ip-tunnel.c:398
+#: ../libnm-core/nm-setting-ip-tunnel.c:414
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "\"%s\" �是有效的隧�密钥"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:440
+#: ../libnm-core/nm-setting-ip-tunnel.c:426
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "�有�用路径 MTU �现时��许固定的 TTL"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:453
+#: ../libnm-core/nm-setting-ip-tunnel.c:439
 #, c-format
 msgid "some flags are invalid for the select mode: %s"
 msgstr "有些标记对所选模�无效：%s"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:467
+#: ../libnm-core/nm-setting-ip-tunnel.c:453
 #, c-format
 msgid "wired setting not allowed for mode %s"
 msgstr "模� %s ��许有线设置"
 
-#: ../libnm-core/nm-setting-ip4-config.c:126
-#: ../libnm-core/nm-setting-ip6-config.c:173
+#: ../libnm-core/nm-setting-ip4-config.c:112
+#: ../libnm-core/nm-setting-ip6-config.c:159
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "\"%s=%s\" ��许这个属性为空"
 
-#: ../libnm-core/nm-setting-ip4-config.c:138
-#: ../libnm-core/nm-setting-ip4-config.c:148
-#: ../libnm-core/nm-setting-ip4-config.c:160
-#: ../libnm-core/nm-setting-ip6-config.c:188
-#: ../libnm-core/nm-setting-ip6-config.c:198
-#: ../libnm-core/nm-setting-ip6-config.c:208
+#: ../libnm-core/nm-setting-ip4-config.c:124
+#: ../libnm-core/nm-setting-ip4-config.c:134
+#: ../libnm-core/nm-setting-ip4-config.c:146
+#: ../libnm-core/nm-setting-ip6-config.c:174
+#: ../libnm-core/nm-setting-ip6-config.c:184
+#: ../libnm-core/nm-setting-ip6-config.c:194
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "此属性��许用于\"%s=%s\""
 
-#: ../libnm-core/nm-setting-ip4-config.c:197
+#: ../libnm-core/nm-setting-ip4-config.c:183
 #, c-format
 msgid "'%s' is not a valid FQDN"
 msgstr "\"%s\" �是有效的 FQDN"
 
-#: ../libnm-core/nm-setting-ip4-config.c:206
+#: ../libnm-core/nm-setting-ip4-config.c:192
 msgid "property cannot be set when dhcp-hostname is also set"
 msgstr "当设置了 dhcp-hostname 则�能设置属性"
 
-#: ../libnm-core/nm-setting-ip4-config.c:218
+#: ../libnm-core/nm-setting-ip4-config.c:204
+msgid "FQDN flags requires a FQDN set"
+msgstr "FQDN 标志需� FQDN 集"
+
+#: ../libnm-core/nm-setting-ip4-config.c:216
 #, c-format
 msgid "multiple addresses are not allowed for '%s=%s'"
 msgstr "\"%s=%s\" ��许多个地�"
 
-#: ../libnm-core/nm-setting-ip4-config.c:232
+#: ../libnm-core/nm-setting-ip4-config.c:230
 msgid "property should be TRUE when method is set to disabled"
 msgstr "方法设为�用时属性应该是 TRUE"
 
-#: ../libnm-core/nm-setting-ip6-config.c:247
+#: ../libnm-core/nm-setting-ip6-config.c:233
 msgid "value is not a valid token"
 msgstr "值�是有效的令牌"
 
-#: ../libnm-core/nm-setting-ip6-config.c:258
+#: ../libnm-core/nm-setting-ip6-config.c:244
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "�有 EUI64 地�生�模��有�义"
 
-#: ../libnm-core/nm-setting-ip6-config.c:269
+#: ../libnm-core/nm-setting-ip6-config.c:255
 msgid "invalid DUID"
 msgstr "无效的 DUID"
 
-#: ../libnm-core/nm-setting-ip6-config.c:281
+#: ../libnm-core/nm-setting-ip6-config.c:267
 msgid "token is not in canonical form"
 msgstr "令牌�是规范形�"
 
-#: ../libnm-core/nm-setting-ip6-config.c:294
+#: ../libnm-core/nm-setting-ip6-config.c:280
 msgid "property should be TRUE when method is set to ignore or disabled"
 msgstr "方法设为�用时属性应该是 TRUE"
 
-#: ../libnm-core/nm-setting-macsec.c:245
+#: ../libnm-core/nm-setting-macsec.c:231
 msgid "the key is empty"
 msgstr "密钥为空"
 
-#: ../libnm-core/nm-setting-macsec.c:256
+#: ../libnm-core/nm-setting-macsec.c:242
 #, c-format
 msgid "the key must be %d characters"
 msgstr "密钥必须是 %d 个字符"
 
-#: ../libnm-core/nm-setting-macsec.c:264
+#: ../libnm-core/nm-setting-macsec.c:250
 msgid "the key contains non-hexadecimal characters"
 msgstr "密钥包���六进制字符"
 
-#: ../libnm-core/nm-setting-macsec.c:326 ../libnm-core/nm-setting-macvlan.c:155
-#: ../libnm-core/nm-setting-vlan.c:638
+#: ../libnm-core/nm-setting-macsec.c:312 ../libnm-core/nm-setting-macvlan.c:141
+#: ../libnm-core/nm-setting-vlan.c:625
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "属性未指定，也�是 \"%s:%s\""
 
-#: ../libnm-core/nm-setting-macsec.c:347
+#: ../libnm-core/nm-setting-macsec.c:333
 #, c-format
 msgid "EAP key management requires '%s' setting presence"
 msgstr "EAP 密钥管�需� \"%s\" 设置存在"
 
-#: ../libnm-core/nm-setting-macsec.c:356
+#: ../libnm-core/nm-setting-macsec.c:342
 msgid "must be either psk (0) or eap (1)"
 msgstr "必须为 psk (0) 或 eap (1)"
 
-#: ../libnm-core/nm-setting-macsec.c:365
+#: ../libnm-core/nm-setting-macsec.c:351
 #, c-format
 msgid "invalid port %d"
 msgstr "无效的端� %d"
 
-#: ../libnm-core/nm-setting-macsec.c:376
+#: ../libnm-core/nm-setting-macsec.c:362
 msgid "only valid for psk mode"
 msgstr "�对 psk 模�有效"
 
-#: ../libnm-core/nm-setting-macvlan.c:166
+#: ../libnm-core/nm-setting-macvlan.c:152
 msgid "non promiscuous operation is allowed only in passthru mode"
 msgstr "�有通过（passthru）模���许无混��作"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:108
-#: ../libnm-core/nm-setting-wireless.c:786
+#: ../libnm-core/nm-setting-olpc-mesh.c:94
+#: ../libnm-core/nm-setting-wireless.c:769
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "SSID 长度超出 <1-32> 字节范围"
 
-#: ../libnm-core/nm-setting-olpc-mesh.c:117
-#: ../libnm-core/nm-setting-wireless.c:826
+#: ../libnm-core/nm-setting-olpc-mesh.c:103
+#: ../libnm-core/nm-setting-wireless.c:809
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "\"%d\" �是有效的信�"
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:176
+#: ../libnm-core/nm-setting-ovs-bridge.c:162
 #, c-format
 msgid "A connection with a '%s' setting must not have a master."
 msgstr "有 \"%s\" 设置的连接�能有主连接。"
 
-#: ../libnm-core/nm-setting-ovs-bridge.c:187
+#: ../libnm-core/nm-setting-ovs-bridge.c:173
 #, c-format
 msgid "'%s' is not allowed in fail_mode"
 msgstr "\"%s\" 在 fail_mode 里��许"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:108
+#: ../libnm-core/nm-setting-ovs-interface.c:94
 #, c-format
 msgid "'%s' is not a valid interface type"
 msgstr "\"%s\" �是有效的接�类型"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:130
+#: ../libnm-core/nm-setting-ovs-interface.c:116
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr "有 \"%s\" 设置的连接需�明确设定 connection.type"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:142
+#: ../libnm-core/nm-setting-ovs-interface.c:128
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
 msgstr "\"%s\" 类型的连接�能有 ovs-interface.type \"system\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:154
+#: ../libnm-core/nm-setting-ovs-interface.c:140
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
 msgstr "\"%s\" 类型的连接�能有 ovs-interface.type \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:159
 #, c-format
 msgid "A connection can not have both '%s' and '%s' settings at the same time"
 msgstr "一个连接�能�时设置 '%s' 和 '%s'"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:187
+#: ../libnm-core/nm-setting-ovs-interface.c:173
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
 msgstr "有 \"%s\" 设置的连接必须是 connection.type \"ovs-interface\" 类型，但现在是 \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:199
+#: ../libnm-core/nm-setting-ovs-interface.c:185
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of '%s' interface type, not '%s'"
 msgstr "一个带有 '%s' 设置的连接需�是 '%s' 接�类型，而�是 '%s'"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:215
+#: ../libnm-core/nm-setting-ovs-interface.c:201
 #, c-format
-msgid ""
-"A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
+msgid "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr "ovs-interface.type \"%s\" 类型的连接缺少设置 \"ovs-patch\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:235
+#: ../libnm-core/nm-setting-ovs-interface.c:221
 #, c-format
 msgid "Missing ovs interface setting"
 msgstr "缺少 ovs 接�设置"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:241
+#: ../libnm-core/nm-setting-ovs-interface.c:227
 #, c-format
 msgid "Missing ovs interface type"
 msgstr "缺少 ovs 接�类型"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:282
-#: ../libnm-core/nm-setting-ovs-port.c:195
+#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-port.c:181
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
 msgstr "有 \"%s\" 设置的连接必须有个主连接。"
 
-#: ../libnm-core/nm-setting-ovs-patch.c:103
-#: ../libnm-core/nm-setting-vxlan.c:352
+#: ../libnm-core/nm-setting-ovs-patch.c:89 ../libnm-core/nm-setting-vxlan.c:338
 #, c-format
 msgid "'%s' is not a valid IP address"
 msgstr "\"%s\" �是有效的 IP 地�"
 
-#: ../libnm-core/nm-setting-ovs-port.c:220
+#: ../libnm-core/nm-setting-ovs-port.c:206
 #, c-format
 msgid "'%s' is not allowed in vlan_mode"
 msgstr "\"%s\" 在 vlan_mode 里��许"
 
-#: ../libnm-core/nm-setting-ovs-port.c:230
+#: ../libnm-core/nm-setting-ovs-port.c:216
 #, c-format
 msgid "the tag id must be in range 0-4094 but is %u"
 msgstr "标记 ID 必须在 0～4094 范围内，但其是 %u"
 
-#: ../libnm-core/nm-setting-ovs-port.c:240
+#: ../libnm-core/nm-setting-ovs-port.c:226
 #, c-format
 msgid "'%s' is not allowed in lacp"
 msgstr "\"%s\" 在 lacp 里��许"
 
-#: ../libnm-core/nm-setting-ovs-port.c:250
+#: ../libnm-core/nm-setting-ovs-port.c:236
 #, c-format
 msgid "'%s' is not allowed in bond_mode"
 msgstr "\"%s\" 在 bond_mode 里��许"
 
-#: ../libnm-core/nm-setting-ppp.c:350
+#: ../libnm-core/nm-setting-ppp.c:336
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "'%d' 超出了有效范围 <128-16384>"
 
-#: ../libnm-core/nm-setting-ppp.c:363
+#: ../libnm-core/nm-setting-ppp.c:349
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr "设置此属性�求 \"%s\" 属性�为零"
 
-#: ../libnm-core/nm-setting-proxy.c:146
+#: ../libnm-core/nm-setting-proxy.c:132
 #, c-format
 msgid "invalid proxy method"
 msgstr "无效的代�方法"
 
-#: ../libnm-core/nm-setting-proxy.c:156 ../libnm-core/nm-setting-proxy.c:165
+#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "无方法时��许此属性"
 
-#: ../libnm-core/nm-setting-proxy.c:176
+#: ../libnm-core/nm-setting-proxy.c:162
 #, c-format
 msgid "the script is too large"
 msgstr "脚本太大"
 
-#: ../libnm-core/nm-setting-proxy.c:184
+#: ../libnm-core/nm-setting-proxy.c:170
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "脚本�是有效的 utf8"
 
-#: ../libnm-core/nm-setting-proxy.c:192
+#: ../libnm-core/nm-setting-proxy.c:178
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "脚本缺少 FindProxyForURL 功能"
 
-#: ../libnm-core/nm-setting-sriov.c:1074
+#: ../libnm-core/nm-setting-sriov.c:1066
 #, c-format
 msgid "VF with index %u, but the total number of VFs is %u"
 msgstr "有索引为 %u 的虚拟功能，但虚拟功能总数为 %u"
 
-#: ../libnm-core/nm-setting-sriov.c:1085
+#: ../libnm-core/nm-setting-sriov.c:1077
 #, c-format
 msgid "invalid VF %u: %s"
 msgstr "无效的虚拟功能 %u：%s"
 
-#: ../libnm-core/nm-setting-sriov.c:1097
+#: ../libnm-core/nm-setting-sriov.c:1089
 #, c-format
 msgid "duplicate VF index %u"
 msgstr "��的虚拟功能索引 %u"
 
-#: ../libnm-core/nm-setting-sriov.c:1118
+#: ../libnm-core/nm-setting-sriov.c:1110
 #, c-format
 msgid "VFs %d and %d are not sorted by ascending index"
 msgstr "虚拟功能 %d 和 %d 未按��排列"
 
-#: ../libnm-core/nm-setting-tc-config.c:70
-#: ../libnm-core/nm-setting-tc-config.c:436
-#: ../libnm-core/nm-setting-tc-config.c:706
+#: ../libnm-core/nm-setting-tc-config.c:56
+#: ../libnm-core/nm-setting-tc-config.c:422
+#: ../libnm-core/nm-setting-tc-config.c:692
 #, c-format
 msgid "kind is missing"
 msgstr "缺少�类"
 
-#: ../libnm-core/nm-setting-tc-config.c:78
-#: ../libnm-core/nm-setting-tc-config.c:444
-#: ../libnm-core/nm-setting-tc-config.c:714
+#: ../libnm-core/nm-setting-tc-config.c:64
+#: ../libnm-core/nm-setting-tc-config.c:430
+#: ../libnm-core/nm-setting-tc-config.c:700
 #, c-format
 msgid "'%s' is not a valid kind"
 msgstr "\"%s\" �是有效的�类"
 
-#: ../libnm-core/nm-setting-tc-config.c:86
-#: ../libnm-core/nm-setting-tc-config.c:722
+#: ../libnm-core/nm-setting-tc-config.c:72
+#: ../libnm-core/nm-setting-tc-config.c:708
 msgid "parent handle missing"
 msgstr "缺少上级处�模�"
 
-#: ../libnm-core/nm-setting-tc-config.c:1292
+#: ../libnm-core/nm-setting-tc-config.c:1278
 msgid "there are duplicate TC qdiscs"
 msgstr "存在��的 TC 排队规则"
 
-#: ../libnm-core/nm-setting-tc-config.c:1312
+#: ../libnm-core/nm-setting-tc-config.c:1298
 msgid "there are duplicate TC filters"
 msgstr "存在��的 TC 过滤器"
 
-#: ../libnm-core/nm-setting-team.c:129 ../libnm-core/nm-setting-team.c:190
-#: ../libnm-core/nm-setting-team.c:312
+#: ../libnm-core/nm-setting-team.c:115 ../libnm-core/nm-setting-team.c:176
+#: ../libnm-core/nm-setting-team.c:298
 #, c-format
 msgid "%s is out of range [0, %d]"
 msgstr "%s 超出了范围 [0, %d]"
 
-#: ../libnm-core/nm-setting-team.c:172
+#: ../libnm-core/nm-setting-team.c:158
 #, c-format
 msgid "Missing target-host in nsna_ping link watcher"
 msgstr "在 nsna_ping 链路监视器里缺少目标主机"
 
-#: ../libnm-core/nm-setting-team.c:178 ../libnm-core/nm-setting-team.c:294
+#: ../libnm-core/nm-setting-team.c:164 ../libnm-core/nm-setting-team.c:280
 #, c-format
 msgid "target-host '%s' contains invalid characters"
 msgstr "目标主机 \"%s\" 包�无效的字符"
 
-#: ../libnm-core/nm-setting-team.c:287
+#: ../libnm-core/nm-setting-team.c:273
 #, c-format
 msgid "Missing %s in arp_ping link watcher"
 msgstr "在 arp_ping 链路监视器里缺少 %s"
 
-#: ../libnm-core/nm-setting-team.c:300
+#: ../libnm-core/nm-setting-team.c:286
 #, c-format
 msgid "source-host '%s' contains invalid characters"
 msgstr "��主机 \"%s\" 包�无效的字符"
 
-#: ../libnm-core/nm-setting-team.c:318
+#: ../libnm-core/nm-setting-team.c:304
 msgid "vlanid is out of range [-1, 4094]"
 msgstr "vlanid 超出范围 [-1, 4094]"
 
-#: ../libnm-core/nm-setting-tun.c:165
+#: ../libnm-core/nm-setting-tun.c:151
 #, c-format
 msgid "'%u': invalid mode"
 msgstr "\"%u\"：无效模�"
 
-#: ../libnm-core/nm-setting-tun.c:175
+#: ../libnm-core/nm-setting-tun.c:161
 #, c-format
 msgid "'%s': invalid user ID"
 msgstr "\"%s\"：无效的用户 ID"
 
-#: ../libnm-core/nm-setting-tun.c:186
+#: ../libnm-core/nm-setting-tun.c:172
 #, c-format
 msgid "'%s': invalid group ID"
 msgstr "\"%s\"：无效的组 ID"
 
-#: ../libnm-core/nm-setting-user.c:107
+#: ../libnm-core/nm-setting-user.c:93
 msgid "missing key"
 msgstr "缺少密钥"
 
-#: ../libnm-core/nm-setting-user.c:113
+#: ../libnm-core/nm-setting-user.c:99
 msgid "key is too long"
 msgstr "密钥太长"
 
-#: ../libnm-core/nm-setting-user.c:118
+#: ../libnm-core/nm-setting-user.c:104
 msgid "key must be UTF8"
 msgstr "密�必须是 UTF-8 格�"
 
-#: ../libnm-core/nm-setting-user.c:141
+#: ../libnm-core/nm-setting-user.c:127
 msgid "key requires a '.' for a namespace"
 msgstr "密钥需� \".\" 用于命�空间"
 
-#: ../libnm-core/nm-setting-user.c:154
+#: ../libnm-core/nm-setting-user.c:140
 msgid "key cannot contain \"..\""
 msgstr "密钥�能包� \"..\""
 
-#: ../libnm-core/nm-setting-user.c:159
+#: ../libnm-core/nm-setting-user.c:145
 msgid "key contains invalid characters"
 msgstr "密钥包�无效的字符"
 
-#: ../libnm-core/nm-setting-user.c:184
+#: ../libnm-core/nm-setting-user.c:170
 msgid "value is missing"
 msgstr "缺少值"
 
-#: ../libnm-core/nm-setting-user.c:191
+#: ../libnm-core/nm-setting-user.c:177
 msgid "value is too large"
 msgstr "值太大"
 
-#: ../libnm-core/nm-setting-user.c:197
+#: ../libnm-core/nm-setting-user.c:183
 msgid "value is not valid UTF8"
 msgstr "值�是有效的 UTF-8"
 
-#: ../libnm-core/nm-setting-user.c:327
+#: ../libnm-core/nm-setting-user.c:313
 msgid "maximum number of user data entries reached"
 msgstr "已达到最大的用户数�输入项"
 
-#: ../libnm-core/nm-setting-user.c:368
+#: ../libnm-core/nm-setting-user.c:354
 #, c-format
 msgid "invalid key \"%s\": %s"
 msgstr "无效的密钥 \"%s\"：%s"
 
-#: ../libnm-core/nm-setting-user.c:387
+#: ../libnm-core/nm-setting-user.c:373
 #, c-format
 msgid "maximum number of user data entries reached (%u instead of %u)"
 msgstr "已达到最大的用户数�输入项（现为 %u，最大�有 %u ）"
 
-#: ../libnm-core/nm-setting-vlan.c:649
+#: ../libnm-core/nm-setting-vlan.c:636
 #, c-format
 msgid "the vlan id must be in range 0-4094 but is %u"
 msgstr "vlan id 的必须在范围 0～4094 内，但�是 %u"
 
-#: ../libnm-core/nm-setting-vlan.c:659
+#: ../libnm-core/nm-setting-vlan.c:646
 msgid "flags are invalid"
 msgstr "标记无效"
 
-#: ../libnm-core/nm-setting-vlan.c:671
+#: ../libnm-core/nm-setting-vlan.c:658
 msgid "vlan setting should have a ethernet setting as well"
 msgstr "vlan 设置也应该有以太网设置"
 
-#: ../libnm-core/nm-setting-vpn.c:560
+#: ../libnm-core/nm-setting-vpn.c:546
 msgid "cannot set connection.multi-connect for VPN setting"
 msgstr "无法为 VPN 设置设定 connection.multi-connect"
 
-#: ../libnm-core/nm-setting-vpn.c:581
+#: ../libnm-core/nm-setting-vpn.c:567
 #, c-format
 msgid "secret was empty"
 msgstr "密钥为空"
 
-#: ../libnm-core/nm-setting-vpn.c:611
+#: ../libnm-core/nm-setting-vpn.c:597
 msgid "setting contained a secret with an empty name"
 msgstr "设置包�具有空�称的密钥"
 
-#: ../libnm-core/nm-setting-vpn.c:619
+#: ../libnm-core/nm-setting-vpn.c:605
 #, c-format
 msgid "secret value was empty"
 msgstr "密钥值为空"
 
-#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2224
+#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
 msgid "not a secret property"
 msgstr "�是密钥（secret）属性"
 
-#: ../libnm-core/nm-setting-vpn.c:672
+#: ../libnm-core/nm-setting-vpn.c:658
 msgid "secret is not of correct type"
 msgstr "密钥（secret）�是正确的类型"
 
-#: ../libnm-core/nm-setting-vpn.c:756
+#: ../libnm-core/nm-setting-vpn.c:742
 msgid "secret flags property not found"
 msgstr "未找到 secret 标记属性"
 
-#: ../libnm-core/nm-setting-vxlan.c:365
+#: ../libnm-core/nm-setting-vxlan.c:351
 #, c-format
 msgid "'%s' is not a valid IP%c address"
 msgstr "\"%s\" �是有效的 IP%c 地�"
 
-#: ../libnm-core/nm-setting-vxlan.c:392
+#: ../libnm-core/nm-setting-vxlan.c:378
 #, c-format
 msgid "%d is greater than local port max %d"
 msgstr "%d 大于本地端�最大值 %d"
 
-#: ../libnm-core/nm-setting-wired.c:752
+#: ../libnm-core/nm-setting-wired.c:738
 #, c-format
 msgid "'%s' is not a valid Ethernet port value"
 msgstr "\"%s\" �是有效的以太网端�值"
 
-#: ../libnm-core/nm-setting-wired.c:762
+#: ../libnm-core/nm-setting-wired.c:748
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "\"%s\"�是有效的�工值"
 
-#: ../libnm-core/nm-setting-wired.c:825
+#: ../libnm-core/nm-setting-wired.c:811
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "\"%s\" 或其值 \"%s\" 无效"
 
-#: ../libnm-core/nm-setting-wired.c:863
+#: ../libnm-core/nm-setting-wired.c:849
 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "LAN 唤醒模� \"default\" 和 \"ignore\" 是相互排斥的标记"
 
-#: ../libnm-core/nm-setting-wired.c:872
+#: ../libnm-core/nm-setting-wired.c:858
 msgid "Wake-on-LAN password can only be used with magic packet mode"
 msgstr "LAN 唤醒密��能在幻数�包模�使用"
 
-#: ../libnm-core/nm-setting-wired.c:898
-msgid ""
-"both speed and duplex should have a valid value or both should be unset"
+#: ../libnm-core/nm-setting-wired.c:884
+msgid "both speed and duplex should have a valid value or both should be unset"
 msgstr "速度和�工都应设定有效值或者都��未设定"
 
-#: ../libnm-core/nm-setting-wired.c:899
+#: ../libnm-core/nm-setting-wired.c:885
 msgid "both speed and duplex are required for static link configuration"
 msgstr "��链路�置需�设置速度和�工"
 
-#: ../libnm-core/nm-setting-wireguard.c:778
+#: ../libnm-core/nm-setting-wireguard.c:764
 msgid "missing public-key for peer"
-msgstr "peer 缺少 public-key "
+msgstr "peer 缺少 public-key"
 
-#: ../libnm-core/nm-setting-wireguard.c:782
+#: ../libnm-core/nm-setting-wireguard.c:768
 msgid "invalid public-key for peer"
 msgstr "peer 无效的 public-key"
 
-#: ../libnm-core/nm-setting-wireguard.c:791
+#: ../libnm-core/nm-setting-wireguard.c:777
 msgid "invalid preshared-key for peer"
 msgstr "peer 无效的 preshared-key"
 
-#: ../libnm-core/nm-setting-wireguard.c:809
+#: ../libnm-core/nm-setting-wireguard.c:795
 msgid "invalid endpoint for peer"
 msgstr "peer 无效的端点"
 
-#: ../libnm-core/nm-setting-wireguard.c:819
+#: ../libnm-core/nm-setting-wireguard.c:805
 #, c-format
 msgid "invalid IP address \"%s\" for allowed-ip of peer"
-msgstr "peer 的 allowed-ip 无效的 IP 地� \"%s\"  "
+msgstr "peer 的 allowed-ip 无效的 IP 地� \"%s\""
 
-#: ../libnm-core/nm-setting-wireguard.c:828
+#: ../libnm-core/nm-setting-wireguard.c:814
 msgid "invalid preshared-key-flags for peer"
 msgstr "peer 无效的 preshared-key-flags"
 
-#: ../libnm-core/nm-setting-wireguard.c:1604
+#: ../libnm-core/nm-setting-wireguard.c:1590
 #, c-format
 msgid "peer #%u has no public-key"
 msgstr "peer #%u 没有 public-key"
 
-#: ../libnm-core/nm-setting-wireguard.c:1615
+#: ../libnm-core/nm-setting-wireguard.c:1601
 #, c-format
 msgid "peer #%u has invalid public-key"
 msgstr "peer #%u 带有无效的 public-key"
 
-#: ../libnm-core/nm-setting-wireguard.c:1629
+#: ../libnm-core/nm-setting-wireguard.c:1615
 #, c-format
 msgid "peer #%u has invalid endpoint"
 msgstr "peer #%u 带有无效的端点"
 
-#: ../libnm-core/nm-setting-wireguard.c:1659
+#: ../libnm-core/nm-setting-wireguard.c:1645
 #, c-format
 msgid "peer #%u has invalid allowed-ips setting"
 msgstr "peer #%u 带有无效的 allowed-ips 设置"
 
-#: ../libnm-core/nm-setting-wireguard.c:1671
+#: ../libnm-core/nm-setting-wireguard.c:1657
 #, c-format
 msgid "peer #%u is invalid: %s"
 msgstr "peer #%u 无效：%s"
 
-#: ../libnm-core/nm-setting-wireguard.c:1742
-#: ../libnm-core/nm-setting-wireguard.c:1757
+#: ../libnm-core/nm-setting-wireguard.c:1728
+#: ../libnm-core/nm-setting-wireguard.c:1743
 #, c-format
 msgid "method \"%s\" is not supported for WireGuard"
 msgstr "方法 \"%s\" �支� WireGuard"
 
-#: ../libnm-core/nm-setting-wireguard.c:1777
+#: ../libnm-core/nm-setting-wireguard.c:1763
 msgid "key must be 32 bytes base64 encoded"
 msgstr "密钥需�是基于 base64 编�的 32 个字节"
 
-#: ../libnm-core/nm-setting-wireguard.c:1913
+#: ../libnm-core/nm-setting-wireguard.c:1899
 msgid "invalid peer secrets"
 msgstr "无效的 peer secrets"
 
-#: ../libnm-core/nm-setting-wireguard.c:1936
+#: ../libnm-core/nm-setting-wireguard.c:1922
 #, c-format
 msgid "peer #%u lacks public-key"
 msgstr "peer #%u 缺少 public-key"
 
-#: ../libnm-core/nm-setting-wireguard.c:1950
+#: ../libnm-core/nm-setting-wireguard.c:1936
 #, c-format
 msgid "non-existing peer '%s'"
 msgstr "�存在 peer '%s'"
 
-#: ../libnm-core/nm-setting-wireless-security.c:928
+#: ../libnm-core/nm-setting-wireless-security.c:913
 #, c-format
 msgid "'%s' is not a valid value for '%s' mode connections"
 msgstr "\"%s\" �是 \"%s\" 模�连接的有效值"
 
-#: ../libnm-core/nm-setting-wireless-security.c:951
+#: ../libnm-core/nm-setting-wireless-security.c:936
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "\"%s\" 安全需� \"%s=%s\""
 
-#: ../libnm-core/nm-setting-wireless-security.c:972
+#: ../libnm-core/nm-setting-wireless-security.c:957
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "\"%s\" 安全需� \"%s\" 设置存在"
 
-#: ../libnm-core/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:978
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "'%d' 值超出了 范围 <0-3>"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1048
-#, c-format
-msgid "'%s' connections require '%s' in this property"
-msgstr "\"%s\" 连接需�此属性中的 \"%s\""
-
-#: ../libnm-core/nm-setting-wireless-security.c:1078
+#: ../libnm-core/nm-setting-wireless-security.c:1037
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "\"%s\" �能与 \"%s=%s\"（WEP）共用"
 
-#: ../libnm-core/nm-setting-wireless-security.c:1102
+#: ../libnm-core/nm-setting-wireless-security.c:1061
 #, c-format
 msgid ""
 "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management "
-msgstr "'%s' �能用于 'wpa-eap'�'wpa-psk' 或 'sae' 密钥管�"
+msgstr "'%s' �能用于 'wpa-eap'�'wpa-psk' 或 'sae' 密钥管� "
 
-#: ../libnm-core/nm-setting-wireless.c:795
+#: ../libnm-core/nm-setting-wireless.c:778
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "\"%s\" �是有效的 Wi-Fi 模�"
 
-#: ../libnm-core/nm-setting-wireless.c:805
+#: ../libnm-core/nm-setting-wireless.c:788
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "\"%s\" �是有效频段"
 
-#: ../libnm-core/nm-setting-wireless.c:815
+#: ../libnm-core/nm-setting-wireless.c:798
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "\"%s\" 需�设置 \"%s\" 属性"
 
-#: ../libnm-core/nm-setting-wireless.c:837
+#: ../libnm-core/nm-setting-wireless.c:820
 #, c-format
 msgid "'%s' requires '%s' and '%s' property"
 msgstr "'%s' 需� '%s' 和 '%s' 属性"
 
-#: ../libnm-core/nm-setting-wireless.c:924 ../libnm-core/nm-team-utils.c:2004
+#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
 #, c-format
 msgid "invalid value"
 msgstr "无效值"
 
-#: ../libnm-core/nm-setting-wireless.c:934
+#: ../libnm-core/nm-setting-wireless.c:917
 msgid "Wake-on-WLAN mode 'default' and 'ignore' are exclusive flags"
 msgstr "WLAN 唤醒模� \"default\" 和 \"ignore\" 是相互排斥的标记"
 
-#: ../libnm-core/nm-setting-wireless.c:943
+#: ../libnm-core/nm-setting-wireless.c:926
 msgid "Wake-on-WLAN trying to set unknown flag"
 msgstr "WLAN 唤醒正在�试设定未知的标记"
 
-#: ../libnm-core/nm-setting-wireless.c:965
+#: ../libnm-core/nm-setting-wireless.c:948
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "mac-address-randomization 和 cloned-mac-address 的值冲�"
 
-#: ../libnm-core/nm-setting-wpan.c:185
+#: ../libnm-core/nm-setting-wpan.c:171
 msgid "page must be defined along with a channel"
 msgstr "页需�和一个频�定义"
 
-#: ../libnm-core/nm-setting-wpan.c:194
+#: ../libnm-core/nm-setting-wpan.c:180
 #, c-format
 msgid "page must be between %d and %d"
 msgstr "页需�在 %d 和 %d 之间"
 
-#: ../libnm-core/nm-setting-wpan.c:205
+#: ../libnm-core/nm-setting-wpan.c:191
 #, c-format
 msgid "channel must not be between %d and %d"
 msgstr "频��能在 %d 和 %d 之间"
 
-#: ../libnm-core/nm-setting.c:919
+#: ../libnm-core/nm-setting.c:806
 #, c-format
 msgid "duplicate property"
 msgstr "��的属性"
 
-#: ../libnm-core/nm-setting.c:942
+#: ../libnm-core/nm-setting.c:829
 #, c-format
 msgid "unknown property"
 msgstr "未知属性"
 
-#: ../libnm-core/nm-setting.c:1013 ../libnm-core/nm-setting.c:1062
+#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "无法从类型为 \"%s%s\" 的值设置类型为 \"\" 的属性"
 
-#: ../libnm-core/nm-setting.c:1032 ../libnm-core/nm-setting.c:1047
+#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:934
 #, c-format
 msgid "failed to set property: %s"
 msgstr "设定属性失败：%s"
 
-#: ../libnm-core/nm-setting.c:1077
+#: ../libnm-core/nm-setting.c:964
 #, c-format
 msgid "can not set property: %s"
 msgstr "无法设定属性：%s"
 
-#: ../libnm-core/nm-setting.c:2115
+#: ../libnm-core/nm-setting.c:2015
 msgid "secret not found"
 msgstr "未找到密钥"
 
-#: ../libnm-core/nm-team-utils.c:1338 ../libnm-core/nm-team-utils.c:1353
+#: ../libnm-core/nm-team-utils.c:1324 ../libnm-core/nm-team-utils.c:1339
 #, c-format
 msgid "invalid D-Bus property \"%s\""
 msgstr "无效的 D-Bus 属性 \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:1363
+#: ../libnm-core/nm-team-utils.c:1349
 #, c-format
 msgid "duplicate D-Bus property \"%s\""
 msgstr "��的 D-Bus 属性 \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:1384
+#: ../libnm-core/nm-team-utils.c:1370
 #, c-format
 msgid "invalid D-Bus property \"%s\" for \"%s\""
 msgstr "无效的 D-Bus 属性 \"%s\"（\"%s\"）"
 
-#: ../libnm-core/nm-team-utils.c:1442
+#: ../libnm-core/nm-team-utils.c:1428
 #, c-format
 msgid "unknown link-watcher name \"%s\""
 msgstr "未知的 link-watcher � \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:1993
+#: ../libnm-core/nm-team-utils.c:1979
 #, c-format
 msgid "value out or range"
 msgstr "值超出范围"
 
-#: ../libnm-core/nm-team-utils.c:2023
+#: ../libnm-core/nm-team-utils.c:2009
 #, c-format
 msgid "invalid runner-tx-hash"
 msgstr "无效的 runner-tx-hash"
 
-#: ../libnm-core/nm-team-utils.c:2050
+#: ../libnm-core/nm-team-utils.c:2036
 #, c-format
 msgid "%s is only allowed for runner %s"
 msgstr "%s �被 runner %s �许"
 
-#: ../libnm-core/nm-team-utils.c:2058
+#: ../libnm-core/nm-team-utils.c:2044
 #, c-format
 msgid "%s is only allowed for runners %s"
 msgstr "%s �被 runner %s �许"
 
-#: ../libnm-core/nm-team-utils.c:2075
+#: ../libnm-core/nm-team-utils.c:2061
 #, c-format
 msgid "cannot set parameters for lacp and activebackup runners together"
 msgstr "无法为 lacp 和 activebackup runner 一起设置�数"
 
-#: ../libnm-core/nm-team-utils.c:2084
+#: ../libnm-core/nm-team-utils.c:2070
 #, c-format
 msgid "missing link watcher"
 msgstr "缺少链路监视器"
 
-#: ../libnm-core/nm-team-utils.c:2106
+#: ../libnm-core/nm-team-utils.c:2092
 #, c-format
 msgid "team config exceeds size limit"
 msgstr "组�（team）�置超过大��制"
 
-#: ../libnm-core/nm-team-utils.c:2112
+#: ../libnm-core/nm-team-utils.c:2098
 #, c-format
 msgid "team config is not valid UTF-8"
 msgstr "team �置�是有效的 UTF-8"
 
-#: ../libnm-core/nm-team-utils.c:2118
-#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9014
+#: ../libnm-core/nm-team-utils.c:2104
+#: ../src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9025
 #, c-format
 msgid "invalid json"
 msgstr "无效的 json"
 
-#: ../libnm-core/nm-team-utils.c:2272
+#: ../libnm-core/nm-team-utils.c:2258
 #, c-format
 msgid "invalid D-Bus type \"%s\""
 msgstr "无效的 D-Bus 类型 \"%s\""
 
-#: ../libnm-core/nm-team-utils.c:2311
+#: ../libnm-core/nm-team-utils.c:2297
 #, c-format
 msgid "invalid link-watchers: %s"
 msgstr "无效的 link-watcher：%s"
 
-#: ../libnm-core/nm-utils.c:2327
+#: ../libnm-core/nm-utils.c:2330
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "\"%s\" �是有效的处�模�。"
 
-#: ../libnm-core/nm-utils.c:2455
+#: ../libnm-core/nm-utils.c:2458
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "�外的 \"%s\"：已指定上级。"
 
-#: ../libnm-core/nm-utils.c:2471
+#: ../libnm-core/nm-utils.c:2474
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "无效的�柄：\"%s\""
 
-#: ../libnm-core/nm-utils.c:2493
+#: ../libnm-core/nm-utils.c:2496
 msgid "parent not specified."
 msgstr "未指定上级。"
 
-#: ../libnm-core/nm-utils.c:2555
+#: ../libnm-core/nm-utils.c:2558
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "�支�的排队规则（qdisc）选项：\"%s\"。"
 
-#: ../libnm-core/nm-utils.c:2677
+#: ../libnm-core/nm-utils.c:2680
 msgid "action name missing."
 msgstr "�作�缺失。"
 
-#: ../libnm-core/nm-utils.c:2703
+#: ../libnm-core/nm-utils.c:2706
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "�支�的�作选项：\"%s\"。"
 
-#: ../libnm-core/nm-utils.c:2841
+#: ../libnm-core/nm-utils.c:2844
 msgid "invalid action: "
-msgstr "无效�作："
+msgstr "无效�作： "
 
-#: ../libnm-core/nm-utils.c:2845
+#: ../libnm-core/nm-utils.c:2848
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "�支�的��过滤器（tfilter）选项：\"%s\"。"
 
-#: ../libnm-core/nm-utils.c:3446
+#: ../libnm-core/nm-utils.c:3449
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "统计文件 %s 失败：%s"
 
-#: ../libnm-core/nm-utils.c:3455
+#: ../libnm-core/nm-utils.c:3458
 #, c-format
 msgid "not a file (%s)"
 msgstr "�是一个文件（%s）"
 
-#: ../libnm-core/nm-utils.c:3466
+#: ../libnm-core/nm-utils.c:3469
 #, c-format
 msgid "invalid file owner %d for %s"
-msgstr "对 %d%s 无效的文件所有者 "
+msgstr "对 %d%s 无效的文件所有者"
 
-#: ../libnm-core/nm-utils.c:3477
+#: ../libnm-core/nm-utils.c:3480
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s 的文件��"
 
-#: ../libnm-core/nm-utils.c:3487
+#: ../libnm-core/nm-utils.c:3490
 #, c-format
 msgid "reject %s"
 msgstr "拒� %s"
 
-#: ../libnm-core/nm-utils.c:3506
+#: ../libnm-core/nm-utils.c:3509
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "路径�是�对路径（%s）"
 
-#: ../libnm-core/nm-utils.c:3520
+#: ../libnm-core/nm-utils.c:3523
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "�件文件�存在（%s）"
 
-#: ../libnm-core/nm-utils.c:3528
+#: ../libnm-core/nm-utils.c:3531
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "�件�是有效的文件（%s）"
 
-#: ../libnm-core/nm-utils.c:3538
+#: ../libnm-core/nm-utils.c:3541
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "�支� libtool 归档（%s）"
 
-#: ../libnm-core/nm-utils.c:3620
+#: ../libnm-core/nm-utils.c:3623
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "无法找到 \"%s\" 二进制文件"
 
-#: ../libnm-core/nm-utils.c:4494
+#: ../libnm-core/nm-utils.c:4517
 msgid "unknown secret flags"
 msgstr "未知的 secret 标记"
 
-#: ../libnm-core/nm-utils.c:4504
+#: ../libnm-core/nm-utils.c:4527
 msgid "conflicting secret flags"
 msgstr "冲�的 secret 标记"
 
-#: ../libnm-core/nm-utils.c:4515
+#: ../libnm-core/nm-utils.c:4538
 msgid "secret flags must not be \"not-required\""
 msgstr "secret 标记�能为 \"not-required\""
 
-#: ../libnm-core/nm-utils.c:4523
+#: ../libnm-core/nm-utils.c:4546
 msgid "unsupported secret flags"
 msgstr "�支�的 secret 标记"
 
-#: ../libnm-core/nm-utils.c:4553
+#: ../libnm-core/nm-utils.c:4576
 msgid "can't be simultaneously disabled and enabled"
 msgstr "�能�时�用和�用"
 
-#: ../libnm-core/nm-utils.c:4561
+#: ../libnm-core/nm-utils.c:4584
 msgid "WPS is required"
 msgstr "需� WPS"
 
-#: ../libnm-core/nm-utils.c:4627
+#: ../libnm-core/nm-utils.c:4650
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "对于 %lld �置的掩�，该以太网 MAC 地�无效"
 
-#: ../libnm-core/nm-utils.c:4642
+#: ../libnm-core/nm-utils.c:4665
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "在�置 %u%lld，该以太网 MAC 地� # 无效"
 
-#: ../libnm-core/nm-utils.c:4702
+#: ../libnm-core/nm-utils.c:4725
 msgid "interface name is missing"
 msgstr "缺少接��"
 
-#: ../libnm-core/nm-utils.c:4708
+#: ../libnm-core/nm-utils.c:4731
 msgid "interface name is too short"
 msgstr "接��太短"
 
-#: ../libnm-core/nm-utils.c:4717
+#: ../libnm-core/nm-utils.c:4740
 msgid "interface name is reserved"
 msgstr "接��被�留"
 
-#: ../libnm-core/nm-utils.c:4729
+#: ../libnm-core/nm-utils.c:4752
 msgid "interface name contains an invalid character"
 msgstr "接��包�无效字符"
 
-#: ../libnm-core/nm-utils.c:4735
+#: ../libnm-core/nm-utils.c:4758
 msgid "interface name is longer than 15 characters"
 msgstr "接��长度超过 15 字符"
 
-#: ../libnm-core/nm-utils.c:5402
+#: ../libnm-core/nm-utils.c:5425
 msgid "not valid utf-8"
 msgstr "�是有效的 utf-8"
 
-#: ../libnm-core/nm-utils.c:5423 ../libnm-core/nm-utils.c:5476
+#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
 msgid "is not a JSON object"
 msgstr "�是 JSON 对象"
 
-#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
+#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
 msgid "value is NULL"
 msgstr "值为 NULL"
 
-#: ../libnm-core/nm-utils.c:5452 ../libnm-core/nm-utils.c:5489
+#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
 msgid "value is empty"
 msgstr "值为空"
 
-#: ../libnm-core/nm-utils.c:5464
+#: ../libnm-core/nm-utils.c:5487
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "�置 %d 有无效的 JSON（%s）"
 
-#: ../libnm-core/nm-utils.c:5584 ../libnm-core/nm-utils.c:5604
+#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
 msgid "unterminated escape sequence"
 msgstr "未结�的转义�列"
 
-#: ../libnm-core/nm-utils.c:5629
+#: ../libnm-core/nm-utils.c:5694
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "未知属性 \"%s\""
 
-#: ../libnm-core/nm-utils.c:5644
+#: ../libnm-core/nm-utils.c:5709
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "在 \"%2$s\" �缺少键值对分隔符 \"%1$c\""
 
-#: ../libnm-core/nm-utils.c:5660
+#: ../libnm-core/nm-utils.c:5725
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效"
 
-#: ../libnm-core/nm-utils.c:5669
+#: ../libnm-core/nm-utils.c:5734
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效"
 
-#: ../libnm-core/nm-utils.c:5679
+#: ../libnm-core/nm-utils.c:5744
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效"
 
-#: ../libnm-core/nm-utils.c:5689
+#: ../libnm-core/nm-utils.c:5754
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "�支�类型 \"%2$s\" 的属性 \"%1$s\""
 
-#: ../libnm-core/nm-utils.c:6038
+#: ../libnm-core/nm-utils.c:6119
 #, c-format
 msgid "Bridge VLANs %d and %d are not sorted by ascending vid"
 msgstr "网桥 VLANs %d 和 %d 没有根�生� vid 进行排�"
 
-#: ../libnm-core/nm-utils.c:6062
+#: ../libnm-core/nm-utils.c:6143
 #, c-format
 msgid "duplicate bridge VLAN vid %u"
 msgstr "��的网桥 VLAN vid %u"
 
-#: ../libnm-core/nm-utils.c:6074
+#: ../libnm-core/nm-utils.c:6155
 msgid "only one VLAN can be the PVID"
 msgstr "�有一个 VLAN �以是 PVID"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:295
+#: ../libnm-core/nm-utils.c:6205
+#, c-format
+msgid "unknown flags 0x%x"
+msgstr "未知标志 0x%x"
+
+#: ../libnm-core/nm-utils.c:6215
+msgid ""
+"'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time"
+msgstr "�能�时设置 'fqdn-no-update' 和 'fqdn-serv-update' 标志"
+
+#: ../libnm-core/nm-utils.c:6226
+msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags"
+msgstr "'fqdn-clear-flags' 标志与其他 FQDN 标志�兼容"
+
+#: ../libnm-core/nm-utils.c:6235
+msgid "DHCPv6 does not support the E (encoded) FQDN flag"
+msgstr "DHCPv6 �支� E（编�）FQDN 标志"
+
+#: ../libnm-core/nm-vpn-editor-plugin.c:281
 #, c-format
 msgid "cannot load plugin \"%s\": %s"
 msgstr "无法加载�件 \"%s\"：%s"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:306
+#: ../libnm-core/nm-vpn-editor-plugin.c:292
 #, c-format
 msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)"
 msgstr "从 %s 加载 nm_vpn_editor_plugin_factory() 失败（%s）"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:331
+#: ../libnm-core/nm-vpn-editor-plugin.c:317
 #, c-format
 msgid "unknown error initializing plugin %s"
 msgstr "�始化�件 %s 时出现未知错误"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:348
+#: ../libnm-core/nm-vpn-editor-plugin.c:334
 #, c-format
 msgid "cannot load VPN plugin in '%s': missing plugin name"
 msgstr "无法在 \"%s\" 里加载 VPN �件：缺少�件�称"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:357
+#: ../libnm-core/nm-vpn-editor-plugin.c:343
 #, c-format
 msgid "cannot load VPN plugin in '%s': invalid service name"
 msgstr "无法在 \"%s\" 里加载 VPN �件：无效的�务�称"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:500
+#: ../libnm-core/nm-vpn-editor-plugin.c:486
 #, c-format
 msgid "the plugin does not support import capability"
 msgstr "�件�支�导入功能"
 
-#: ../libnm-core/nm-vpn-editor-plugin.c:520
+#: ../libnm-core/nm-vpn-editor-plugin.c:506
 #, c-format
 msgid "the plugin does not support export capability"
 msgstr "�件�支�导出功能"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:107
+#: ../libnm-core/nm-vpn-plugin-info.c:93
 #, c-format
 msgid "missing filename"
 msgstr "缺少文件�"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:115
+#: ../libnm-core/nm-vpn-plugin-info.c:101
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "文件�必须为�对路径（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:124
+#: ../libnm-core/nm-vpn-plugin-info.c:110
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "文件�具有无效的格�（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:447
+#: ../libnm-core/nm-vpn-plugin-info.c:433
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "已存在具有相� %s.%s 值的冲��件（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:485
+#: ../libnm-core/nm-vpn-plugin-info.c:471
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "已存在具有相��称（%s）的冲��件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1067
+#: ../libnm-core/nm-vpn-plugin-info.c:1053
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "缺少 \"plugin\" 设置"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1077
+#: ../libnm-core/nm-vpn-plugin-info.c:1063
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s：���试加载之�已失败的�件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1153
+#: ../libnm-core/nm-vpn-plugin-info.c:1139
 msgid "missing filename to load VPN plugin info"
 msgstr "缺少文件��加载 VPN �件信�"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1165
+#: ../libnm-core/nm-vpn-plugin-info.c:1151
 msgid "missing name for VPN plugin info"
 msgstr "缺少 VPN �件信�的�称"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1174
+#: ../libnm-core/nm-vpn-plugin-info.c:1160
 msgid "missing service for VPN plugin info"
 msgstr "缺少 VPN �件信�的�务"
 
-#: ../libnm/nm-device-adsl.c:68
+#: ../libnm/nm-client.c:3584
+#, c-format
+msgid "request succeeded with %s but object is in an unsuitable state"
+msgstr "使用 %s 请求�功，但对象处于��适的状�"
+
+#: ../libnm/nm-client.c:3675
+#, c-format
+msgid "operation succeeded but object %s does not exist"
+msgstr "�作�功，但对象 %s �存在"
+
+#: ../libnm/nm-device-adsl.c:64
 msgid "The connection was not an ADSL connection."
 msgstr "此连接�是 ADSL 连接。"
 
-#: ../libnm/nm-device-bond.c:108
+#: ../libnm/nm-device-bond.c:104
 msgid "The connection was not a bond connection."
 msgstr "此连接�是绑定（bond）连接。"
 
-#: ../libnm/nm-device-bridge.c:112
+#: ../libnm/nm-device-bridge.c:108
 msgid "The connection was not a bridge connection."
 msgstr "此连接�是网桥连接。"
 
-#: ../libnm/nm-device-bt.c:134
+#: ../libnm/nm-device-bt.c:130
 #, c-format
 msgid "The connection was not a Bluetooth connection."
 msgstr "此连接�是�牙连接。"
 
-#: ../libnm/nm-device-bt.c:140
+#: ../libnm/nm-device-bt.c:136
 #, c-format
 msgid "The connection is of Bluetooth NAP type."
 msgstr "此连接为�牙 NAP 类型。"
 
-#: ../libnm/nm-device-bt.c:149
+#: ../libnm/nm-device-bt.c:145
 msgid "Invalid device Bluetooth address."
 msgstr "无效的设备�牙地�。"
 
-#: ../libnm/nm-device-bt.c:155
+#: ../libnm/nm-device-bt.c:151
 msgid "The Bluetooth addresses of the device and the connection didn't match."
 msgstr "设备和连接的�牙地��匹�。"
 
-#: ../libnm/nm-device-bt.c:164
+#: ../libnm/nm-device-bt.c:160
 msgid ""
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "设备缺少连接所�求的�牙功能。"
 
-#: ../libnm/nm-device-dummy.c:74
+#: ../libnm/nm-device-dummy.c:68
 msgid "The connection was not a dummy connection."
 msgstr "此连接�是虚拟（dummy）连接。"
 
-#: ../libnm/nm-device-dummy.c:81 ../libnm/nm-device-generic.c:95
-#: ../libnm/nm-device-ovs-bridge.c:96 ../libnm/nm-device-ovs-interface.c:67
-#: ../libnm/nm-device-ovs-port.c:96
+#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
+#: ../libnm/nm-device-ovs-port.c:84
 msgid "The connection did not specify an interface name."
 msgstr "此连接未指定接��。"
 
-#: ../libnm/nm-device-ethernet.c:203
+#: ../libnm/nm-device-ethernet.c:187
 msgid "The connection was not an Ethernet or PPPoE connection."
 msgstr "此连接�是以太网或 PPPoE 连接。"
 
-#: ../libnm/nm-device-ethernet.c:218
+#: ../libnm/nm-device-ethernet.c:202
 msgid "The connection and device differ in S390 subchannels."
 msgstr "此连接和设备在 S390 �信��相�。"
 
-#: ../libnm/nm-device-ethernet.c:233
+#: ../libnm/nm-device-ethernet.c:217
 #, c-format
 msgid "Invalid device MAC address %s."
 msgstr "无效的设备 MAC 地� %s。"
 
-#: ../libnm/nm-device-ethernet.c:238
+#: ../libnm/nm-device-ethernet.c:222
 msgid "The MACs of the device and the connection do not match."
 msgstr "设备和连接的 MAC 地��匹�。"
 
-#: ../libnm/nm-device-ethernet.c:248
+#: ../libnm/nm-device-ethernet.c:232
 #, c-format
 msgid "Invalid MAC in the blacklist: %s."
 msgstr "黑��里无效的 MAC 地�：%s。"
 
-#: ../libnm/nm-device-ethernet.c:254
+#: ../libnm/nm-device-ethernet.c:238
 #, c-format
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "设备 MAC（%s）被连接列入了黑��。"
 
-#: ../libnm/nm-device-generic.c:88
+#: ../libnm/nm-device-generic.c:84
 msgid "The connection was not a generic connection."
 msgstr "此连接�是通用的连接。"
 
-#: ../libnm/nm-device-infiniband.c:90
+#: ../libnm/nm-device-infiniband.c:86
 msgid "The connection was not an InfiniBand connection."
 msgstr "此连接�是 InfiniBand 连接。"
 
-#: ../libnm/nm-device-infiniband.c:98 ../libnm/nm-device-wifi.c:621
-#: ../libnm/nm-device-wimax.c:321
+#: ../libnm/nm-device-infiniband.c:94 ../libnm/nm-device-wifi.c:470
 msgid "Invalid device MAC address."
 msgstr "无效的设备 MAC 地�。"
 
-#: ../libnm/nm-device-infiniband.c:106 ../libnm/nm-device-wifi.c:628
-#: ../libnm/nm-device-wimax.c:328
+#: ../libnm/nm-device-infiniband.c:102 ../libnm/nm-device-wifi.c:477
 msgid "The MACs of the device and the connection didn't match."
 msgstr "设备和连接的 MAC 地��匹�。"
 
-#: ../libnm/nm-device-ip-tunnel.c:268
+#: ../libnm/nm-device-ip-tunnel.c:264
 msgid "The connection was not an IP tunnel connection."
 msgstr "此连接�是 IP 隧�连接。"
 
-#: ../libnm/nm-device-macvlan.c:154
+#: ../libnm/nm-device-macvlan.c:151
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "此连接�是 MAC-VLAN 连接。"
 
-#: ../libnm/nm-device-modem.c:178
+#: ../libnm/nm-device-modem.c:175
 msgid "The connection was not a modem connection."
 msgstr "此连接�是调制解调器连接。"
 
-#: ../libnm/nm-device-modem.c:186
+#: ../libnm/nm-device-modem.c:183
 msgid "The connection was not a valid modem connection."
 msgstr "此连接�是有效的调制解调器连接。"
 
-#: ../libnm/nm-device-modem.c:193
+#: ../libnm/nm-device-modem.c:190
 msgid "The device is lacking capabilities required by the connection."
 msgstr "设备缺少连接所�求的功能。"
 
-#: ../libnm/nm-device-olpc-mesh.c:111
+#: ../libnm/nm-device-olpc-mesh.c:107
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "此连接�是 OLPC Mesh 连接。"
 
-#: ../libnm/nm-device-ovs-bridge.c:89
+#: ../libnm/nm-device-ovs-bridge.c:77
 msgid "The connection was not a ovs_bridge connection."
 msgstr "此连接�是 ovs 网桥连接。"
 
-#: ../libnm/nm-device-ovs-interface.c:60
+#: ../libnm/nm-device-ovs-interface.c:45
 msgid "The connection was not a ovs_interface connection."
 msgstr "此连接�是 ovs 接�连接。"
 
-#: ../libnm/nm-device-ovs-port.c:89
+#: ../libnm/nm-device-ovs-port.c:77
 msgid "The connection was not a ovs_port connection."
 msgstr "此连接�是 ovs 端�连接。"
 
-#: ../libnm/nm-device-team.c:135
+#: ../libnm/nm-device-team.c:131
 msgid "The connection was not a team connection."
 msgstr "此连接�是组�（team）连接。"
 
-#: ../libnm/nm-device-tun.c:206
+#: ../libnm/nm-device-tun.c:202
 msgid "The connection was not a tun connection."
 msgstr "此连接�是 tun 连接。"
 
-#: ../libnm/nm-device-tun.c:215
+#: ../libnm/nm-device-tun.c:211
 msgid "The mode of the device and the connection didn't match"
 msgstr "设备和连接的模��匹�"
 
-#: ../libnm/nm-device-vlan.c:125
+#: ../libnm/nm-device-vlan.c:121
 msgid "The connection was not a VLAN connection."
 msgstr "此连接�是 VLAN 连接。"
 
-#: ../libnm/nm-device-vlan.c:132
+#: ../libnm/nm-device-vlan.c:128
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr "设备和连接的 VLAN 标识符�匹�。"
 
-#: ../libnm/nm-device-vlan.c:147
+#: ../libnm/nm-device-vlan.c:143
 msgid "The hardware address of the device and the connection didn't match."
 msgstr "设备和连接的硬件地��匹�。"
 
-#: ../libnm/nm-device-vxlan.c:383
+#: ../libnm/nm-device-vxlan.c:381
 msgid "The connection was not a VXLAN connection."
 msgstr "此连接�是 VXLAN 连接。"
 
-#: ../libnm/nm-device-vxlan.c:390
+#: ../libnm/nm-device-vxlan.c:388
 msgid "The VXLAN identifiers of the device and the connection didn't match."
 msgstr "设备和连接的 VXLAN 标识符�匹�。"
 
-#: ../libnm/nm-device-wifi-p2p.c:326
+#: ../libnm/nm-device-wifi-p2p.c:268
 msgid "The connection was not a Wi-Fi P2P connection."
 msgstr "这个连接�是一个 Wi-Fi P2P 连接。"
 
-#: ../libnm/nm-device-wifi.c:612
+#: ../libnm/nm-device-wifi.c:461
 msgid "The connection was not a Wi-Fi connection."
 msgstr "此连接�是 Wi-Fi 连接。"
 
-#: ../libnm/nm-device-wifi.c:648
+#: ../libnm/nm-device-wifi.c:496
 msgid "The device is lacking WPA capabilities required by the connection."
 msgstr "设备缺少连接所�求的 WPA 功能。"
 
-#: ../libnm/nm-device-wifi.c:655
-msgid ""
-"The device is lacking WPA2/RSN capabilities required by the connection."
+#: ../libnm/nm-device-wifi.c:503
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
 msgstr "设备缺少连接所�求的 WPA2/RSN 功能。"
 
-#: ../libnm/nm-device-wimax.c:312
-msgid "The connection was not a WiMAX connection."
-msgstr "此连接�是 WiMAX 连接。"
-
-#: ../libnm/nm-device-wpan.c:81
+#: ../libnm/nm-device-wpan.c:64
 msgid "The connection was not a wpan connection."
 msgstr "此连接�是 wpan 连接。"
 
-#: ../libnm/nm-device.c:1383
+#: ../libnm/nm-device.c:1459
 msgid "Bluetooth"
 msgstr "�牙"
 
-#: ../libnm/nm-device.c:1385
+#: ../libnm/nm-device.c:1461
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../libnm/nm-device.c:1387
+#: ../libnm/nm-device.c:1463
 msgid "Open vSwitch Interface"
 msgstr "Open vSwitch 接�"
 
-#: ../libnm/nm-device.c:1389
+#: ../libnm/nm-device.c:1465
 msgid "Open vSwitch Port"
 msgstr "Open vSwitch 端�"
 
-#: ../libnm/nm-device.c:1391
+#: ../libnm/nm-device.c:1467
 msgid "Open vSwitch Bridge"
 msgstr "Open vSwitch 网桥"
 
-#: ../libnm/nm-device.c:1393
+#: ../libnm/nm-device.c:1469
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm/nm-device.c:1407
+#: ../libnm/nm-device.c:1483
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm/nm-device.c:1409
+#: ../libnm/nm-device.c:1485
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm/nm-device.c:1411
+#: ../libnm/nm-device.c:1487
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm/nm-device.c:1413
+#: ../libnm/nm-device.c:1489
 msgid "IPTunnel"
 msgstr "IP 隧�"
 
-#: ../libnm/nm-device.c:1415
+#: ../libnm/nm-device.c:1491
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm/nm-device.c:1417
+#: ../libnm/nm-device.c:1493
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm/nm-device.c:1419
+#: ../libnm/nm-device.c:1495
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1421
+#: ../libnm/nm-device.c:1497
 msgid "Dummy"
 msgstr "虚拟"
 
-#: ../libnm/nm-device.c:1423
+#: ../libnm/nm-device.c:1499
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:1425
+#: ../libnm/nm-device.c:1501
 msgid "IEEE 802.15.4"
 msgstr "IEEE 802.15.4"
 
-#: ../libnm/nm-device.c:1427
+#: ../libnm/nm-device.c:1503
 msgid "6LoWPAN"
 msgstr "6LoWPAN"
 
-#: ../libnm/nm-device.c:1429
+#: ../libnm/nm-device.c:1505
 msgid "WireGuard"
 msgstr "WireGuard"
 
-#: ../libnm/nm-device.c:1431
+#: ../libnm/nm-device.c:1507
 msgid "Wi-Fi P2P"
 msgstr "Wi-Fi P2P"
 
-#: ../libnm/nm-device.c:1463
+#: ../libnm/nm-device.c:1539
 msgid "Wired"
 msgstr "有线"
 
-#: ../libnm/nm-device.c:1494
+#: ../libnm/nm-device.c:1571
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm/nm-device.c:1496
+#: ../libnm/nm-device.c:1573
 msgid "USB"
 msgstr "USB"
 
@@ -12351,36 +11994,24 @@ msgstr "USB"
 #. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
-#. 
-#: ../libnm/nm-device.c:1809 ../libnm/nm-device.c:1828
+#.
+#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm/nm-device.c:2551
+#: ../libnm/nm-device.c:2569
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "连接无效：%s"
 
-#: ../libnm/nm-device.c:2560
+#: ../libnm/nm-device.c:2578
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "这个设备的接��和连接�匹�。"
 
-#: ../libnm/nm-manager.c:271
-msgid "Checkpoint was removed before it was initialized"
-msgstr "检查点在�始化之�被删除"
-
-#: ../libnm/nm-manager.c:998
-msgid "Active connection removed before it was initialized"
-msgstr "活动连接在�始化之�被删除"
-
-#: ../libnm/nm-remote-settings.c:284
-msgid "Connection removed before it was initialized"
-msgstr "连接在�始化之�被删除"
-
-#: ../libnm/nm-vpn-plugin-old.c:845 ../libnm/nm-vpn-service-plugin.c:1044
+#: ../libnm/nm-vpn-plugin-old.c:828 ../libnm/nm-vpn-service-plugin.c:1027
 msgid "No service name specified"
 msgstr "未指定�务"
 
@@ -12526,79 +12157,79 @@ msgstr "�用或�用连接性检查"
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr "系统策略阻止�用或�用连接性检查"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1500
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "对象类 \"%s\" 没有�为 \"%s\" 的属性"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1507
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是��写的"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1514
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造��能被设定"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1522
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "\"%s::%s\" �是有效的属性�；\"%s\" �是 GObject �类型"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1531
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1542
+#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr "类型 \"%2$s\" 的值 \"%1$s\" 无效或超出类型为 \"%4$s\" 的属性 \"%3$s\" 范围"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:221
 #, c-format
 msgid "'%s' is not valid: properties should be specified as 'key=value'"
 msgstr "'%s' 无效：属性需�以 'key=value' 的形�指定"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:251
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:236
 #, c-format
 msgid "'%s' is not a valid key"
 msgstr "'%s' �是一个有效的关键字"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:257
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:242
 #, c-format
 msgid "duplicate key '%s'"
 msgstr "��的关键字 '%s'"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:271
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:256
 #, c-format
 msgid "number for '%s' is out of range"
 msgstr "'%s' 的值超出了范围"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:274
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:259
 #, c-format
 msgid "value for '%s' must be a number"
 msgstr "'%s' 的值需�是一个数字"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:285
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:270
 #, c-format
 msgid "value for '%s' must be a boolean"
 msgstr "'%s' 的值需�是一个布尔值"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:294
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:279
 msgid "missing 'name' attribute"
 msgstr "缺少 'name' 属性"
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:301
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:286
 #, c-format
 msgid "invalid 'name' \"%s\""
 msgstr "无效的 'name' \"%s\""
 
-#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:313
+#: ../shared/nm-libnm-core-aux/nm-libnm-core-aux.c:298
 #, c-format
 msgid "attribute '%s' is invalid for \"%s\""
 msgstr "属性 '%s' 无效（对于\"%s\"）"
@@ -12607,49 +12238,49 @@ msgstr "属性 '%s' 无效（对于\"%s\"）"
 #. * 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:121
+#: ../src/NetworkManagerUtils.c:107
 #, c-format
 msgctxt "connection id fallback"
 msgid "%s %u"
 msgstr "%s %u"
 
-#: ../src/main.c:176 ../src/main.c:341
+#: ../src/main.c:163 ../src/main.c:335
 #, c-format
 msgid "Failed to read configuration: %s\n"
 msgstr "读��置失败：%s\n"
 
 #. Logging/debugging
-#: ../src/main.c:190 ../src/nm-iface-helper.c:292
+#: ../src/main.c:184 ../src/nm-iface-helper.c:295
 msgid "Print NetworkManager version and exit"
 msgstr "输出网络管�器版本并退出"
 
-#: ../src/main.c:191 ../src/nm-iface-helper.c:293
+#: ../src/main.c:185 ../src/nm-iface-helper.c:296
 msgid "Don't become a daemon"
 msgstr "��为守护进程"
 
-#: ../src/main.c:192 ../src/nm-iface-helper.c:295
+#: ../src/main.c:186 ../src/nm-iface-helper.c:298
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "日志级别：� [%s] 之一"
 
-#: ../src/main.c:194 ../src/nm-iface-helper.c:297
+#: ../src/main.c:188 ../src/nm-iface-helper.c:300
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "以 \",\" 分开的日志域：�以是 [%s] 的任�组�"
 
-#: ../src/main.c:196 ../src/nm-iface-helper.c:299
+#: ../src/main.c:190 ../src/nm-iface-helper.c:302
 msgid "Make all warnings fatal"
 msgstr "视所有警告为致命错误"
 
-#: ../src/main.c:197
+#: ../src/main.c:191
 msgid "Specify the location of a PID file"
 msgstr "指定一个 PID 文件的�置"
 
-#: ../src/main.c:199
+#: ../src/main.c:193
 msgid "Print NetworkManager configuration and exit"
 msgstr "输出网络管�器�置并退出"
 
-#: ../src/main.c:209
+#: ../src/main.c:203
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -12658,489 +12289,517 @@ msgid ""
 msgstr "网络管�器（NetworkManager）监视所有网络连接，并自动选择�使用的最佳连接。\n"
 "它还�许用户指定计算机无线网�连接的无线访问点。"
 
-#: ../src/main.c:331 ../src/main-utils.c:289 ../src/nm-iface-helper.c:440
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/main.c:364 ../src/nm-iface-helper.c:453
+#: ../src/main.c:358 ../src/nm-iface-helper.c:456
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "无法设为守护进程：%s [错误 %u]\n"
 
-#: ../src/main-utils.c:99
+#: ../src/main-utils.c:85
 #, c-format
 msgid "Opening %s failed: %s\n"
 msgstr "打开 %s 失败：%s\n"
 
-#: ../src/main-utils.c:106
+#: ../src/main-utils.c:92
 #, c-format
 msgid "Writing to %s failed: %s\n"
 msgstr "写入 %s 失败：%s\n"
 
-#: ../src/main-utils.c:112
+#: ../src/main-utils.c:98
 #, c-format
 msgid "Closing %s failed: %s\n"
 msgstr "关闭 %s 失败：%s\n"
 
-#: ../src/main-utils.c:151 ../src/main-utils.c:162
+#: ../src/main-utils.c:137 ../src/main-utils.c:148
 #, c-format
 msgid "Cannot create '%s': %s"
 msgstr "无法创建 \"%s\"：%s"
 
-#: ../src/main-utils.c:215
+#: ../src/main-utils.c:201
 #, c-format
 msgid "%s is already running (pid %ld)\n"
 msgstr "%s 已在�行中（pid %ld）\n"
 
-#: ../src/main-utils.c:225
+#: ../src/main-utils.c:211
 #, c-format
 msgid "You must be root to run %s!\n"
 msgstr "�行 %s 必须是根用户�\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:301
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:303
 msgid "# Created by NetworkManager\n"
 msgstr "# 由 NetworkManger 创建\n"
 
-#: ../src/dhcp/nm-dhcp-dhclient-utils.c:312
+#: ../src/dhcp/nm-dhcp-dhclient-utils.c:316
 #, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
 "\n"
 msgstr "# �并自 %s\n"
 "\n"
 
-#: ../src/devices/bluetooth/nm-bluez-device.c:209
+#: ../src/devices/bluetooth/nm-bluez-manager.c:1341
 #, c-format
 msgid "%s Network"
 msgstr "%s 网络"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:271
+#: ../src/devices/bluetooth/nm-device-bt.c:298
 msgid "PAN requested, but Bluetooth device does not support NAP"
 msgstr "PAN 已请求，但�牙设备�支� NAP"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:281
+#: ../src/devices/bluetooth/nm-device-bt.c:311
 msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
 msgstr "PAN 连接无法指定 GSM�CDMA 或串行设置"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:294
+#: ../src/devices/bluetooth/nm-device-bt.c:324
 msgid "PAN connection"
 msgstr "PAN 连接"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:301
+#: ../src/devices/bluetooth/nm-device-bt.c:331
 msgid "DUN requested, but Bluetooth device does not support DUN"
 msgstr "DUN 已请求，但�牙设备�支� DUN"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:311
+#: ../src/devices/bluetooth/nm-device-bt.c:342
 msgid "DUN connection must include a GSM or CDMA setting"
 msgstr "DUN 连接必须包� GSM 或 CDMA 设置"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:321
-#: ../src/devices/wwan/nm-modem-broadband.c:705
+#: ../src/devices/bluetooth/nm-device-bt.c:352
+#: ../src/devices/wwan/nm-modem-broadband.c:784
 msgid "GSM connection"
 msgstr "GSM 连接"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:323
-#: ../src/devices/wwan/nm-modem-broadband.c:730
+#: ../src/devices/bluetooth/nm-device-bt.c:354
+#: ../src/devices/wwan/nm-modem-broadband.c:809
 msgid "CDMA connection"
 msgstr "CDMA 连接"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:331
+#: ../src/devices/bluetooth/nm-device-bt.c:362
 msgid "Unknown/unhandled Bluetooth connection type"
 msgstr "未知的/未处�的�牙连接类型"
 
-#: ../src/devices/bluetooth/nm-device-bt.c:353
+#: ../src/devices/bluetooth/nm-device-bt.c:384
 msgid "connection does not match device"
 msgstr "连接�匹�设备"
 
-#: ../src/devices/nm-device-6lowpan.c:191
+#: ../src/devices/nm-device-6lowpan.c:177
 msgid "6LOWPAN connection"
 msgstr "6LOWPAN 连接"
 
-#: ../src/devices/nm-device-bond.c:70
+#: ../src/devices/nm-device-bond.c:56
 msgid "Bond connection"
 msgstr "绑定连接"
 
-#: ../src/devices/nm-device-bridge.c:153
+#: ../src/devices/nm-device-bridge.c:147
 msgid "Bridge connection"
 msgstr "网桥连接"
 
-#: ../src/devices/nm-device-dummy.c:66
+#: ../src/devices/nm-device-dummy.c:58
 msgid "Dummy connection"
 msgstr "虚拟连接"
 
-#: ../src/devices/nm-device-ethernet.c:1415
+#: ../src/devices/nm-device-ethernet.c:1506
 msgid "PPPoE connection"
 msgstr "PPPoE 连接"
 
-#: ../src/devices/nm-device-ethernet.c:1415
+#: ../src/devices/nm-device-ethernet.c:1506
 msgid "Wired connection"
 msgstr "有线连接"
 
-#: ../src/devices/nm-device-ethernet-utils.c:32
+#: ../src/devices/nm-device-ethernet-utils.c:20
 #, c-format
 msgid "Wired connection %d"
 msgstr "有线连接 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:421
+#: ../src/devices/nm-device-ip-tunnel.c:407
 msgid "IP tunnel connection"
 msgstr "IP 隧�连接"
 
-#: ../src/devices/nm-device-macvlan.c:364
+#: ../src/devices/nm-device-macvlan.c:365
 msgid "MACVLAN connection"
 msgstr "MACVLAN 连接"
 
-#: ../src/devices/nm-device-tun.c:156
+#: ../src/devices/nm-device-tun.c:142
 msgid "TUN connection"
 msgstr "TUN 连接"
 
-#: ../src/devices/nm-device-wpan.c:68
+#: ../src/devices/nm-device-wpan.c:54
 msgid "WPAN connection"
 msgstr "WPAN 连接"
 
-#: ../src/devices/team/nm-device-team.c:101
+#: ../src/devices/team/nm-device-team.c:87
 msgid "Team connection"
 msgstr "组�连接"
 
-#: ../src/devices/wifi/nm-device-wifi.c:964
-msgid "WPA Ad-Hoc disabled due to kernel bugs"
-msgstr "由于内核程�错误�用了 WPA Ad-Hoc"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:42
+#: ../src/devices/wifi/nm-wifi-utils.c:28
 #, c-format
 msgid "%s is incompatible with static WEP keys"
 msgstr "%s �兼容�� WEP 密钥"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:76
+#: ../src/devices/wifi/nm-wifi-utils.c:62
 msgid "LEAP authentication requires a LEAP username"
 msgstr "LEAP 验��求 LEAP 用户�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:86
+#: ../src/devices/wifi/nm-wifi-utils.c:72
 msgid "LEAP username requires 'leap' authentication"
 msgstr "LEAP 用户��求 \"leap\" 验�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:99
+#: ../src/devices/wifi/nm-wifi-utils.c:85
 msgid "LEAP authentication requires IEEE 802.1x key management"
 msgstr "LEAP 验��求 IEEE 802.1x 密钥管�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:119
+#: ../src/devices/wifi/nm-wifi-utils.c:105
 msgid "LEAP authentication is incompatible with Ad-Hoc mode"
 msgstr "LEAP 验�和 Ad-Hoc 模��兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:131
+#: ../src/devices/wifi/nm-wifi-utils.c:117
 msgid "LEAP authentication is incompatible with 802.1x setting"
 msgstr "LEAP 验�和 802.1x 设置�兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:153
+#: ../src/devices/wifi/nm-wifi-utils.c:139
 #, c-format
 msgid "a connection using '%s' authentication cannot use WPA key management"
 msgstr "使用 \"%s\" 验�的连接无法使用 WPA 密钥管�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:164
+#: ../src/devices/wifi/nm-wifi-utils.c:150
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA protocols"
 msgstr "使用 \"%s\" 验�的连接无法指定 WPA �议"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:180
-#: ../src/devices/wifi/nm-wifi-utils.c:197
+#: ../src/devices/wifi/nm-wifi-utils.c:166
+#: ../src/devices/wifi/nm-wifi-utils.c:183
 #, c-format
 msgid "a connection using '%s' authentication cannot specify WPA ciphers"
 msgstr "使用 \"%s\" 验�的连接无法指定 WPA 密文"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:209
+#: ../src/devices/wifi/nm-wifi-utils.c:195
 #, c-format
 msgid "a connection using '%s' authentication cannot specify a WPA password"
 msgstr "使用 \"%s\" 验�的连接无法指定 WPA 密�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:240
+#: ../src/devices/wifi/nm-wifi-utils.c:226
 msgid "Dynamic WEP requires an 802.1x setting"
 msgstr "动� WEP �求 802.1x 设置"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:250
-#: ../src/devices/wifi/nm-wifi-utils.c:278
+#: ../src/devices/wifi/nm-wifi-utils.c:236
+#: ../src/devices/wifi/nm-wifi-utils.c:264
 msgid "Dynamic WEP requires 'open' authentication"
 msgstr "动� WEP �求 \"open\" 验�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:265
+#: ../src/devices/wifi/nm-wifi-utils.c:251
 msgid "Dynamic WEP requires 'ieee8021x' key management"
 msgstr "动� WEP �求 \"ieee8021x\" 密钥管�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:312
+#: ../src/devices/wifi/nm-wifi-utils.c:298
 msgid "WPA-PSK authentication is incompatible with 802.1x"
 msgstr "WPA-PSK 验�和 802.1x 兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:322
+#: ../src/devices/wifi/nm-wifi-utils.c:308
 msgid "WPA-PSK requires 'open' authentication"
 msgstr "WPA-PSK �求 \"open\" 验�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:334
-msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
-msgstr "WPA Ad-Hoc 验��求 Ad-Hoc 模�的 AP"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:347
-msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
-msgstr "WPA Ad-Hoc 验��求 \"wpa\" �议"
+#: ../src/devices/wifi/nm-wifi-utils.c:320
+msgid "Access point does not support PSK but setting requires it"
+msgstr "接入点�支� PSK 但设置�求它"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:359
-msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
-msgstr "WPA Ad-Hoc 验��求 \"none\" �对密�"
+#: ../src/devices/wifi/nm-wifi-utils.c:333
+msgid "WPA Ad-Hoc authentication requires 'rsn' protocol"
+msgstr "WPA Ad-Hoc 身份验�需� “rsn� �议"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:371
-msgid "WPA Ad-Hoc requires 'tkip' group cipher"
-msgstr "WPA Ad-Hoc �求 \"tkip\" 组密�"
+#: ../src/devices/wifi/nm-wifi-utils.c:344
+msgid "WPA Ad-Hoc authentication requires 'ccmp' pairwise cipher"
+msgstr "WPA Ad-Hoc 身份验�需� 'ccmp' �对密�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:385
-msgid "Access point does not support PSK but setting requires it"
-msgstr "接入点�支� PSK 但设置�求它"
+#: ../src/devices/wifi/nm-wifi-utils.c:355
+msgid "WPA Ad-Hoc requires 'ccmp' group cipher"
+msgstr "WPA Ad-Hoc 需� “ccmp� 组密�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:415
+#: ../src/devices/wifi/nm-wifi-utils.c:384
 msgid "WPA-EAP authentication requires an 802.1x setting"
 msgstr "WPA-EAP 验��求 802.1x 设置"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:425
+#: ../src/devices/wifi/nm-wifi-utils.c:394
 msgid "WPA-EAP requires 'open' authentication"
 msgstr "WPA-EAP �求 \"open\" 验�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:436
+#: ../src/devices/wifi/nm-wifi-utils.c:405
 msgid "802.1x setting requires 'wpa-eap' key management"
 msgstr "802.1x 设置�求 \"wpa-eap\" 密钥管�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:449
+#: ../src/devices/wifi/nm-wifi-utils.c:418
 msgid "Access point does not support 802.1x but setting requires it"
 msgstr "接入点�支� 802.1x 但设置�求它"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:477
-msgid ""
-"Access point mode is Ad-Hoc but setting requires Infrastructure security"
-msgstr "接入点模�是 Ad-Hoc 但设置�求 Infrastructure 安全性"
+#: ../src/devices/wifi/nm-wifi-utils.c:448
+msgid "Ad-Hoc mode requires 'none' or 'wpa-psk' key management"
+msgstr "Ad-Hoc 模�需� 'none' 或 'wpa-psk' 密钥管�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:487
+#: ../src/devices/wifi/nm-wifi-utils.c:458
 msgid "Ad-Hoc mode is incompatible with 802.1x security"
 msgstr "Ad-Hoc 模�和 802.1x 安全性�兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:496
+#: ../src/devices/wifi/nm-wifi-utils.c:467
 msgid "Ad-Hoc mode is incompatible with LEAP security"
 msgstr "Ad-Hoc 模�和 LEAP 安全性�兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:506
+#: ../src/devices/wifi/nm-wifi-utils.c:477
 msgid "Ad-Hoc mode requires 'open' authentication"
 msgstr "Ad-Hoc 模��求 \"open\" 验�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:516
-msgid ""
-"Access point mode is Infrastructure but setting requires Ad-Hoc security"
-msgstr "接入点模�是 Infrastructure 但设置�求 Ad-Hoc 安全性"
-
-#: ../src/devices/wifi/nm-wifi-utils.c:559
-#: ../src/devices/wifi/nm-wifi-utils.c:591
+#: ../src/devices/wifi/nm-wifi-utils.c:519
+#: ../src/devices/wifi/nm-wifi-utils.c:551
 #, c-format
 msgid "connection does not match access point"
 msgstr "连接和接入点�匹�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:645
+#: ../src/devices/wifi/nm-wifi-utils.c:605
 #, c-format
 msgid "connection does not match mesh point"
 msgstr "连接与 mesh 点�匹�"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:662
+#: ../src/devices/wifi/nm-wifi-utils.c:622
 msgid "Access point is unencrypted but setting specifies security"
 msgstr "接入点未加密但设置指定了安全性"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:751
+#: ../src/devices/wifi/nm-wifi-utils.c:711
 msgid ""
 "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
 "WEP"
 msgstr "WPA 验�和� EAP（原始的）LEAP 或动� WEP �兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:761
+#: ../src/devices/wifi/nm-wifi-utils.c:721
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr "WPA 验�和共享密钥（Shared Key）验��兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:814
+#: ../src/devices/wifi/nm-wifi-utils.c:776
 msgid "Failed to determine AP security information"
 msgstr "确定 AP 安全信�失败"
 
-#: ../src/nm-config.c:580
+#: ../src/nm-config.c:572
 #, c-format
 msgid "Bad '%s' option: "
-msgstr "错误的 '%s' 选项："
+msgstr "错误的 '%s' 选项： "
 
-#: ../src/nm-config.c:593
+#: ../src/nm-config.c:585
 msgid "Config file location"
 msgstr "�置文件�置"
 
-#: ../src/nm-config.c:594
+#: ../src/nm-config.c:586
 msgid "Config directory location"
 msgstr "�置目录�置"
 
-#: ../src/nm-config.c:595
+#: ../src/nm-config.c:587
 msgid "System config directory location"
 msgstr "系统�置目录�置"
 
-#: ../src/nm-config.c:596
+#: ../src/nm-config.c:588
 msgid "Internal config file location"
 msgstr "内部�置文件�置"
 
-#: ../src/nm-config.c:597
+#: ../src/nm-config.c:589
 msgid "State file location"
 msgstr "状�文件�置"
 
-#: ../src/nm-config.c:598
+#: ../src/nm-config.c:590
 msgid "State file for no-auto-default devices"
 msgstr "no-auto-default 设备的状�文件"
 
-#: ../src/nm-config.c:599
+#: ../src/nm-config.c:591
 msgid "List of plugins separated by ','"
 msgstr "�件列表，以 \",\" 隔开"
 
-#: ../src/nm-config.c:600
+#: ../src/nm-config.c:592
 msgid "Quit after initial configuration"
 msgstr "�始化�置�退出"
 
-#: ../src/nm-config.c:601 ../src/nm-iface-helper.c:294
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
 msgid "Don't become a daemon, and log to stderr"
 msgstr "��为守护进程，并�标准错误打�日志"
 
 #. These three are hidden for now, and should eventually just go away.
-#: ../src/nm-config.c:604
+#: ../src/nm-config.c:596
 msgid "An http(s) address for checking internet connectivity"
 msgstr "检查网络连通用的 http(s) 地�"
 
-#: ../src/nm-config.c:605
+#: ../src/nm-config.c:597
 msgid "The interval between connectivity checks (in seconds)"
 msgstr "连接性检查间隔（以秒计）"
 
-#: ../src/nm-config.c:606
+#: ../src/nm-config.c:598
 msgid "The expected start of the response"
 msgstr "预期的�应开头"
 
-#: ../src/nm-config.c:613
+#: ../src/nm-config.c:605
 msgid "NetworkManager options"
 msgstr "NetworkManager 选项"
 
-#: ../src/nm-config.c:613
+#: ../src/nm-config.c:605
 msgid "Show NetworkManager options"
 msgstr "显示 NetworkManager 选项"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:274
+#: ../src/nm-iface-helper.c:277
 msgid "The interface to manage"
 msgstr "�管�的接�"
 
-#: ../src/nm-iface-helper.c:275
+#: ../src/nm-iface-helper.c:278
 msgid "Connection UUID"
 msgstr "连接 UUID"
 
-#: ../src/nm-iface-helper.c:276
+#: ../src/nm-iface-helper.c:279
 msgid "Connection Token for Stable IDs"
 msgstr "固定 ID 的连接令牌"
 
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:280
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "是�管� IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:281
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC 是�必须是�功的"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:282
 msgid "Use an IPv6 temporary privacy address"
 msgstr "使用 IPv6 临时�有地�"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:283
 msgid "Current DHCPv4 address"
 msgstr "当�的 DHCPv4 地�"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:284
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 是�必须是�功的"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:285
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "�六进制编�的 DHCPv4 客户 ID"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:286
 msgid "Hostname to send to DHCP server"
 msgstr "��至 DHCP �务器的主机�"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:286
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:287
 msgid "FQDN to send to DHCP server"
 msgstr "��至 DHCP �务器的 FQDN"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:287
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:288
 msgid "Route priority for IPv4"
 msgstr "IPv4 的路由优先级"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:288
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:289
 msgid "Route priority for IPv6"
 msgstr "IPv6 的路由优先级"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:289
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:290
 msgid "Hex-encoded Interface Identifier"
 msgstr "�六进制编�的接�标识符"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:291
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC 地�生�模�"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:292
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr "日志��的�置值。请�考 NetworkManager.conf 里的 logging.backend"
 
-#: ../src/nm-iface-helper.c:309
+#: ../src/nm-iface-helper.c:312
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr "nm-iface-helper 是一个管��个网络接�的�型独立进程。"
 
-#: ../src/nm-iface-helper.c:420
+#: ../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:427
+#: ../src/nm-iface-helper.c:430
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "寻找 %s(%s) 的接�索引失败\n"
 
-#: ../src/nm-iface-helper.c:445
+#: ../src/nm-iface-helper.c:448
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n"
 
-#: ../src/nm-iface-helper.c:486
+#: ../src/nm-iface-helper.c:489
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "（%s）：无效的 IID %s\n"
 
-#: ../src/nm-iface-helper.c:497
+#: ../src/nm-iface-helper.c:500
 #, c-format
 msgid "(%s): Invalid DHCP client-id %s\n"
 msgstr "（%s）：无效的 DHCP 客户端 ID %s\n"
 
-#: ../src/nm-logging.c:298
+#: ../src/nm-logging.c:253
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "未知的日志等级 \"%s\""
 
-#: ../src/nm-logging.c:408
+#: ../src/nm-logging.c:363
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "未知的日志域 \"%s\""
+
+#~ msgid "Unknown parameter: %s\n"
+#~ msgstr "未知�数：%s\n"
+
+#~ msgid "Unknown parameter: %s"
+#~ msgstr "未知�数：%s"
+
+#~ msgid "Error: Device activation failed: device was disconnected"
+#~ msgstr "错误：设备激活失败：设备已断开连接"
+
+#~ msgid "Error: Unknown parameter %s."
+#~ msgstr "错误：未知�数 %s。"
+
+#~ msgid "%d. route cannot be a default route"
+#~ msgstr "%d。路由�能是默认路由"
+
+#~ msgid "'%s' connections require '%s' in this property"
+#~ msgstr "\"%s\" 连接需�此属性中的 \"%s\""
+
+#~ msgid "The connection was not a WiMAX connection."
+#~ msgstr "此连接�是 WiMAX 连接。"
+
+#~ msgid "Checkpoint was removed before it was initialized"
+#~ msgstr "检查点在�始化之�被删除"
+
+#~ msgid "Active connection removed before it was initialized"
+#~ msgstr "活动连接在�始化之�被删除"
+
+#~ msgid "Connection removed before it was initialized"
+#~ msgstr "连接在�始化之�被删除"
+
+#~ msgid "WPA Ad-Hoc disabled due to kernel bugs"
+#~ msgstr "由于内核程�错误�用了 WPA Ad-Hoc"
+
+#~ msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
+#~ msgstr "WPA Ad-Hoc 验��求 Ad-Hoc 模�的 AP"
+
+#~ msgid ""
+#~ "Access point mode is Ad-Hoc but setting requires Infrastructure security"
+#~ msgstr "接入点模�是 Ad-Hoc 但设置�求 Infrastructure 安全性"
+
diff --git a/shared/n-dhcp4/src/n-dhcp4-c-connection.c b/shared/n-dhcp4/src/n-dhcp4-c-connection.c
index f3ae44e2..d4354467 100644
--- a/shared/n-dhcp4/src/n-dhcp4-c-connection.c
+++ b/shared/n-dhcp4/src/n-dhcp4-c-connection.c
@@ -89,7 +89,7 @@ void n_dhcp4_c_connection_deinit(NDhcp4CConnection *connection) {
 }
 
 static void n_dhcp4_c_connection_outgoing_set_secs(NDhcp4Outgoing *message) {
-        uint32_t secs;
+        uint64_t secs;
 
         /*
          * This function sets the `secs` field for outgoing messages. It
@@ -125,12 +125,12 @@ static void n_dhcp4_c_connection_outgoing_set_secs(NDhcp4Outgoing *message) {
          *
          * Note: Some DHCP relays reject a `secs` value of 0 (which might look
          *       like it is uninitialized). Hence, we always clamp the value to
-         *       the range `[1, INF[`.
+         *       the range `[1, 65535]`.
          */
 
         secs = message->userdata.base_time - message->userdata.start_time;
         secs /= 1000ULL * 1000ULL * 1000ULL; /* nsecs to secs */
-        secs = secs ?: 1; /* clamp to `[1, INF[` */
+        secs = C_CLAMP(secs, 1, UINT16_MAX);
 
         n_dhcp4_outgoing_set_secs(message, secs);
 }
@@ -1104,13 +1104,14 @@ int n_dhcp4_c_connection_start_request(NDhcp4CConnection *connection,
         if (request->userdata.start_time == 0)
                 request->userdata.start_time = timestamp;
 
-        n_dhcp4_outgoing_free(connection->request);
-        connection->request = request;
+        connection->request = n_dhcp4_outgoing_free(connection->request);
 
         r = n_dhcp4_c_connection_send_request(connection, request, timestamp);
         if (r)
                 return r;
 
+        connection->request = request;
+
         return 0;
 }
 
diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
index 5bed15b8..e4477a7c 100644
--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c
+++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c
@@ -436,7 +436,10 @@ int n_dhcp4_client_probe_new(NDhcp4ClientProbe **probep,
         if (r)
                 return r;
 
-        if (probe->config->init_reboot && probe->config->requested_ip.s_addr != INADDR_ANY)
+        if (probe->config->requested_ip.s_addr != INADDR_ANY)
+                probe->last_address = probe->config->requested_ip;
+
+        if (probe->config->init_reboot && probe->last_address.s_addr != INADDR_ANY)
                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT;
         else
                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
@@ -648,7 +651,7 @@ static int n_dhcp4_client_probe_transition_reboot(NDhcp4ClientProbe *probe, uint
                 if (r)
                         return r;
 
-                r = n_dhcp4_c_connection_reboot_new(&probe->connection, &request, &probe->config->requested_ip);
+                r = n_dhcp4_c_connection_reboot_new(&probe->connection, &request, &probe->last_address);
                 if (r)
                         return r;
 
@@ -700,8 +703,8 @@ static int n_dhcp4_client_probe_transition_deferred(NDhcp4ClientProbe *probe, ui
                 if (r)
                         return r;
 
-                if (!probe->config->init_reboot && probe->config->requested_ip.s_addr != INADDR_ANY) {
-                        r = n_dhcp4_outgoing_append_requested_ip(request, probe->config->requested_ip);
+                if (probe->last_address.s_addr != INADDR_ANY) {
+                        r = n_dhcp4_outgoing_append_requested_ip(request, probe->last_address);
                         if (r)
                                 return r;
                 }
@@ -841,11 +844,11 @@ static int n_dhcp4_client_probe_transition_lifetime(NDhcp4ClientProbe *probe) {
                         return r;
 
                 c_assert(probe->client->current_probe == probe);
-                probe->client->current_probe = NULL;
 
-                n_dhcp4_c_connection_close(&probe->connection);
+                probe->current_lease = n_dhcp4_client_lease_unref(probe->current_lease);
 
-                probe->state = N_DHCP4_CLIENT_PROBE_STATE_EXPIRED;
+                probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
+                probe->ns_deferred =  n_dhcp4_gettime(CLOCK_BOOTTIME) + UINT64_C(1);
 
                 break;
 
@@ -946,6 +949,7 @@ static int n_dhcp4_client_probe_transition_ack(NDhcp4ClientProbe *probe, NDhcp4I
                 n_dhcp4_client_lease_unref(probe->current_lease);
                 probe->current_lease = n_dhcp4_client_lease_ref(lease);
                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_BOUND;
+                n_dhcp4_client_lease_get_yiaddr(lease, &probe->last_address);
                 probe->ns_nak_restart_delay = 0;
                 break;
 
@@ -1005,9 +1009,9 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) {
 
                 probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT;
                 probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay;
-                probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2,
-                                                      UINT64_C(1000000000 * 2),
-                                                      UINT64_C(1000000000 * 300));
+                probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u,
+                                                      UINT64_C(2)   * UINT64_C(1000000000),
+                                                      UINT64_C(300) * UINT64_C(1000000000));
                 break;
         case N_DHCP4_CLIENT_PROBE_STATE_SELECTING:
         case N_DHCP4_CLIENT_PROBE_STATE_INIT_REBOOT:
diff --git a/shared/n-dhcp4/src/n-dhcp4-incoming.c b/shared/n-dhcp4/src/n-dhcp4-incoming.c
index e7234c0a..f739413b 100644
--- a/shared/n-dhcp4/src/n-dhcp4-incoming.c
+++ b/shared/n-dhcp4/src/n-dhcp4-incoming.c
@@ -326,7 +326,7 @@ static int n_dhcp4_incoming_query_u8(NDhcp4Incoming *message, uint8_t option, ui
         r = n_dhcp4_incoming_query(message, option, &data, &n_data);
         if (r)
                 return r;
-        else if (n_data != sizeof(*data))
+        else if (n_data < sizeof(*data))
                 return N_DHCP4_E_MALFORMED;
 
         *u8p = *data;
@@ -342,7 +342,7 @@ static int n_dhcp4_incoming_query_u16(NDhcp4Incoming *message, uint8_t option, u
         r = n_dhcp4_incoming_query(message, option, &data, &n_data);
         if (r)
                 return r;
-        else if (n_data != sizeof(be16))
+        else if (n_data < sizeof(be16))
                 return N_DHCP4_E_MALFORMED;
 
         memcpy(&be16, data, sizeof(be16));
@@ -360,7 +360,7 @@ static int n_dhcp4_incoming_query_u32(NDhcp4Incoming *message, uint8_t option, u
         r = n_dhcp4_incoming_query(message, option, &data, &n_data);
         if (r)
                 return r;
-        else if (n_data != sizeof(be32))
+        else if (n_data < sizeof(be32))
                 return N_DHCP4_E_MALFORMED;
 
         memcpy(&be32, data, sizeof(be32));
@@ -378,7 +378,7 @@ static int n_dhcp4_incoming_query_in_addr(NDhcp4Incoming *message, uint8_t optio
         r = n_dhcp4_incoming_query(message, option, &data, &n_data);
         if (r)
                 return r;
-        else if (n_data != sizeof(be32))
+        else if (n_data < sizeof(be32))
                 return N_DHCP4_E_MALFORMED;
 
         memcpy(&be32, data, sizeof(be32));
diff --git a/shared/n-dhcp4/src/n-dhcp4-outgoing.c b/shared/n-dhcp4/src/n-dhcp4-outgoing.c
index 99123308..bcab407f 100644
--- a/shared/n-dhcp4/src/n-dhcp4-outgoing.c
+++ b/shared/n-dhcp4/src/n-dhcp4-outgoing.c
@@ -277,6 +277,7 @@ int n_dhcp4_outgoing_append(NDhcp4Outgoing *outgoing,
                         return 0;
                 }
 
+                overload = outgoing->overload;
                 if (overload & N_DHCP4_OVERLOAD_SNAME)
                         outgoing->i_message = offsetof(NDhcp4Message, sname);
                 else
@@ -341,7 +342,7 @@ int n_dhcp4_outgoing_append_requested_ip(NDhcp4Outgoing *message, struct in_addr
         return n_dhcp4_outgoing_append_in_addr(message, N_DHCP4_OPTION_REQUESTED_IP_ADDRESS, addr);
 }
 
-void n_dhcp4_outgoing_set_secs(NDhcp4Outgoing *message, uint32_t secs) {
+void n_dhcp4_outgoing_set_secs(NDhcp4Outgoing *message, uint16_t secs) {
         NDhcp4Header *header = n_dhcp4_outgoing_get_header(message);
 
         /*
@@ -350,7 +351,7 @@ void n_dhcp4_outgoing_set_secs(NDhcp4Outgoing *message, uint32_t secs) {
          */
         c_assert(secs);
 
-        header->secs = htonl(secs);
+        header->secs = htons(secs);
 }
 
 void n_dhcp4_outgoing_set_xid(NDhcp4Outgoing *message, uint32_t xid) {
diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h
index c092ae8f..436ee806 100644
--- a/shared/n-dhcp4/src/n-dhcp4-private.h
+++ b/shared/n-dhcp4/src/n-dhcp4-private.h
@@ -350,6 +350,7 @@ struct NDhcp4ClientProbe {
         void *userdata;
 
         unsigned int state;                     /* current probe state */
+        struct in_addr last_address;            /* last address obtained */
         uint64_t ns_deferred;                   /* timeout for deferred action */
         uint64_t ns_reinit;
         uint64_t ns_nak_restart_delay;          /* restart delay after a nak */
@@ -477,7 +478,7 @@ int n_dhcp4_outgoing_append_lifetime(NDhcp4Outgoing *message, uint32_t lifetime)
 int n_dhcp4_outgoing_append_server_identifier(NDhcp4Outgoing *message, struct in_addr addr);
 int n_dhcp4_outgoing_append_requested_ip(NDhcp4Outgoing *message, struct in_addr addr);
 
-void n_dhcp4_outgoing_set_secs(NDhcp4Outgoing *message, uint32_t secs);
+void n_dhcp4_outgoing_set_secs(NDhcp4Outgoing *message, uint16_t secs);
 void n_dhcp4_outgoing_set_xid(NDhcp4Outgoing *message, uint32_t xid);
 void n_dhcp4_outgoing_set_yiaddr(NDhcp4Outgoing *message, struct in_addr yiaddr);
 
diff --git a/shared/nm-glib-aux/nm-glib.h b/shared/nm-glib-aux/nm-glib.h
index dfb75bf0..26d0eacd 100644
--- a/shared/nm-glib-aux/nm-glib.h
+++ b/shared/nm-glib-aux/nm-glib.h
@@ -569,9 +569,9 @@ _nm_g_value_unset (GValue *value)
 
 /*****************************************************************************/
 
-#if !GLIB_CHECK_VERSION (2, 57, 2)
+/* G_SOURCE_FUNC was added in 2.57.2. */
+#undef G_SOURCE_FUNC
 #define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
-#endif
 
 /*****************************************************************************/
 
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 8e1c8b58..d47c465c 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -12,6 +12,7 @@
 #include <fcntl.h>
 #include <sys/syscall.h>
 #include <glib-unix.h>
+#include <net/if.h>
 
 #include "nm-errno.h"
 
@@ -2506,6 +2507,7 @@ nm_utils_hash_values_to_array (GHashTable *hash,
 		                   user_data);
 	}
 
+	NM_SET_OUT (out_len, len);
 	return arr;
 }
 
@@ -3987,3 +3989,102 @@ nm_utils_g_main_context_create_integrate_source (GMainContext *inner_context)
 
 	return &ctx_src->source;
 }
+
+gboolean
+nm_utils_ifname_valid_kernel (const char *name, GError **error)
+{
+	int i;
+
+	/* This function follows kernel's interface validation
+	 * function dev_valid_name() in net/core/dev.c.
+	 */
+
+	if (!name) {
+		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+		                     _("interface name is missing"));
+		return FALSE;
+	}
+
+	if (name[0] == '\0') {
+		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+		                     _("interface name is too short"));
+		return FALSE;
+	}
+
+	if (   name[0] == '.'
+	    && (   name[1] == '\0'
+	        || (   name[1] == '.'
+	            && name[2] == '\0'))) {
+		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+		                     _("interface name is reserved"));
+		return FALSE;
+	}
+
+	for (i = 0; i < IFNAMSIZ; i++) {
+		char ch = name[i];
+
+		if (ch == '\0')
+			return TRUE;
+		if (   NM_IN_SET (ch, '/', ':')
+		    || g_ascii_isspace (ch)) {
+			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+			                     _("interface name contains an invalid character"));
+			return FALSE;
+		}
+	}
+
+	g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+	                     _("interface name is longer than 15 characters"));
+	return FALSE;
+}
+
+static gboolean
+_nm_utils_ifname_valid_ovs (const char* name, GError **error)
+{
+	const char *ch;
+
+	/* OVS actually accepts a wider range of chars (all printable UTF-8 chars),
+	 NetworkManager restricts this to ASCII char as it's a safer option for
+	 now since OVS is not well documented on this matter.
+	 */
+	for (ch = name; *ch; ++ch) {
+		if (   *ch == '\\'
+		    || *ch == '/'
+		    || !g_ascii_isgraph (*ch)) {
+			g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+			                     _("interface name must be alphanumerical with "
+			                       "no forward or backward slashes"));
+			return FALSE;
+		}
+	};
+	return TRUE;
+}
+
+gboolean
+nm_utils_ifname_valid (const char* name,
+                       NMUtilsIfaceType type,
+                       GError **error)
+{
+	g_return_val_if_fail (!error || !(*error), FALSE);
+
+	if (!name || !(name[0])) {
+		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+		                     _("interface name must not be empty"));
+		return FALSE;
+	}
+
+	if (!g_utf8_validate (name, -1, NULL)) {
+		g_set_error_literal (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
+		                     _("interface name must be UTF-8 encoded"));
+		return FALSE;
+	}
+
+	switch (type) {
+	case NMU_IFACE_KERNEL:
+		return nm_utils_ifname_valid_kernel (name, error);
+	case NMU_IFACE_OVS:
+		return _nm_utils_ifname_valid_ovs (name, error);
+	}
+
+	g_return_val_if_reached (FALSE);
+}
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 3bd1afae..740e61d0 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -973,6 +973,14 @@ NM_AUTO_DEFINE_FCN0 (GSource *, _nm_auto_destroy_and_unref_gsource, nm_g_source_
 NM_AUTO_DEFINE_FCN0 (GMainContext *, _nm_auto_pop_gmaincontext, g_main_context_pop_thread_default)
 #define nm_auto_pop_gmaincontext nm_auto (_nm_auto_pop_gmaincontext)
 
+static inline gboolean
+nm_source_func_unref_gobject (gpointer user_data)
+{
+	nm_assert (G_IS_OBJECT (user_data));
+	g_object_unref (user_data);
+	return G_SOURCE_REMOVE;
+}
+
 GSource *nm_g_idle_source_new (int priority,
                                GSourceFunc func,
                                gpointer user_data,
@@ -1432,4 +1440,17 @@ guint nm_utils_parse_debug_string (const char *string,
                                    const GDebugKey *keys,
                                    guint nkeys);
 
+/*****************************************************************************/
+
+typedef enum {
+	NMU_IFACE_KERNEL = 0,
+	NMU_IFACE_OVS,
+} NMUtilsIfaceType;
+
+gboolean nm_utils_ifname_valid_kernel (const char *name, GError **error);
+
+gboolean nm_utils_ifname_valid (const char* name,
+                                NMUtilsIfaceType type,
+                                GError **error);
+
 #endif /* __NM_SHARED_UTILS_H__ */
diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h
index b8c5fbb9..1d98c935 100644
--- a/shared/nm-version-macros.h
+++ b/shared/nm-version-macros.h
@@ -30,7 +30,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (4)
+#define NM_MICRO_VERSION (8)
 
 /**
  * NM_CHECK_VERSION:
@@ -64,6 +64,7 @@
 #define NM_VERSION_1_20   (NM_ENCODE_VERSION (1, 20, 0))
 #define NM_VERSION_1_22   (NM_ENCODE_VERSION (1, 22, 0))
 #define NM_VERSION_1_22_2 (NM_ENCODE_VERSION (1, 22, 2))
+#define NM_VERSION_1_22_8 (NM_ENCODE_VERSION (1, 22, 8))
 
 /* 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 a9dcab8d..8704ac57 100644
--- a/shared/nm-version-macros.h.in
+++ b/shared/nm-version-macros.h.in
@@ -64,6 +64,7 @@
 #define NM_VERSION_1_20   (NM_ENCODE_VERSION (1, 20, 0))
 #define NM_VERSION_1_22   (NM_ENCODE_VERSION (1, 22, 0))
 #define NM_VERSION_1_22_2 (NM_ENCODE_VERSION (1, 22, 2))
+#define NM_VERSION_1_22_8 (NM_ENCODE_VERSION (1, 22, 8))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 232e69ef..1c1d5eaa 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -143,14 +143,6 @@ nm_device_factory_get_connection_iface (NMDeviceFactory *factory,
 		return NULL;
 	}
 
-	if (!nm_utils_is_valid_iface_name (ifname, error)) {
-		g_prefix_error (error,
-		                "failed to determine interface name: name \"%s\" is invalid",
-		                ifname);
-		g_free (ifname);
-		return NULL;
-	}
-
 	return ifname;
 }
 
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index e7a4a059..3bbc9757 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -76,7 +76,20 @@ _LOG_DECLARE_SELF (NMDevice);
 /*****************************************************************************/
 
 #define DEFAULT_AUTOCONNECT    TRUE
-#define DHCP_GRACE_PERIOD_SEC  480
+
+static guint32
+dhcp_grace_period_from_timeout (guint32 timeout)
+{
+#define DHCP_GRACE_PERIOD_MULTIPLIER 2U
+
+	nm_assert (timeout > 0);
+	nm_assert (timeout < G_MAXINT32);
+
+	if (timeout < G_MAXUINT32 / DHCP_GRACE_PERIOD_MULTIPLIER)
+		return timeout * DHCP_GRACE_PERIOD_MULTIPLIER;
+
+	return G_MAXUINT32;
+}
 
 #define CARRIER_WAIT_TIME_MS 6000
 #define CARRIER_WAIT_TIME_AFTER_MTU_MS 10000
@@ -463,12 +476,13 @@ typedef struct _NMDevicePrivate {
 	/* DHCPv4 tracking */
 	struct {
 		NMDhcpClient *  client;
-		gulong          state_sigid;
 		NMDhcp4Config * config;
 		char *          pac_url;
 		char *          root_path;
-		bool            was_active;
+		gulong          state_sigid;
 		guint           grace_id;
+		bool            was_active:1;
+		bool            grace_pending:1;
 	} dhcp4;
 
 	struct {
@@ -533,17 +547,18 @@ typedef struct _NMDevicePrivate {
 
 	struct {
 		NMDhcpClient *   client;
-		NMNDiscDHCPLevel mode;
-		gulong           state_sigid;
-		gulong           prefix_sigid;
 		NMDhcp6Config *  config;
 		/* IP6 config from DHCP */
 		AppliedConfig    ip6_config;
 		/* Event ID of the current IP6 config from DHCP */
 		char *           event_id;
+		gulong           state_sigid;
+		gulong           prefix_sigid;
+		NMNDiscDHCPLevel mode;
 		guint            needed_prefixes;
-		bool             was_active;
 		guint            grace_id;
+		bool             was_active:1;
+		bool             grace_pending:1;
 	} dhcp6;
 
 	gboolean needs_ip6_subnet;
@@ -4240,6 +4255,12 @@ nm_device_create_and_realize (NMDevice *self,
 	return TRUE;
 }
 
+static gboolean
+can_update_from_platform_link (NMDevice *self, const NMPlatformLink *plink)
+{
+	return TRUE;
+}
+
 void
 nm_device_update_from_platform_link (NMDevice *self, const NMPlatformLink *plink)
 {
@@ -4248,6 +4269,9 @@ nm_device_update_from_platform_link (NMDevice *self, const NMPlatformLink *plink
 	int ifindex;
 	guint32 mtu;
 
+	if (!NM_DEVICE_GET_CLASS (self)->can_update_from_platform_link (self, plink))
+		return;
+
 	g_return_if_fail (plink == NULL || link_type_compatible (self, plink->type, NULL, NULL));
 
 	str = plink ? nm_platform_link_get_udi (nm_device_get_platform (self), plink->ifindex) : NULL;
@@ -7474,6 +7498,51 @@ ensure_con_ip_config (NMDevice *self, int addr_family)
 /*****************************************************************************/
 /* DHCPv4 stuff */
 
+static guint32
+get_dhcp_timeout (NMDevice *self, int addr_family)
+{
+	NMDeviceClass *klass;
+	NMConnection *connection;
+	int timeout_i;
+	guint32 timeout;
+
+	nm_assert (NM_IS_DEVICE (self));
+	nm_assert_addr_family (addr_family);
+
+	connection = nm_device_get_applied_connection (self);
+
+	timeout_i  = nm_setting_ip_config_get_dhcp_timeout (nm_connection_get_setting_ip_config (connection, addr_family));
+	nm_assert (timeout_i >= 0 && timeout_i <= G_MAXINT32);
+
+	timeout = (guint32) timeout_i;
+	if (timeout)
+		goto out;
+
+	timeout = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA,
+	                                                       addr_family == AF_INET
+	                                                         ? NM_CON_DEFAULT ("ipv4.dhcp-timeout")
+	                                                         : NM_CON_DEFAULT ("ipv6.dhcp-timeout"),
+	                                                       self,
+	                                                       0, G_MAXINT32, 0);
+	if (timeout)
+		goto out;
+
+	klass = NM_DEVICE_GET_CLASS (self);
+	if (klass->get_dhcp_timeout_for_device) {
+		timeout = klass->get_dhcp_timeout_for_device (self, addr_family);
+		if (timeout)
+			goto out;
+	}
+
+	timeout = NM_DHCP_TIMEOUT_DEFAULT;
+
+out:
+	G_STATIC_ASSERT_EXPR (G_MAXINT32 == NM_DHCP_TIMEOUT_INFINITY);
+	nm_assert (timeout > 0);
+	nm_assert (timeout <= G_MAXINT32);
+	return timeout;
+}
+
 static void
 dhcp4_cleanup (NMDevice *self, CleanupType cleanup_type, gboolean release)
 {
@@ -7481,6 +7550,7 @@ dhcp4_cleanup (NMDevice *self, CleanupType cleanup_type, gboolean release)
 
 	priv->dhcp4.was_active = FALSE;
 	nm_clear_g_source (&priv->dhcp4.grace_id);
+	priv->dhcp4.grace_pending = FALSE;
 	g_clear_pointer (&priv->dhcp4.pac_url, g_free);
 	g_clear_pointer (&priv->dhcp4.root_path, g_free);
 
@@ -7723,9 +7793,10 @@ ip_config_merge_and_apply (NMDevice *self,
 }
 
 static gboolean
-dhcp4_lease_change (NMDevice *self, NMIP4Config *config)
+dhcp4_lease_change (NMDevice *self, NMIP4Config *config, gboolean bound)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+	gs_free_error GError *error = NULL;
 
 	g_return_val_if_fail (config, FALSE);
 
@@ -7736,6 +7807,15 @@ dhcp4_lease_change (NMDevice *self, NMIP4Config *config)
 		return FALSE;
 	}
 
+	/* TODO: we should perform DAD again whenever we obtain a
+	 * new lease after an expiry. But what should we do if
+	 * a duplicate address is detected? Fail the connection;
+	 * restart DHCP; continue without an address? */
+	if (bound && !nm_dhcp_client_accept (priv->dhcp4.client, &error)) {
+		_LOGW (LOGD_DHCP4, "error accepting lease: %s", error->message);
+		return FALSE;
+	}
+
 	nm_dispatcher_call_device (NM_DISPATCHER_ACTION_DHCP4_CHANGE,
 	                           self,
 	                           NULL,
@@ -7751,6 +7831,7 @@ dhcp4_grace_period_expired (gpointer user_data)
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 
 	priv->dhcp4.grace_id = 0;
+	priv->dhcp4.grace_pending = FALSE;
 	_LOGI (LOGD_DHCP4, "DHCPv4: grace period expired");
 
 	nm_device_ip_method_failed (self, AF_INET,
@@ -7798,13 +7879,26 @@ dhcp4_fail (NMDevice *self, NMDhcpState dhcp_state)
 	/* In any other case (expired lease, assumed connection, etc.),
 	 * wait for some time before failing the IP method.
 	 */
-	if (!priv->dhcp4.grace_id) {
-		priv->dhcp4.grace_id = g_timeout_add_seconds (DHCP_GRACE_PERIOD_SEC,
-		                                              dhcp4_grace_period_expired,
-		                                              self);
-		_LOGI (LOGD_DHCP4,
-		       "DHCPv4: %u seconds grace period started",
-		       DHCP_GRACE_PERIOD_SEC);
+	if (!priv->dhcp4.grace_pending) {
+		guint32 timeout;
+
+		/* Start a grace period equal to the DHCP timeout multiplied
+		 * by a constant factor. */
+		timeout = get_dhcp_timeout (self, AF_INET);
+		if (timeout == NM_DHCP_TIMEOUT_INFINITY) {
+			_LOGI (LOGD_DHCP4, "DHCPv4: trying to acquire a new lease");
+		} else {
+			timeout = dhcp_grace_period_from_timeout (timeout);
+			_LOGI (LOGD_DHCP4,
+			       "DHCPv4: trying to acquire a new lease within %u seconds",
+			       timeout);
+			nm_assert (!priv->dhcp4.grace_id);
+			priv->dhcp4.grace_id = g_timeout_add_seconds (timeout,
+			                                              dhcp4_grace_period_expired,
+			                                              self);
+		}
+
+		priv->dhcp4.grace_pending = TRUE;
 		goto clear_config;
 	}
 	return;
@@ -7853,6 +7947,7 @@ dhcp4_state_changed (NMDhcpClient *client,
 
 	switch (state) {
 	case NM_DHCP_STATE_BOUND:
+	case NM_DHCP_STATE_EXTENDED:
 		if (!ip4_config) {
 			_LOGW (LOGD_DHCP4, "failed to get IPv4 config in response to DHCP event.");
 			dhcp4_fail (self, state);
@@ -7860,6 +7955,7 @@ dhcp4_state_changed (NMDhcpClient *client,
 		}
 
 		nm_clear_g_source (&priv->dhcp4.grace_id);
+		priv->dhcp4.grace_pending = FALSE;
 
 		/* After some failures, we have been able to renew the lease:
 		 * update the ip state
@@ -7895,7 +7991,8 @@ dhcp4_state_changed (NMDhcpClient *client,
 
 			ipv4_dad_start (self, configs, dhcp4_dad_cb);
 		} else if (priv->ip_state_4 == NM_DEVICE_IP_STATE_DONE) {
-			if (dhcp4_lease_change (self, ip4_config))
+			if (dhcp4_lease_change (self, ip4_config,
+			                        state == NM_DHCP_STATE_BOUND))
 				nm_device_update_metered (self);
 			else
 				dhcp4_fail (self, state);
@@ -7919,41 +8016,6 @@ dhcp4_state_changed (NMDhcpClient *client,
 	}
 }
 
-static int
-get_dhcp_timeout (NMDevice *self, int addr_family)
-{
-	NMDeviceClass *klass;
-	NMConnection *connection;
-	NMSettingIPConfig *s_ip;
-	guint32 timeout;
-
-	nm_assert (NM_IS_DEVICE (self));
-	nm_assert_addr_family (addr_family);
-
-	connection = nm_device_get_applied_connection (self);
-
-	s_ip = nm_connection_get_setting_ip_config (connection, addr_family);
-
-	timeout = nm_setting_ip_config_get_dhcp_timeout (s_ip);
-	if (timeout)
-		return timeout;
-
-	timeout = nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA,
-	                                                       addr_family == AF_INET
-	                                                         ? NM_CON_DEFAULT ("ipv4.dhcp-timeout")
-	                                                         : NM_CON_DEFAULT ("ipv6.dhcp-timeout"),
-	                                                       self,
-	                                                       0, G_MAXINT32, 0);
-	if (timeout)
-		return timeout;
-
-	klass = NM_DEVICE_GET_CLASS (self);
-	if (klass->get_dhcp_timeout)
-		timeout = klass->get_dhcp_timeout (self, addr_family);
-
-	return timeout ?: NM_DHCP_TIMEOUT_DEFAULT;
-}
-
 /**
  * dhcp_get_iaid:
  * @self: the #NMDevice
@@ -8520,6 +8582,7 @@ dhcp6_cleanup (NMDevice *self, CleanupType cleanup_type, gboolean release)
 	applied_config_clear (&priv->dhcp6.ip6_config);
 	g_clear_pointer (&priv->dhcp6.event_id, g_free);
 	nm_clear_g_source (&priv->dhcp6.grace_id);
+	priv->dhcp6.grace_pending = FALSE;
 
 	if (priv->dhcp6.client) {
 		nm_clear_g_signal_handler (priv->dhcp6.client, &priv->dhcp6.state_sigid);
@@ -8575,6 +8638,7 @@ dhcp6_grace_period_expired (gpointer user_data)
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 
 	priv->dhcp6.grace_id = 0;
+	priv->dhcp6.grace_pending = FALSE;
 	_LOGI (LOGD_DHCP6, "DHCPv6: grace period expired");
 
 	nm_device_ip_method_failed (self, AF_INET6,
@@ -8626,13 +8690,26 @@ dhcp6_fail (NMDevice *self, NMDhcpState dhcp_state)
 		/* In any other case (expired lease, assumed connection, etc.),
 		 * wait for some time before failing the IP method.
 		 */
-		if (!priv->dhcp6.grace_id) {
-			priv->dhcp6.grace_id = g_timeout_add_seconds (DHCP_GRACE_PERIOD_SEC,
-			                                              dhcp6_grace_period_expired,
-			                                              self);
-			_LOGI (LOGD_DHCP6,
-			       "DHCPv6: %u seconds grace period started",
-			       DHCP_GRACE_PERIOD_SEC);
+		if (!priv->dhcp6.grace_pending) {
+			guint32 timeout;
+
+			/* Start a grace period equal to the DHCP timeout multiplied
+			 * by a constant factor. */
+			timeout = get_dhcp_timeout (self, AF_INET6);
+			if (timeout == NM_DHCP_TIMEOUT_INFINITY)
+				_LOGI (LOGD_DHCP6, "DHCPv6: trying to acquire a new lease");
+			else {
+				timeout = dhcp_grace_period_from_timeout (timeout);
+				_LOGI (LOGD_DHCP6,
+				       "DHCPv6: trying to acquire a new lease within %u seconds",
+				       timeout);
+				nm_assert (!priv->dhcp6.grace_id);
+				priv->dhcp6.grace_id = g_timeout_add_seconds (timeout,
+				                                              dhcp6_grace_period_expired,
+				                                              self);
+			}
+
+			priv->dhcp6.grace_pending = TRUE;
 			goto clear_config;
 		}
 	} else {
@@ -8670,7 +8747,9 @@ dhcp6_state_changed (NMDhcpClient *client,
 
 	switch (state) {
 	case NM_DHCP_STATE_BOUND:
+	case NM_DHCP_STATE_EXTENDED:
 		nm_clear_g_source (&priv->dhcp6.grace_id);
+		priv->dhcp6.grace_pending = FALSE;
 		/* If the server sends multiple IPv6 addresses, we receive a state
 		 * changed event for each of them. Use the event ID to merge IPv6
 		 * addresses from the same transaction into a single configuration.
@@ -10016,7 +10095,7 @@ addrconf6_start_with_link_ready (NMDevice *self)
 	                                           G_CALLBACK (ndisc_config_changed),
 	                                           self);
 	priv->ndisc_timeout_id = g_signal_connect (priv->ndisc,
-	                                           NM_NDISC_RA_TIMEOUT,
+	                                           NM_NDISC_RA_TIMEOUT_SIGNAL,
 	                                           G_CALLBACK (ndisc_ra_timeout),
 	                                           self);
 
@@ -10035,6 +10114,28 @@ ndisc_node_type (NMDevice *self)
 	return NM_NDISC_NODE_TYPE_HOST;
 }
 
+static gint32
+get_ra_timeout (NMDevice *self)
+{
+	NMConnection *connection;
+	gint32 timeout;
+
+	G_STATIC_ASSERT_EXPR (NM_RA_TIMEOUT_DEFAULT == 0);
+	G_STATIC_ASSERT_EXPR (NM_RA_TIMEOUT_INFINITY == G_MAXINT32);
+
+	connection = nm_device_get_applied_connection (self);
+
+	timeout = nm_setting_ip6_config_get_ra_timeout (NM_SETTING_IP6_CONFIG (nm_connection_get_setting_ip6_config (connection)));
+	nm_assert (timeout >= 0);
+	if (timeout)
+		return timeout;
+
+	return nm_config_data_get_connection_default_int64 (NM_CONFIG_GET_DATA,
+	                                                    NM_CON_DEFAULT ("ipv6.ra-timeout"),
+	                                                    self,
+	                                                    0, G_MAXINT32, 0);
+}
+
 static gboolean
 addrconf6_start (NMDevice *self, NMSettingIP6ConfigPrivacy use_tempaddr)
 {
@@ -10065,6 +10166,7 @@ addrconf6_start (NMDevice *self, NMSettingIP6ConfigPrivacy use_tempaddr)
 	                                 stable_id,
 	                                 nm_setting_ip6_config_get_addr_gen_mode (s_ip6),
 	                                 ndisc_node_type (self),
+	                                 get_ra_timeout (self),
 	                                 &error);
 	if (!priv->ndisc) {
 		_LOGE (LOGD_IP6, "addrconf6: failed to start neighbor discovery: %s", error->message);
@@ -15515,6 +15617,12 @@ _set_state_full (NMDevice *self,
 	       reason_to_string_a (reason),
 	       _sys_iface_state_to_str (priv->sys_iface_state));
 
+	/* in order to prevent triggering any callback caused
+	 * by the device not having any pending action anymore
+	 * we add one here that gets removed at the end of the function */
+	nm_device_add_pending_action (self,
+	                              NM_PENDING_ACTION_IN_STATE_CHANGE,
+	                              TRUE);
 	priv->in_state_changed = TRUE;
 
 	priv->state = state;
@@ -15821,6 +15929,9 @@ _set_state_full (NMDevice *self,
 		g_object_unref (req);
 
 	priv->in_state_changed = FALSE;
+	nm_device_remove_pending_action (self,
+	                                 NM_PENDING_ACTION_IN_STATE_CHANGE,
+	                                 TRUE);
 
 	if ((old_state > NM_DEVICE_STATE_UNMANAGED) != (state > NM_DEVICE_STATE_UNMANAGED))
 		_notify (self, PROP_MANAGED);
@@ -17507,6 +17618,7 @@ nm_device_class_init (NMDeviceClass *klass)
 
 	klass->get_type_description = get_type_description;
 	klass->can_auto_connect = can_auto_connect;
+	klass->can_update_from_platform_link = can_update_from_platform_link;
 	klass->check_connection_compatible = check_connection_compatible;
 	klass->check_connection_available = check_connection_available;
 	klass->can_unmanaged_external_down = can_unmanaged_external_down;
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 518c66ca..8c6c856e 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -53,6 +53,7 @@ nm_device_state_reason_check (NMDeviceStateReason reason)
 }
 
 #define NM_PENDING_ACTION_AUTOACTIVATE              "autoactivate"
+#define NM_PENDING_ACTION_IN_STATE_CHANGE           "in-state-change"
 #define NM_PENDING_ACTION_RECHECK_AVAILABLE         "recheck-available"
 #define NM_PENDING_ACTION_CARRIER_WAIT              "carrier-wait"
 #define NM_PENDING_ACTION_WAITING_FOR_SUPPLICANT    "waiting-for-supplicant"
@@ -436,11 +437,13 @@ typedef struct _NMDeviceClass {
 	                                        NMConnection *con_old,
 	                                        NMConnection *con_new);
 
-	guint32         (* get_dhcp_timeout) (NMDevice *self,
-	                                      int addr_family);
+	guint32         (* get_dhcp_timeout_for_device) (NMDevice *self,
+	                                                 int addr_family);
 
 	gboolean        (* get_guessed_metered) (NMDevice *self);
 
+	gboolean        (* can_update_from_platform_link) (NMDevice *self, const NMPlatformLink *plink);
+
 	/* Controls, whether to call act_stage2_config() callback also for assuming
 	 * a device or for external activations. In this case, act_stage2_config() must
 	 * take care not to touch the device's configuration. */
diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/devices/ovs/nm-device-ovs-interface.c
index 726e9901..2868dee0 100644
--- a/src/devices/ovs/nm-device-ovs-interface.c
+++ b/src/devices/ovs/nm-device-ovs-interface.c
@@ -98,10 +98,12 @@ link_changed (NMDevice *device,
 {
 	NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE (device);
 
-	if (   pllink
-	    && priv->waiting_for_interface
-	    && nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) {
-		priv->waiting_for_interface = FALSE;
+	if (!pllink || !priv->waiting_for_interface)
+		return;
+
+	priv->waiting_for_interface = FALSE;
+
+	if (nm_device_get_state (device) == NM_DEVICE_STATE_IP_CONFIG) {
 		nm_device_bring_up (device, TRUE, NULL);
 		nm_device_activate_schedule_stage3_ip_config_start (device);
 	}
@@ -125,12 +127,14 @@ act_stage3_ip_config_start (NMDevice *device,
                             gpointer *out_config,
                             NMDeviceStateReason *out_failure_reason)
 {
+	NMDeviceOvsInterface *self = NM_DEVICE_OVS_INTERFACE (device);
 	NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE (device);
 
 	if (!_is_internal_interface (device))
 		return NM_ACT_STAGE_RETURN_IP_FAIL;
 
 	if (nm_device_get_ip_ifindex (device) <= 0) {
+		_LOGT (LOGD_DEVICE, "waiting for link to appear");
 		priv->waiting_for_interface = TRUE;
 		return NM_ACT_STAGE_RETURN_POSTPONE;
 	}
@@ -153,6 +157,160 @@ deactivate (NMDevice *device)
 	priv->waiting_for_interface = FALSE;
 }
 
+typedef struct {
+	NMDeviceOvsInterface *self;
+	GCancellable *cancellable;
+	NMDeviceDeactivateCallback callback;
+	gpointer callback_user_data;
+	gulong link_changed_id;
+	gulong cancelled_id;
+	guint link_timeout_id;
+} DeactivateData;
+
+static void
+deactivate_invoke_cb (DeactivateData *data, GError *error)
+{
+	NMDeviceOvsInterface *self = data->self;
+
+	_LOGT (LOGD_CORE,
+	       "deactivate: async callback (%s)",
+	       error ? error->message : "success");
+	data->callback (NM_DEVICE (data->self),
+	                error,
+	                data->callback_user_data);
+
+	nm_clear_g_signal_handler (nm_device_get_platform (NM_DEVICE (data->self)),
+	                           &data->link_changed_id);
+	nm_clear_g_signal_handler (data->cancellable,
+	                           &data->cancelled_id);
+	nm_clear_g_source (&data->link_timeout_id);
+	g_object_unref (data->self);
+	g_object_unref (data->cancellable);
+	nm_g_slice_free (data);
+}
+
+static void
+deactivate_link_changed_cb (NMPlatform *platform,
+                            int obj_type_i,
+                            int ifindex,
+                            NMPlatformLink *info,
+                            int change_type_i,
+                            DeactivateData *data)
+{
+	NMDeviceOvsInterface *self = data->self;
+	const NMPlatformSignalChangeType change_type = change_type_i;
+
+	if (   change_type == NM_PLATFORM_SIGNAL_REMOVED
+	    && nm_streq0 (info->name, nm_device_get_iface (NM_DEVICE (self)))) {
+		_LOGT (LOGD_DEVICE, "deactivate: link removed, proceeding");
+		nm_device_update_from_platform_link (NM_DEVICE (self), NULL);
+		deactivate_invoke_cb (data, NULL);
+		return;
+	}
+}
+
+static gboolean
+deactivate_link_timeout (gpointer user_data)
+{
+	DeactivateData *data = user_data;
+	NMDeviceOvsInterface *self = data->self;
+
+	_LOGT (LOGD_DEVICE, "deactivate: timeout waiting link removal");
+	deactivate_invoke_cb (data, NULL);
+	return G_SOURCE_REMOVE;
+}
+
+static void
+deactivate_cancelled_cb (GCancellable *cancellable,
+                         gpointer user_data)
+{
+	gs_free_error GError *error = NULL;
+
+	nm_utils_error_set_cancelled (&error, FALSE, NULL);
+	deactivate_invoke_cb ((DeactivateData *) user_data, error);
+}
+
+static void
+deactivate_cb_on_idle (gpointer user_data,
+                       GCancellable *cancellable)
+{
+	DeactivateData *data = user_data;
+	gs_free_error GError *cancelled_error = NULL;
+
+	g_cancellable_set_error_if_cancelled (data->cancellable, &cancelled_error);
+	deactivate_invoke_cb (data, cancelled_error);
+}
+
+static void
+deactivate_async (NMDevice *device,
+                  GCancellable *cancellable,
+                  NMDeviceDeactivateCallback callback,
+                  gpointer callback_user_data) {
+
+	NMDeviceOvsInterface *self = NM_DEVICE_OVS_INTERFACE (device);
+	NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE (self);
+	DeactivateData *data;
+
+	_LOGT (LOGD_CORE, "deactivate: start async");
+
+	/* We want to ensure that the kernel link for this device is
+	 * removed upon disconnection so that it will not interfere with
+	 * later activations of the same device. Unfortunately there is
+	 * no synchronization mechanism with vswitchd, we only update
+	 * ovsdb and wait that changes are picked up.
+	 */
+
+	data = g_slice_new (DeactivateData);
+	*data = (DeactivateData) {
+		.self = g_object_ref (self),
+		.cancellable = g_object_ref (cancellable),
+		.callback = callback,
+		.callback_user_data = callback_user_data,
+	};
+
+	if (   !priv->waiting_for_interface
+	    && !nm_platform_link_get_by_ifname (nm_device_get_platform (device),
+	                                        nm_device_get_iface (device))) {
+		_LOGT (LOGD_CORE, "deactivate: link not present, proceeding");
+		nm_device_update_from_platform_link (NM_DEVICE (self), NULL);
+		nm_utils_invoke_on_idle (deactivate_cb_on_idle, data, cancellable);
+		return;
+	}
+
+	if (priv->waiting_for_interface) {
+		/* At this point we have issued an INSERT and a DELETE
+		 * command for the interface to ovsdb. We don't know if
+		 * vswitchd will see the two updates or only one. We
+		 * must add a timeout to avoid waiting forever in case
+		 * the link doesn't appear.
+		 */
+		data->link_timeout_id = g_timeout_add (6000, deactivate_link_timeout, data);
+		_LOGT (LOGD_DEVICE, "deactivate: waiting for link to disappear in 6 seconds");
+	} else
+		_LOGT (LOGD_DEVICE, "deactivate: waiting for link to disappear");
+
+	data->cancelled_id = g_cancellable_connect (cancellable,
+	                                            G_CALLBACK (deactivate_cancelled_cb),
+	                                            data,
+	                                            NULL);
+	data->link_changed_id = g_signal_connect (nm_device_get_platform (device),
+	                                          NM_PLATFORM_SIGNAL_LINK_CHANGED,
+	                                          G_CALLBACK (deactivate_link_changed_cb),
+	                                          data);
+}
+
+static gboolean
+can_update_from_platform_link (NMDevice *device, const NMPlatformLink *plink)
+{
+	/* If the device is deactivating, we already sent the
+	 * deletion command to ovsdb and we don't want to deal
+	 * with any new link appearing from the previous
+	 * activation.
+	 */
+	return    !plink
+	       || nm_device_get_state (device) != NM_DEVICE_STATE_DEACTIVATING;
+}
+
 /*****************************************************************************/
 
 static void
@@ -182,7 +340,9 @@ nm_device_ovs_interface_class_init (NMDeviceOvsInterfaceClass *klass)
 	device_class->connection_type_check_compatible = NM_SETTING_OVS_INTERFACE_SETTING_NAME;
 	device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_OPENVSWITCH);
 
+	device_class->can_update_from_platform_link = can_update_from_platform_link;
 	device_class->deactivate = deactivate;
+	device_class->deactivate_async = deactivate_async;
 	device_class->get_type_description = get_type_description;
 	device_class->create_and_realize = create_and_realize;
 	device_class->get_generic_capabilities = get_generic_capabilities;
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index fb9c9c69..a0749c21 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -356,6 +356,12 @@ teamd_dbus_appeared (GDBusConnection *connection,
 	_LOGI (LOGD_TEAM, "teamd appeared on D-Bus");
 	nm_device_queue_recheck_assume (device);
 
+	if (priv->kill_in_progress) {
+		/* If we are currently killing teamd, we are not
+		 * interested in knowing when it becomes ready. */
+		return;
+	}
+
 	/* If another teamd grabbed the bus name while our teamd was starting,
 	 * just ignore the death of our teamd and run with the existing one.
 	 */
@@ -380,11 +386,14 @@ teamd_dbus_appeared (GDBusConnection *connection,
 			if (pid != priv->teamd_pid)
 				teamd_cleanup (self, FALSE);
 		} else {
-			_LOGW (LOGD_TEAM, "failed to determine D-Bus name owner");
-			/* If we can't determine the bus name owner, don't kill our
-			 * teamd instance. Hopefully another existing teamd just died and
-			 * our instance will be able to grab the bus name.
-			 */
+			/* The process that registered on the bus died. If it's
+			 * the teamd instance we just started, ignore the event
+			 * as we already detect the failure through the process
+			 * watch. If it's a previous instance that got killed,
+			 * also ignore that as our new instance will register
+			 * again. */
+			_LOGD (LOGD_TEAM, "failed to determine D-Bus name owner, ignoring");
+			return;
 		}
 	}
 
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index c19ec766..516dc78b 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -405,7 +405,7 @@ state_changed (NMDevice *device,
 }
 
 static guint32
-get_dhcp_timeout (NMDevice *device, int addr_family)
+get_dhcp_timeout_for_device (NMDevice *device, int addr_family)
 {
 	/* shorter timeout for mesh connectivity */
 	return 20;
@@ -521,7 +521,7 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass)
 	device_class->act_stage1_prepare = act_stage1_prepare;
 	device_class->act_stage2_config = act_stage2_config;
 	device_class->state_changed = state_changed;
-	device_class->get_dhcp_timeout = get_dhcp_timeout;
+	device_class->get_dhcp_timeout_for_device = get_dhcp_timeout_for_device;
 
 	obj_properties[PROP_COMPANION] =
 	     g_param_spec_string (NM_DEVICE_OLPC_MESH_COMPANION, "", "",
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index 3e6ccc8f..3de5ae07 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -732,7 +732,7 @@ set_modem (NMDeviceModem *self, NMModem *modem)
 }
 
 static guint32
-get_dhcp_timeout (NMDevice *device, int addr_family)
+get_dhcp_timeout_for_device (NMDevice *device, int addr_family)
 {
 	/* DHCP is always done by the modem firmware, not by the network, and
 	 * by the time we get around to DHCP the firmware should already know
@@ -897,7 +897,7 @@ nm_device_modem_class_init (NMDeviceModemClass *klass)
 	device_class->is_available = is_available;
 	device_class->get_ip_iface_identifier = get_ip_iface_identifier;
 	device_class->get_configured_mtu = nm_modem_get_configured_mtu;
-	device_class->get_dhcp_timeout = get_dhcp_timeout;
+	device_class->get_dhcp_timeout_for_device = get_dhcp_timeout_for_device;
 
 	device_class->state_changed = device_state_changed;
 
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 0a07b26c..81c4ad9c 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -317,6 +317,7 @@ nm_dhcp_client_get_use_fqdn (NMDhcpClient *self)
 static const char *state_table[NM_DHCP_STATE_MAX + 1] = {
 	[NM_DHCP_STATE_UNKNOWN]    = "unknown",
 	[NM_DHCP_STATE_BOUND]      = "bound",
+	[NM_DHCP_STATE_EXTENDED]   = "extended",
 	[NM_DHCP_STATE_TIMEOUT]    = "timeout",
 	[NM_DHCP_STATE_EXPIRE]     = "expire",
 	[NM_DHCP_STATE_DONE]       = "done",
@@ -336,13 +337,14 @@ static NMDhcpState
 reason_to_state (NMDhcpClient *self, const char *iface, const char *reason)
 {
 	if (g_ascii_strcasecmp (reason, "bound") == 0 ||
-	    g_ascii_strcasecmp (reason, "bound6") == 0 ||
-	    g_ascii_strcasecmp (reason, "renew") == 0 ||
-	    g_ascii_strcasecmp (reason, "renew6") == 0 ||
-	    g_ascii_strcasecmp (reason, "reboot") == 0 ||
-	    g_ascii_strcasecmp (reason, "rebind") == 0 ||
-	    g_ascii_strcasecmp (reason, "rebind6") == 0)
+	    g_ascii_strcasecmp (reason, "bound6") == 0)
 		return NM_DHCP_STATE_BOUND;
+	else if (g_ascii_strcasecmp (reason, "renew") == 0 ||
+	         g_ascii_strcasecmp (reason, "renew6") == 0 ||
+	         g_ascii_strcasecmp (reason, "reboot") == 0 ||
+	         g_ascii_strcasecmp (reason, "rebind") == 0 ||
+	         g_ascii_strcasecmp (reason, "rebind6") == 0)
+		return NM_DHCP_STATE_EXTENDED;
 	else if (g_ascii_strcasecmp (reason, "timeout") == 0)
 		return NM_DHCP_STATE_TIMEOUT;
 	else if (g_ascii_strcasecmp (reason, "nak") == 0 ||
@@ -415,7 +417,7 @@ nm_dhcp_client_set_state (NMDhcpClient *self,
 	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 	gs_free char *event_id = NULL;
 
-	if (new_state == NM_DHCP_STATE_BOUND) {
+	if (NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) {
 		g_return_if_fail (NM_IS_IP_CONFIG (ip_config, priv->addr_family));
 		g_return_if_fail (options);
 	} else {
@@ -430,10 +432,11 @@ nm_dhcp_client_set_state (NMDhcpClient *self,
 
 	/* The client may send same-state transitions for RENEW/REBIND events and
 	 * the lease may have changed, so handle same-state transitions for the
-	 * BOUND state.  Ignore same-state transitions for other events since
-	 * the lease won't have changed and the state was already handled.
+	 * EXTENDED and BOUND states.  Ignore same-state transitions for other
+	 * events since the lease won't have changed and the state was already handled.
 	 */
-	if ((priv->state == new_state) && (new_state != NM_DHCP_STATE_BOUND))
+	if (   (priv->state == new_state)
+	    && !NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED))
 		return;
 
 	if (_LOGI_ENABLED ()) {
@@ -448,7 +451,7 @@ nm_dhcp_client_set_state (NMDhcpClient *self,
 	}
 
 	if (   priv->addr_family == AF_INET6
-	    && new_state == NM_DHCP_STATE_BOUND) {
+	    && NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) {
 		char *start, *iaid;
 
 		iaid = g_hash_table_lookup (options, "iaid");
@@ -877,7 +880,7 @@ nm_dhcp_client_handle_event (gpointer unused,
 	_LOGD ("DHCP state '%s' -> '%s' (reason: '%s')",
 	       state_to_string (old_state), state_to_string (new_state), reason);
 
-	if (new_state == NM_DHCP_STATE_BOUND) {
+	if (NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) {
 		GVariantIter iter;
 		const char *name;
 		GVariant *value;
@@ -918,7 +921,7 @@ nm_dhcp_client_handle_event (gpointer unused,
 		nm_dhcp_client_emit_ipv6_prefix_delegated (self, &prefix);
 	} else {
 		/* Fail if no valid IP config was received */
-		if (   new_state == NM_DHCP_STATE_BOUND
+		if (   NM_IN_SET (new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)
 		    && !ip_config) {
 			_LOGW ("client bound but IP config not received");
 			new_state = NM_DHCP_STATE_FAIL;
@@ -1007,8 +1010,8 @@ set_property (GObject *object, guint prop_id,
 	case PROP_IFACE:
 		/* construct-only */
 		priv->iface = g_value_dup_string (value);
-		g_return_if_fail (   priv->iface
-		                  && nm_utils_is_valid_iface_name (priv->iface, NULL));
+		g_return_if_fail (priv->iface);
+		nm_assert (nm_utils_ifname_valid_kernel (priv->iface, NULL));
 		break;
 	case PROP_IFINDEX:
 		/* construct-only */
@@ -1200,6 +1203,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 	                       G_PARAM_READWRITE |
 	                       G_PARAM_STATIC_STRINGS);
 
+	G_STATIC_ASSERT_EXPR (G_MAXINT32 == NM_DHCP_TIMEOUT_INFINITY);
 	obj_properties[PROP_TIMEOUT] =
 	    g_param_spec_uint (NM_DHCP_CLIENT_TIMEOUT, "", "",
 	                       1, G_MAXINT32, NM_DHCP_TIMEOUT_DEFAULT,
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index 6a431fa8..1ff09067 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -12,8 +12,8 @@
 #include "nm-ip6-config.h"
 #include "nm-dhcp-utils.h"
 
-#define NM_DHCP_TIMEOUT_DEFAULT ((guint32) 45) /* default DHCP timeout, in seconds */
-#define NM_DHCP_TIMEOUT_INFINITY G_MAXINT32
+#define NM_DHCP_TIMEOUT_DEFAULT  ((guint32) 45) /* default DHCP timeout, in seconds */
+#define NM_DHCP_TIMEOUT_INFINITY ((guint32) G_MAXINT32)
 
 #define NM_TYPE_DHCP_CLIENT            (nm_dhcp_client_get_type ())
 #define NM_DHCP_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient))
@@ -43,7 +43,8 @@
 
 typedef enum {
 	NM_DHCP_STATE_UNKNOWN = 0,
-	NM_DHCP_STATE_BOUND,        /* new lease or lease changed */
+	NM_DHCP_STATE_BOUND,        /* new lease */
+	NM_DHCP_STATE_EXTENDED,     /* lease extended */
 	NM_DHCP_STATE_TIMEOUT,      /* timed out contacting server */
 	NM_DHCP_STATE_DONE,         /* client quit or stopped */
 	NM_DHCP_STATE_EXPIRE,       /* lease expired or NAKed */
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index b4c0a451..45ff46f5 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -977,7 +977,7 @@ lease_save (NMDhcpNettools *self, NDhcp4ClientLease *lease, const char *lease_fi
 }
 
 static void
-bound4_handle (NMDhcpNettools *self, NDhcp4ClientLease *lease)
+bound4_handle (NMDhcpNettools *self, NDhcp4ClientLease *lease, gboolean extended)
 {
 	NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE (self);
 	const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
@@ -985,7 +985,7 @@ bound4_handle (NMDhcpNettools *self, NDhcp4ClientLease *lease)
 	gs_unref_hashtable GHashTable *options = NULL;
 	GError *error = NULL;
 
-	_LOGT ("lease available");
+	_LOGT ("lease available (%s)", extended ? "extended" : "new");
 
 	ip4_config = lease_to_ip4_config (nm_dhcp_client_get_multi_idx (NM_DHCP_CLIENT (self)),
 	                                  iface,
@@ -1006,7 +1006,7 @@ bound4_handle (NMDhcpNettools *self, NDhcp4ClientLease *lease)
 	lease_save (self, lease, priv->lease_file);
 
 	nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
-	                          NM_DHCP_STATE_BOUND,
+	                          extended ? NM_DHCP_STATE_EXTENDED : NM_DHCP_STATE_BOUND,
 	                          NM_IP_CONFIG_CAST (ip4_config),
 	                          options);
 }
@@ -1037,10 +1037,10 @@ dhcp4_event_handle (NMDhcpNettools *self,
 		break;
 	case N_DHCP4_CLIENT_EVENT_GRANTED:
 		priv->lease = n_dhcp4_client_lease_ref (event->granted.lease);
-		bound4_handle (self, event->granted.lease);
+		bound4_handle (self, event->granted.lease, FALSE);
 		break;
 	case N_DHCP4_CLIENT_EVENT_EXTENDED:
-		bound4_handle (self, event->extended.lease);
+		bound4_handle (self, event->extended.lease, TRUE);
 		break;
 	case N_DHCP4_CLIENT_EVENT_DOWN:
 		/* ignore down events, they are purely informational */
@@ -1064,8 +1064,18 @@ dhcp4_event_cb (GIOChannel *source,
 	int r;
 
 	r = n_dhcp4_client_dispatch (priv->client);
-	if (r < 0)
-		return G_SOURCE_CONTINUE;
+	if (r < 0) {
+		/* FIXME: if any operation (e.g. send()) fails during the
+		 * dispatch, n-dhcp4 returns an error without arming timers
+		 * or progressing state, so the only reasonable thing to do
+		 * is to move to failed state so that the client will be
+		 * restarted. Ideally n-dhcp4 should retry failed operations
+		 * a predefined number of times (possibly infinite).
+		 */
+		_LOGE ("error %d dispatching events", r);
+		nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
+		return G_SOURCE_REMOVE;
+	}
 
 	while (!n_dhcp4_client_pop_event (priv->client, &event) && event) {
 		dhcp4_event_handle (self, event);
diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c
index 4c003f31..1d391f3e 100644
--- a/src/dhcp/nm-dhcp-options.c
+++ b/src/dhcp/nm-dhcp-options.c
@@ -34,7 +34,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = {
 	REQ (NM_DHCP_OPTION_DHCP4_NIS_DOMAIN,                        "nis_domain",                      TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP4_NIS_SERVERS,                       "nis_servers",                     TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP4_NTP_SERVER,                        "ntp_servers",                     TRUE ),
-	REQ (NM_DHCP_OPTION_DHCP4_SERVER_ID,                         "dhcp_server_identifier",          TRUE ),
+	REQ (NM_DHCP_OPTION_DHCP4_SERVER_ID,                         "dhcp_server_identifier",          FALSE ),
 	REQ (NM_DHCP_OPTION_DHCP4_DOMAIN_SEARCH_LIST,                "domain_search",                   TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP4_PRIVATE_CLASSLESS_STATIC_ROUTE,    "ms_classless_static_routes",      TRUE ),
 	REQ (NM_DHCP_OPTION_DHCP4_PRIVATE_PROXY_AUTODISCOVERY,       "wpad",                            TRUE ),
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index 1518d465..6e6aa243 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -477,7 +477,7 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx,
 /*****************************************************************************/
 
 static void
-bound4_handle (NMDhcpSystemd *self)
+bound4_handle (NMDhcpSystemd *self, gboolean extended)
 {
 	NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 	const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
@@ -514,7 +514,7 @@ bound4_handle (NMDhcpSystemd *self)
 	dhcp_lease_save (lease, priv->lease_file);
 
 	nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
-	                          NM_DHCP_STATE_BOUND,
+	                          extended ? NM_DHCP_STATE_EXTENDED : NM_DHCP_STATE_BOUND,
 	                          NM_IP_CONFIG_CAST (ip4_config),
 	                          options);
 }
@@ -538,8 +538,10 @@ dhcp_event_cb (sd_dhcp_client *client, int event, gpointer user_data)
 		break;
 	case SD_DHCP_CLIENT_EVENT_RENEW:
 	case SD_DHCP_CLIENT_EVENT_IP_CHANGE:
+		bound4_handle (self, TRUE);
+		break;
 	case SD_DHCP_CLIENT_EVENT_IP_ACQUIRE:
-		bound4_handle (self);
+		bound4_handle (self, FALSE);
 		break;
 	case SD_DHCP_CLIENT_EVENT_SELECTING:
 		break;
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index c32ef1cf..2cb93a2d 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -195,6 +195,47 @@ _base_setting_set (NMConnection *connection, const char *property, const char *v
 }
 
 static void
+read_all_connections_from_fw (GHashTable *connections, const char *sysfs_dir)
+{
+	gs_unref_hashtable GHashTable *ibft = NULL;
+	NMConnection *connection;
+	GHashTableIter iter;
+	const char *mac;
+	GHashTable *nic;
+	const char *index;
+	GError *error = NULL;
+
+	ibft = nmi_ibft_read (sysfs_dir);
+
+	g_hash_table_iter_init (&iter, ibft);
+	while (g_hash_table_iter_next (&iter, (gpointer *) &mac, (gpointer *) &nic)) {
+		connection = nm_simple_connection_new ();
+
+		index = g_hash_table_lookup (nic, "index");
+		if (!index) {
+			_LOGW (LOGD_CORE, "Ignoring an iBFT entry without an index");
+			continue;
+		}
+
+		if (!nmi_ibft_update_connection_from_nic (connection, nic, &error)) {
+			_LOGW (LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
+			g_error_free (error);
+		}
+
+		g_hash_table_insert (connections,
+		                     g_strdup_printf ("ibft%s", index),
+		                     connection);
+	}
+
+	connection = nmi_dt_reader_parse (sysfs_dir);
+	if (connection) {
+		g_hash_table_insert (connections,
+		                     g_strdup ("ofw"),
+		                     connection);
+	}
+}
+
+static void
 parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
 {
 	NMConnection *connection;
@@ -258,44 +299,7 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
 
 	if (ifname == NULL && (   g_strcmp0 (kind, "fw") == 0
 	                       || g_strcmp0 (kind, "ibft") == 0)) {
-		GHashTableIter iter;
-		const char *mac;
-		GHashTable *nic;
-		const char *index;
-
-		/* This is the ip=ibft case. Just take all we got from iBFT
-		 * and don't process anything else, since there's no ifname
-		 * specified to apply it to. */
-		if (!ibft)
-			ibft = nmi_ibft_read (sysfs_dir);
-
-		g_hash_table_iter_init (&iter, ibft);
-		while (g_hash_table_iter_next (&iter, (gpointer)&mac, (gpointer)&nic)) {
-			connection = nm_simple_connection_new ();
-
-			index = g_hash_table_lookup (nic, "index");
-			if (!index) {
-				_LOGW (LOGD_CORE, "Ignoring an iBFT entry without an index");
-				continue;
-			}
-
-			if (!nmi_ibft_update_connection_from_nic (connection, nic, &error)) {
-				_LOGW (LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
-				g_error_free (error);
-			}
-
-			g_hash_table_insert (connections,
-			                     g_strdup_printf ("ibft%s", index),
-			                     connection);
-		}
-
-		connection = nmi_dt_reader_parse (sysfs_dir);
-		if (connection) {
-			g_hash_table_insert (connections,
-			                     g_strdup ("ofw"),
-			                     connection);
-		}
-
+		read_all_connections_from_fw (connections, sysfs_dir);
 		return;
 	}
 
@@ -421,8 +425,7 @@ parse_ip (GHashTable *connections, const char *sysfs_dir, char *argument)
 		if (mac) {
 			g_strchomp (mac);
 			mac_up = g_ascii_strup (mac, -1);
-			if (!ibft)
-				ibft = nmi_ibft_read (sysfs_dir);
+			ibft = nmi_ibft_read (sysfs_dir);
 			nic = g_hash_table_lookup (ibft, mac_up);
 			if (!nic)
 				_LOGW (LOGD_CORE, "No iBFT NIC for %s (%s)", ifname, mac_up);
@@ -838,6 +841,8 @@ nmi_cmdline_reader_parse (const char *sysfs_dir, const char *const*argv)
 			parse_nameserver (connections, argument);
 		else if (strcmp (tag, "rd.peerdns") == 0)
 			parse_rd_peerdns (connections, argument);
+		else if (strcmp (tag, "rd.iscsi.ibft") == 0 && _nm_utils_ascii_str_to_bool (argument, TRUE))
+			read_all_connections_from_fw (connections, sysfs_dir);
 		else if (strcmp (tag, "rd.bootif") == 0)
 			ignore_bootif = !_nm_utils_ascii_str_to_bool (argument, TRUE);
 		else if (strcmp (tag, "rd.neednet") == 0)
diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c
index ffce98fc..47b90ebf 100644
--- a/src/initrd/nmi-ibft-reader.c
+++ b/src/initrd/nmi-ibft-reader.c
@@ -296,6 +296,7 @@ connection_setting_add (GHashTable *nic,
 	              NM_SETTING_CONNECTION_TYPE, type,
 	              NM_SETTING_CONNECTION_UUID, uuid,
 	              NM_SETTING_CONNECTION_ID, id,
+	              NM_SETTING_CONNECTION_INTERFACE_NAME, NULL,
 	              NULL);
 
 	g_free (uuid);
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 1d4bb9a6..8951e491 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -768,10 +768,30 @@ test_team (void)
 }
 
 static void
-test_ibft (void)
+test_ibft_ip_dev (void)
+{
+	const char *const*ARGV = NM_MAKE_STRV ("ip=eth0:ibft");
+	gs_unref_hashtable GHashTable *connections = NULL;
+	NMSettingConnection *s_con;
+	NMConnection *connection;
+
+	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+	g_assert (connections);
+	g_assert_cmpint (g_hash_table_size (connections), ==, 1);
+
+	connection = g_hash_table_lookup (connections, "eth0");
+	g_assert (connection);
+
+	s_con = nm_connection_get_setting_connection (connection);
+	g_assert (s_con);
+	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_VLAN_SETTING_NAME);
+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, NULL);
+}
+
+static void
+_test_ibft_ip (const char *const*ARGV)
 {
 	gs_unref_hashtable GHashTable *connections = NULL;
-	const char *const*ARGV = NM_MAKE_STRV ("ip=ibft");
 	NMConnection *connection;
 
 	connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
@@ -782,11 +802,29 @@ test_ibft (void)
 	g_assert (connection);
 	nmtst_assert_connection_verifies_without_normalization (connection);
 	g_assert_cmpstr (nm_connection_get_id (connection), ==, "iBFT VLAN Connection 0");
+	g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, NULL);
 
 	connection = g_hash_table_lookup (connections, "ibft2");
 	g_assert (connection);
 	nmtst_assert_connection_verifies_without_normalization (connection);
 	g_assert_cmpstr (nm_connection_get_id (connection), ==, "iBFT Connection 2");
+	g_assert_cmpstr (nm_connection_get_interface_name (connection), ==, NULL);
+}
+
+static void
+test_ibft_ip (void)
+{
+	const char *const*ARGV = NM_MAKE_STRV ("ip=ibft");
+
+	_test_ibft_ip (ARGV);
+}
+
+static void
+test_ibft_rd_iscsi_ibft (void)
+{
+	const char *const*ARGV = NM_MAKE_STRV ("rd.iscsi.ibft");
+
+	_test_ibft_ip (ARGV);
 }
 
 static void
@@ -1045,7 +1083,9 @@ int main (int argc, char **argv)
 	g_test_add_func ("/initrd/cmdline/team", test_team);
 	g_test_add_func ("/initrd/cmdline/bridge", test_bridge);
 	g_test_add_func ("/initrd/cmdline/bridge/default", test_bridge_default);
-	g_test_add_func ("/initrd/cmdline/ibft", test_ibft);
+	g_test_add_func ("/initrd/cmdline/ibft/ip_dev", test_ibft_ip_dev);
+	g_test_add_func ("/initrd/cmdline/ibft/ip", test_ibft_ip);
+	g_test_add_func ("/initrd/cmdline/ibft/rd_iscsi_ibft", test_ibft_rd_iscsi_ibft);
 	g_test_add_func ("/initrd/cmdline/ignore_extra", test_ignore_extra);
 	g_test_add_func ("/initrd/cmdline/rd_znet", test_rd_znet);
 	g_test_add_func ("/initrd/cmdline/rd_znet/legacy", test_rd_znet_legacy);
diff --git a/src/initrd/tests/test-ibft-reader.c b/src/initrd/tests/test-ibft-reader.c
index 932c1a48..f7709543 100644
--- a/src/initrd/tests/test-ibft-reader.c
+++ b/src/initrd/tests/test-ibft-reader.c
@@ -65,6 +65,7 @@ test_read_ibft_dhcp (void)
 	g_assert (s_con);
 	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
 	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "iBFT Connection 1");
+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, NULL);
 	g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);
 	g_assert (nm_setting_connection_get_autoconnect (s_con));
 
@@ -109,6 +110,7 @@ test_read_ibft_static (void)
 	g_assert (s_con);
 	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_WIRED_SETTING_NAME);
 	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "iBFT Connection 0");
+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, NULL);
 	g_assert_cmpint (nm_setting_connection_get_timestamp (s_con), ==, 0);
 	g_assert (nm_setting_connection_get_autoconnect (s_con));
 
@@ -178,6 +180,7 @@ test_read_ibft_vlan (void)
 	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 	g_assert_cmpstr (nm_setting_connection_get_connection_type (s_con), ==, NM_SETTING_VLAN_SETTING_NAME);
+	g_assert_cmpstr (nm_setting_connection_get_interface_name (s_con), ==, NULL);
 
 	/* ===== WIRED SETTING ===== */
 	s_wired = nm_connection_get_setting_wired (connection);
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c
index 8077099f..6f2815ef 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/ndisc/nm-lndp-ndisc.c
@@ -557,6 +557,7 @@ nm_lndp_ndisc_new (NMPlatform *platform,
                    const char *network_id,
                    NMSettingIP6ConfigAddrGenMode addr_gen_mode,
                    NMNDiscNodeType node_type,
+                   gint32 ra_timeout,
                    GError **error)
 {
 	nm_auto_pop_netns NMPNetns *netns = NULL;
@@ -582,6 +583,7 @@ nm_lndp_ndisc_new (NMPlatform *platform,
 	                      NM_NDISC_MAX_ADDRESSES, ipv6_sysctl_get (platform, ifname,
 	                                                               "max_addresses",
 	                                                               0, G_MAXINT32, NM_NDISC_MAX_ADDRESSES_DEFAULT),
+	                      NM_NDISC_RA_TIMEOUT, (int) ra_timeout,
 	                      NM_NDISC_ROUTER_SOLICITATIONS, ipv6_sysctl_get (platform, ifname,
 	                                                                      "router_solicitations",
 	                                                                      1, G_MAXINT32, NM_NDISC_ROUTER_SOLICITATIONS_DEFAULT),
diff --git a/src/ndisc/nm-lndp-ndisc.h b/src/ndisc/nm-lndp-ndisc.h
index 22f21e41..82e7b2de 100644
--- a/src/ndisc/nm-lndp-ndisc.h
+++ b/src/ndisc/nm-lndp-ndisc.h
@@ -28,6 +28,7 @@ NMNDisc *nm_lndp_ndisc_new (NMPlatform *platform,
                             const char *network_id,
                             NMSettingIP6ConfigAddrGenMode addr_gen_mode,
                             NMNDiscNodeType node_type,
+                            gint32 ra_timeout,
                             GError **error);
 
 #endif /* __NETWORKMANAGER_LNDP_NDISC_H__ */
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 41201e24..0afca26b 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -48,6 +48,7 @@ struct _NMNDiscPrivate {
 	char *network_id;
 	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
 	NMUtilsStableType stable_type;
+	gint32 ra_timeout;
 	gint32 max_addresses;
 	gint32 router_solicitations;
 	gint32 router_solicitation_interval;
@@ -67,6 +68,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_NETWORK_ID,
 	PROP_ADDR_GEN_MODE,
 	PROP_MAX_ADDRESSES,
+	PROP_RA_TIMEOUT,
 	PROP_ROUTER_SOLICITATIONS,
 	PROP_ROUTER_SOLICITATION_INTERVAL,
 	PROP_NODE_TYPE,
@@ -74,7 +76,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 
 enum {
 	CONFIG_RECEIVED,
-	RA_TIMEOUT,
+	RA_TIMEOUT_SIGNAL,
 	LAST_SIGNAL
 };
 
@@ -898,7 +900,7 @@ ndisc_ra_timeout_cb (gpointer user_data)
 	NMNDisc *ndisc = NM_NDISC (user_data);
 
 	NM_NDISC_GET_PRIVATE (ndisc)->ra_timeout_id = 0;
-	g_signal_emit (ndisc, signals[RA_TIMEOUT], 0);
+	g_signal_emit (ndisc, signals[RA_TIMEOUT_SIGNAL], 0);
 	return G_SOURCE_REMOVE;
 }
 
@@ -906,34 +908,46 @@ void
 nm_ndisc_start (NMNDisc *ndisc)
 {
 	nm_auto_pop_netns NMPNetns *netns = NULL;
-	NMNDiscPrivate *priv = NM_NDISC_GET_PRIVATE (ndisc);
-	NMNDiscClass *klass = NM_NDISC_GET_CLASS (ndisc);
-	gint64 ra_wait_secs;
+	NMNDiscPrivate *priv;
+
+	g_return_if_fail (NM_IS_NDISC (ndisc));
+
+	priv = NM_NDISC_GET_PRIVATE (ndisc);
 
-	g_return_if_fail (klass->start);
-	g_return_if_fail (!priv->ra_timeout_id);
+	nm_assert (NM_NDISC_GET_CLASS (ndisc)->start);
+	nm_assert (!priv->ra_timeout_id);
 
-	_LOGD ("starting neighbor discovery: %d", priv->ifindex);
+	_LOGD ("starting neighbor discovery for ifindex %d%s",
+	       priv->ifindex,
+	         priv->node_type == NM_NDISC_NODE_TYPE_HOST
+	       ? " (solicit)"
+	       : " (announce)");
 
 	if (!nm_ndisc_netns_push (ndisc, &netns))
 		return;
 
-	klass->start (ndisc);
+	NM_NDISC_GET_CLASS (ndisc)->start (ndisc);
+
+	if (priv->node_type == NM_NDISC_NODE_TYPE_HOST) {
+		gint32 ra_timeout = priv->ra_timeout;
 
-	switch (priv->node_type) {
-	case NM_NDISC_NODE_TYPE_HOST:
-		ra_wait_secs = (((gint64) priv->router_solicitations) * priv->router_solicitation_interval) + 1;
-		ra_wait_secs = CLAMP (ra_wait_secs, 30, 120);
-		priv->ra_timeout_id = g_timeout_add_seconds (ra_wait_secs, ndisc_ra_timeout_cb, ndisc);
-		_LOGD ("scheduling RA timeout in %d seconds", (int) ra_wait_secs);
+		G_STATIC_ASSERT_EXPR (NM_RA_TIMEOUT_DEFAULT == 0);
+		G_STATIC_ASSERT_EXPR (NM_RA_TIMEOUT_INFINITY == G_MAXINT32);
+		if (ra_timeout != NM_RA_TIMEOUT_INFINITY) {
+			if (ra_timeout == NM_RA_TIMEOUT_DEFAULT) {
+				ra_timeout = NM_MAX ((((gint64) priv->router_solicitations) * priv->router_solicitation_interval) + 1,
+				                     30);
+			}
+			nm_assert (ra_timeout > 0 && ra_timeout < NM_RA_TIMEOUT_INFINITY);
+			_LOGD ("scheduling RA timeout in %d seconds", ra_timeout);
+			priv->ra_timeout_id = g_timeout_add_seconds (ra_timeout, ndisc_ra_timeout_cb, ndisc);
+		}
 		solicit_routers (ndisc);
-		break;
-	case NM_NDISC_NODE_TYPE_ROUTER:
-		announce_router_initial (ndisc);
-		break;
-	default:
-		g_assert_not_reached ();
+		return;
 	}
+
+	nm_assert (priv->node_type == NM_NDISC_NODE_TYPE_ROUTER);
+	announce_router_initial (ndisc);
 }
 
 NMNDiscConfigMap
@@ -1312,6 +1326,10 @@ set_property (GObject *object, guint prop_id,
 		/* construct-only */
 		priv->max_addresses = g_value_get_int (value);
 		break;
+	case PROP_RA_TIMEOUT:
+		/* construct-only */
+		priv->ra_timeout = g_value_get_int (value);
+		break;
 	case PROP_ROUTER_SOLICITATIONS:
 		/* construct-only */
 		priv->router_solicitations = g_value_get_int (value);
@@ -1323,6 +1341,8 @@ set_property (GObject *object, guint prop_id,
 	case PROP_NODE_TYPE:
 		/* construct-only */
 		priv->node_type = g_value_get_int (value);
+		nm_assert (NM_IN_SET (priv->node_type, NM_NDISC_NODE_TYPE_HOST,
+		                                       NM_NDISC_NODE_TYPE_ROUTER));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1401,8 +1421,8 @@ nm_ndisc_class_init (NMNDiscClass *klass)
 	g_type_class_add_private (klass, sizeof (NMNDiscPrivate));
 
 	object_class->set_property = set_property;
-	object_class->dispose = dispose;
-	object_class->finalize = finalize;
+	object_class->dispose      = dispose;
+	object_class->finalize     = finalize;
 
 	obj_properties[PROP_PLATFORM] =
 	    g_param_spec_object (NM_NDISC_PLATFORM, "", "",
@@ -1446,6 +1466,13 @@ nm_ndisc_class_init (NMNDiscClass *klass)
 	                      G_PARAM_WRITABLE |
 	                      G_PARAM_CONSTRUCT_ONLY |
 	                      G_PARAM_STATIC_STRINGS);
+	G_STATIC_ASSERT_EXPR (G_MAXINT32 == NM_RA_TIMEOUT_INFINITY);
+	obj_properties[PROP_RA_TIMEOUT] =
+	    g_param_spec_int (NM_NDISC_RA_TIMEOUT, "", "",
+	                      0, G_MAXINT32, 0,
+	                      G_PARAM_WRITABLE |
+	                      G_PARAM_CONSTRUCT_ONLY |
+	                      G_PARAM_STATIC_STRINGS);
 	obj_properties[PROP_ROUTER_SOLICITATIONS] =
 	    g_param_spec_int (NM_NDISC_ROUTER_SOLICITATIONS, "", "",
 	                      1, G_MAXINT32, NM_NDISC_ROUTER_SOLICITATIONS_DEFAULT,
@@ -1473,8 +1500,8 @@ nm_ndisc_class_init (NMNDiscClass *klass)
 	                  0,
 	                  NULL, NULL, NULL,
 	                  G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT);
-	signals[RA_TIMEOUT] =
-	    g_signal_new (NM_NDISC_RA_TIMEOUT,
+	signals[RA_TIMEOUT_SIGNAL] =
+	    g_signal_new (NM_NDISC_RA_TIMEOUT_SIGNAL,
 	                  G_OBJECT_CLASS_TYPE (klass),
 	                  G_SIGNAL_RUN_FIRST,
 	                  0,
diff --git a/src/ndisc/nm-ndisc.h b/src/ndisc/nm-ndisc.h
index 92295ac6..eeda38e2 100644
--- a/src/ndisc/nm-ndisc.h
+++ b/src/ndisc/nm-ndisc.h
@@ -16,6 +16,9 @@
 #include "platform/nm-platform.h"
 #include "platform/nmp-object.h"
 
+#define NM_RA_TIMEOUT_DEFAULT    ((gint32) 0)
+#define NM_RA_TIMEOUT_INFINITY   G_MAXINT32
+
 #define NM_TYPE_NDISC            (nm_ndisc_get_type ())
 #define NM_NDISC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_NDISC, NMNDisc))
 #define NM_NDISC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_NDISC, NMNDiscClass))
@@ -31,11 +34,12 @@
 #define NM_NDISC_STABLE_TYPE    "stable-type"
 #define NM_NDISC_NODE_TYPE      "node-type"
 #define NM_NDISC_MAX_ADDRESSES  "max-addresses"
+#define NM_NDISC_RA_TIMEOUT     "ra-timeout"
 #define NM_NDISC_ROUTER_SOLICITATIONS "router-solicitations"
 #define NM_NDISC_ROUTER_SOLICITATION_INTERVAL "router-solicitation-interval"
 
-#define NM_NDISC_CONFIG_RECEIVED "config-received"
-#define NM_NDISC_RA_TIMEOUT      "ra-timeout"
+#define NM_NDISC_CONFIG_RECEIVED   "config-received"
+#define NM_NDISC_RA_TIMEOUT_SIGNAL "ra-timeout-signal"
 
 typedef enum {
 	NM_NDISC_DHCP_LEVEL_UNKNOWN,
diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/ndisc/tests/test-ndisc-linux.c
index e9ceaa2b..a25478e8 100644
--- a/src/ndisc/tests/test-ndisc-linux.c
+++ b/src/ndisc/tests/test-ndisc-linux.c
@@ -52,6 +52,7 @@ main (int argc, char **argv)
 	                           "8ce666e8-d34d-4fb1-b858-f15a7al28086",
 	                           NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64,
 	                           NM_NDISC_NODE_TYPE_HOST,
+	                           0,
 	                           &error);
 	if (!ndisc) {
 		g_print ("Failed to create NMNDisc instance: %s\n", error->message);
diff --git a/src/nm-config.c b/src/nm-config.c
index a7bb3503..a0995cf9 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -430,7 +430,7 @@ nm_config_set_no_auto_default_for_device (NMConfig *self, NMDevice *device)
 		 *
 		 * Instead, try the interface-name...  */
 		ifname = nm_device_get_ip_iface (device);
-		if (!nm_utils_is_valid_iface_name (ifname, NULL))
+		if (!nm_utils_ifname_valid_kernel (ifname, NULL))
 			return;
 
 		spec_to_free = g_strdup_printf (NM_MATCH_SPEC_INTERFACE_NAME_TAG"=%s", ifname);
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index ccac6376..e941fe7e 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -686,7 +686,6 @@ do_curl_request (NMConnectivityCheckHandle *cb_data)
 	curl_multi_setopt (mhandle, CURLMOPT_SOCKETDATA, cb_data);
 	curl_multi_setopt (mhandle, CURLMOPT_TIMERFUNCTION, multi_timer_cb);
 	curl_multi_setopt (mhandle, CURLMOPT_TIMERDATA, cb_data);
-	curl_multi_setopt (mhandle, CURLOPT_VERBOSE, 1);
 
 	switch (cb_data->addr_family) {
 	case AF_INET:
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index fb92289f..e059994a 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2145,7 +2145,7 @@ nm_utils_sysctl_ip_conf_path (int addr_family, char *buf, const char *ifname, co
 	nm_assert (buf);
 	nm_assert_addr_family (addr_family);
 
-	g_assert (nm_utils_is_valid_iface_name (ifname, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (ifname, NULL));
 	property = NM_ASSERT_VALID_PATH_COMPONENT (property);
 
 	len = g_snprintf (buf,
@@ -2163,7 +2163,7 @@ nm_utils_sysctl_ip_conf_is_path (int addr_family, const char *path, const char *
 {
 	g_return_val_if_fail (path, FALSE);
 	NM_ASSERT_VALID_PATH_COMPONENT (property);
-	g_assert (!ifname || nm_utils_is_valid_iface_name (ifname, NULL));
+	g_assert (!ifname || nm_utils_ifname_valid_kernel (ifname, NULL));
 
 	if (addr_family == AF_INET) {
 		if (!g_str_has_prefix (path, IPV4_PROPERTY_DIR))
@@ -2196,7 +2196,7 @@ nm_utils_sysctl_ip_conf_is_path (int addr_family, const char *path, const char *
 			return FALSE;
 		memcpy (buf, path, l);
 		buf[l] = '\0';
-		if (!nm_utils_is_valid_iface_name (buf, NULL))
+		if (!nm_utils_ifname_valid_kernel (buf, NULL))
 			return FALSE;
 		path = slash + 1;
 	}
@@ -3635,7 +3635,7 @@ nm_utils_ifname_cpy (char *dst, const char *name)
 	g_return_if_fail (dst);
 	g_return_if_fail (name && name[0]);
 
-	nm_assert (nm_utils_is_valid_iface_name (name, NULL));
+	nm_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	/* ensures NUL padding of the entire IFNAMSIZ buffer. */
 
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index bfb7af57..df70c71b 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -106,6 +106,7 @@ dhcp4_state_changed (NMDhcpClient *client,
 
 	switch (state) {
 	case NM_DHCP_STATE_BOUND:
+	case NM_DHCP_STATE_EXTENDED:
 		g_assert (ip4_config);
 		g_assert (nm_ip4_config_get_ifindex (ip4_config) == gl.ifindex);
 
@@ -551,10 +552,14 @@ main (int argc, char *argv[])
 			stable_type = (global_opt.stable_id[0] - '0');
 			stable_id = &global_opt.stable_id[2];
 		}
-		ndisc = nm_lndp_ndisc_new (NM_PLATFORM_GET, gl.ifindex, global_opt.ifname,
-		                           stable_type, stable_id,
+		ndisc = nm_lndp_ndisc_new (NM_PLATFORM_GET,
+		                           gl.ifindex,
+		                           global_opt.ifname,
+		                           stable_type,
+		                           stable_id,
 		                           global_opt.addr_gen_mode,
 		                           NM_NDISC_NODE_TYPE_HOST,
+		                           NM_RA_TIMEOUT_DEFAULT,
 		                           NULL);
 		g_assert (ndisc);
 
@@ -572,7 +577,7 @@ main (int argc, char *argv[])
 		                  G_CALLBACK (ndisc_config_changed),
 		                  NULL);
 		g_signal_connect (ndisc,
-		                  NM_NDISC_RA_TIMEOUT,
+		                  NM_NDISC_RA_TIMEOUT_SIGNAL,
 		                  G_CALLBACK (ndisc_ra_timeout),
 		                  NULL);
 		nm_ndisc_start (ndisc);
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 3696c789..6d3a5ddb 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -2011,6 +2011,20 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
 		return device;
 	}
 
+	if (!find_master (self,
+	                  connection,
+	                  device,
+	                  NULL,
+	                  NULL,
+	                  NULL,
+	                  &error)) {
+		_LOG3D (LOGD_DEVICE, connection,
+		        "skip activation: %s",
+		        error->message);
+		g_error_free (error);
+		return device;
+	}
+
 	/* Create backing resources if the device has any autoconnect connections */
 	connections = nm_settings_get_connections_clone (priv->settings, NULL,
 	                                                 NULL, NULL,
@@ -4649,6 +4663,19 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
 	if (nm_active_connection_get_activation_type (active) == NM_ACTIVATION_TYPE_MANAGED)
 		nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_MANAGED);
 
+	/* Try to find the master connection/device if the connection has a dependency */
+	if (!find_master (self,
+	                  applied,
+	                  device,
+	                  &master_connection,
+	                  &master_device,
+	                  &master_ac,
+	                  error)) {
+		g_prefix_error (error, "Can not find a master for %s: ",
+		                nm_settings_connection_get_id (sett_conn));
+		return FALSE;
+	}
+
 	/* Create any backing resources the device needs */
 	if (!nm_device_is_real (device)) {
 		NMDevice *parent;
@@ -4717,19 +4744,6 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
 		}
 	}
 
-	/* Try to find the master connection/device if the connection has a dependency */
-	if (!find_master (self,
-	                  applied,
-	                  device,
-	                  &master_connection,
-	                  &master_device,
-	                  &master_ac,
-	                  error)) {
-		g_prefix_error (error, "Can not find a master for %s: ",
-		                nm_settings_connection_get_id (sett_conn));
-		return FALSE;
-	}
-
 	/* Ensure there's a master active connection the new connection we're
 	 * activating can depend on.
 	 */
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index 4f0da581..b55fbd66 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -155,7 +155,7 @@ again:
 		const char *ifname = known_ifnames[try_count % 2];
 
 		nm_assert (ifindex > 0);
-		nm_assert (ifname && nm_utils_is_valid_iface_name (ifname, NULL));
+		nm_assert (ifname && nm_utils_ifname_valid_kernel (ifname, NULL));
 		nm_assert (fd >= 0);
 
 		memset (&ifr, 0, sizeof (ifr));
@@ -343,6 +343,7 @@ ethtool_get_stringset (SocketHandle *shandle, int stringset_id)
 		.info.reserved = 0,
 		.info.sset_mask = (1ULL << stringset_id),
 	};
+	const guint32 *pdata;
 	gs_free struct ethtool_gstrings *gstrings = NULL;
 	gsize gstrings_len;
 	guint32 i, len;
@@ -352,7 +353,9 @@ ethtool_get_stringset (SocketHandle *shandle, int stringset_id)
 	if (!sset_info.info.sset_mask)
 		return NULL;
 
-	len = sset_info.info.data[0];
+	pdata = (guint32 *) sset_info.info.data;
+
+	len = *pdata;
 
 	gstrings_len = sizeof (*gstrings) + (len * ETH_GSTRING_LEN);
 	gstrings = g_malloc0 (gstrings_len);
@@ -838,6 +841,7 @@ nmp_utils_ethtool_get_permanent_address (int ifindex,
 		.e.cmd = ETHTOOL_GPERMADDR,
 		.e.size = NM_UTILS_HWADDR_LEN_MAX,
 	};
+	const guint8 *pdata;
 
 	guint i;
 
@@ -851,20 +855,22 @@ nmp_utils_ethtool_get_permanent_address (int ifindex,
 	if (edata.e.size < 1)
 		return FALSE;
 
-	if (NM_IN_SET (edata.e.data[0], 0, 0xFF)) {
+	pdata = (const guint8 *) edata.e.data;
+
+	if (NM_IN_SET (pdata[0], 0, 0xFF)) {
 		/* Some drivers might return a permanent address of all zeros.
 		 * Reject that (rh#1264024)
 		 *
 		 * Some drivers return a permanent address of all ones. Reject that too */
 		for (i = 1; i < edata.e.size; i++) {
-			if (edata.e.data[0] != edata.e.data[i])
+			if (pdata[0] != pdata[i])
 				goto not_all_0or1;
 		}
 		return FALSE;
 	}
 
 not_all_0or1:
-	memcpy (buf, edata.e.data, edata.e.size);
+	memcpy (buf, pdata, edata.e.size);
 	*length = edata.e.size;
 	return TRUE;
 }
@@ -1410,7 +1416,7 @@ nmp_utils_sysctl_open_netdir (int ifindex,
 				return -1;
 		}
 
-		nm_assert (nm_utils_is_valid_iface_name (ifname, NULL));
+		nm_assert (nm_utils_ifname_valid_kernel (ifname, NULL));
 
 		if (g_strlcpy (&sysdir[NM_STRLEN (SYS_CLASS_NET)], ifname, IFNAMSIZ) >= IFNAMSIZ)
 			g_return_val_if_reached (-1);
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index b93213ef..f831fe94 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -1175,7 +1175,7 @@ nmtstp_link_veth_add (NMPlatform *platform,
 	const NMPlatformLink *pllink = NULL;
 	gboolean success;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 
@@ -1204,7 +1204,7 @@ nmtstp_link_dummy_add (NMPlatform *platform,
 	const NMPlatformLink *pllink = NULL;
 	gboolean success;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 
@@ -1235,7 +1235,7 @@ nmtstp_link_gre_add (NMPlatform *platform,
 	char b2[INET_ADDRSTRLEN];
 	NMLinkType link_type;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 	link_type = lnk->is_tap ? NM_LINK_TYPE_GRETAP : NM_LINK_TYPE_GRE;
@@ -1287,7 +1287,7 @@ nmtstp_link_ip6tnl_add (NMPlatform *platform,
 	gboolean encap_ignore;
 	gboolean tclass_inherit;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 	g_assert (!lnk->is_gre);
 
 	external_command = nmtstp_run_command_check_external (external_command);
@@ -1348,7 +1348,7 @@ nmtstp_link_ip6gre_add (NMPlatform *platform,
 	char tclass[20];
 	gboolean tclass_inherit;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 	g_assert (lnk->is_gre);
 
 	external_command = nmtstp_run_command_check_external (external_command);
@@ -1397,7 +1397,7 @@ nmtstp_link_ipip_add (NMPlatform *platform,
 	char b1[INET_ADDRSTRLEN];
 	char b2[INET_ADDRSTRLEN];
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 
@@ -1438,7 +1438,7 @@ nmtstp_link_macvlan_add (NMPlatform *platform,
 	gboolean success;
 	NMLinkType link_type;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 
@@ -1486,7 +1486,7 @@ nmtstp_link_sit_add (NMPlatform *platform,
 	char b1[INET_ADDRSTRLEN];
 	char b2[INET_ADDRSTRLEN];
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 
@@ -1532,7 +1532,7 @@ nmtstp_link_tun_add (NMPlatform *platform,
 	int err;
 	int r;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 	g_assert (lnk);
 	g_assert (NM_IN_SET (lnk->type, IFF_TUN, IFF_TAP));
 	g_assert (!out_fd || *out_fd == -1);
@@ -1595,7 +1595,7 @@ nmtstp_link_vxlan_add (NMPlatform *platform,
 	int err;
 	int r;
 
-	g_assert (nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (nm_utils_ifname_valid_kernel (name, NULL));
 
 	external_command = nmtstp_run_command_check_external (external_command);
 
@@ -1684,7 +1684,7 @@ nmtstp_link_get_typed (NMPlatform *platform,
 			g_assert_cmpstr (name, ==, pllink->name);
 	}
 
-	g_assert (!name || nm_utils_is_valid_iface_name (name, NULL));
+	g_assert (!name || nm_utils_ifname_valid_kernel (name, NULL));
 
 	if (pllink && link_type != NM_LINK_TYPE_NONE)
 		g_assert_cmpint (pllink->type, ==, link_type);
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index a1d3236e..e01f7344 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -399,7 +399,7 @@ make_connection_setting (const char *file,
 	if (v) {
 		GError *error = NULL;
 
-		if (nm_utils_is_valid_iface_name (v, &error)) {
+		if (nm_utils_ifname_valid_kernel (v, &error)) {
 			g_object_set (s_con,
 			              NM_SETTING_CONNECTION_INTERFACE_NAME, v,
 			              NULL);
@@ -1692,7 +1692,7 @@ make_ip4_setting (shvarFile *ifcfg,
 
 	g_object_set (s_ip4,
 	              NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, svGetValueBoolean (ifcfg, "DHCP_SEND_HOSTNAME", TRUE),
-	              NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, svGetValueInt64 (ifcfg, "IPV4_DHCP_TIMEOUT", 10, 0, G_MAXINT32, 0),
+	              NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, (int) svGetValueInt64 (ifcfg, "IPV4_DHCP_TIMEOUT", 10, 0, G_MAXINT32, 0),
 	              NULL);
 
 	nm_clear_g_free (&value);
@@ -2159,9 +2159,11 @@ make_ip6_setting (shvarFile *ifcfg,
 	if (v)
 		g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, v, NULL);
 
-	g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME,
-	              svGetValueBoolean (ifcfg, "DHCPV6_SEND_HOSTNAME", TRUE), NULL);
-
+	g_object_set (s_ip6,
+	              NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, svGetValueBoolean (ifcfg, "DHCPV6_SEND_HOSTNAME", TRUE),
+	              NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, (int) svGetValueInt64 (ifcfg, "IPV6_DHCP_TIMEOUT", 10, 0, G_MAXINT32, 0),
+	              NM_SETTING_IP6_CONFIG_RA_TIMEOUT, (int) svGetValueInt64 (ifcfg, "IPV6_RA_TIMEOUT", 10, 0, G_MAXINT32, 0),
+	              NULL);
 
 	i64 = svGetValueInt64 (ifcfg, "DHCPV6_HOSTNAME_FLAGS", 10, 0, G_MAXUINT32, -1);
 	if (i64 > -1) {
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index d33845c2..f328cc8f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -2748,30 +2748,6 @@ write_ip4_aliases (NMConnection *connection, const char *base_ifcfg_path)
 	}
 }
 
-static void
-write_ip6_setting_dhcp_hostname (NMSettingIPConfig *s_ip6, shvarFile *ifcfg)
-{
-	NMDhcpHostnameFlags flags;
-	const char *hostname;
-
-	hostname = nm_setting_ip_config_get_dhcp_hostname (s_ip6);
-	svSetValueStr (ifcfg, "DHCPV6_HOSTNAME", hostname);
-
-	/* Missing DHCPV6_SEND_HOSTNAME means TRUE, and we prefer not write it
-	 * explicitly in that case, because it is NM-specific variable
-	 */
-	if (nm_setting_ip_config_get_dhcp_send_hostname (s_ip6))
-		svUnsetValue (ifcfg, "DHCPV6_SEND_HOSTNAME");
-	else
-		svSetValueStr (ifcfg, "DHCPV6_SEND_HOSTNAME", "no");
-
-	flags = nm_setting_ip_config_get_dhcp_hostname_flags (s_ip6);
-	svSetValueInt64_cond (ifcfg,
-	                      "DHCPV6_HOSTNAME_FLAGS",
-	                      flags != NM_DHCP_HOSTNAME_FLAG_NONE,
-	                      flags);
-}
-
 static gboolean
 write_ip6_setting (NMConnection *connection,
                    shvarFile *ifcfg,
@@ -2789,6 +2765,9 @@ write_ip6_setting (NMConnection *connection,
 	NMIPRouteTableSyncMode route_table;
 	GString *ip_str1, *ip_str2, *ip_ptr;
 	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
+	NMDhcpHostnameFlags flags;
+	const char *hostname;
+	int timeout;
 
 	NM_SET_OUT (out_route6_content, NULL);
 
@@ -2855,7 +2834,34 @@ write_ip6_setting (NMConnection *connection,
 	svSetValueStr (ifcfg, "DHCPV6_IAID",
 	               nm_setting_ip_config_get_dhcp_iaid (s_ip6));
 
-	write_ip6_setting_dhcp_hostname (s_ip6, ifcfg);
+	hostname = nm_setting_ip_config_get_dhcp_hostname (s_ip6);
+	svSetValueStr (ifcfg, "DHCPV6_HOSTNAME", hostname);
+
+	/* Missing DHCPV6_SEND_HOSTNAME means TRUE, and we prefer not write it
+	 * explicitly in that case, because it is NM-specific variable
+	 */
+	if (nm_setting_ip_config_get_dhcp_send_hostname (s_ip6))
+		svUnsetValue (ifcfg, "DHCPV6_SEND_HOSTNAME");
+	else
+		svSetValueStr (ifcfg, "DHCPV6_SEND_HOSTNAME", "no");
+
+	timeout = nm_setting_ip6_config_get_ra_timeout (NM_SETTING_IP6_CONFIG (s_ip6));
+	svSetValueInt64_cond (ifcfg,
+	                      "IPV6_RA_TIMEOUT",
+	                      timeout != 0,
+	                      timeout);
+
+	timeout = nm_setting_ip_config_get_dhcp_timeout (s_ip6);
+	svSetValueInt64_cond (ifcfg,
+	                      "IPV6_DHCP_TIMEOUT",
+	                      timeout != 0,
+	                      timeout);
+
+	flags = nm_setting_ip_config_get_dhcp_hostname_flags (s_ip6);
+	svSetValueInt64_cond (ifcfg,
+	                      "DHCPV6_HOSTNAME_FLAGS",
+	                      flags != NM_DHCP_HOSTNAME_FLAG_NONE,
+	                      flags);
 
 	/* Write out IP addresses */
 	num = nm_setting_ip_config_get_num_addresses (s_ip6);
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 6ef29311..c19da11c 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -3184,5 +3184,5 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 	                  G_SIGNAL_RUN_LAST,
 	                  0,
 	                  NULL, NULL, NULL,
-	                  G_TYPE_NONE, 1, G_TYPE_VARIANT);
+	                  G_TYPE_NONE, 1, G_TYPE_STRING);
 }